Merge branch 'master' of https://github.com/Polymer/core-ajax

googlearchive · Sep 14, 2014 · e5c2f8e · e5c2f8e
2 parents 509ef7c + 0898920
commit e5c2f8e
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -3,5 +3,8 @@
   "private": true,
   "dependencies": {
     "polymer": "Polymer/polymer#master"
+  },
+  "devDependencies": {
+    "polymer-test-tools": "Polymer/polymer-test-tools#master"
   }
 }
diff --git a/core-ajax.html b/core-ajax.html
@@ -254,7 +254,7 @@
       try {
         return JSON.parse(r);
       } catch (x) {
-        console.warn('core-ajax caught an exception trying to parse reponse as JSON:');
+        console.warn('core-ajax caught an exception trying to parse response as JSON:');
         console.warn('url:', this.url);
         console.warn(x);
         return r;
@@ -319,8 +319,11 @@
       if (args.headers && typeof(args.headers) == 'string') {
         args.headers = JSON.parse(args.headers);
       }
-      if (this.contentType) {
-        args.headers['content-type'] = this.contentType;
+      var hasContentType = Object.keys(args.headers).some(function (header) {
+        return header.toLowerCase() === 'content-type';
+      });
+      if (!hasContentType && this.contentType) {
+        args.headers['Content-Type'] = this.contentType;
       }
       if (this.handleAs === 'arraybuffer' || this.handleAs === 'blob' ||
           this.handleAs === 'document') {

diff --git a/metadata.html b/metadata.html
@@ -0,0 +1,23 @@
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<x-meta id="core-ajax" label="Ajax" group="Core">
+
+  <property name="handleAs" kind="select" options="json,text,xml,arraybuffer,blob,document"></property>
+  <property name="method" kind="select" options="GET,POST,PUT,DELETE"></property>
+
+  <template>
+    <core-ajax handleAs="json" method="GET"></core-ajax>
+  </template>
+
+  <template id="imports">
+    <link rel="import" href="core-ajax.html">
+  </template>
+
+</x-meta>
diff --git a/tests/html/core-ajax.html b/tests/html/core-ajax.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<!--
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <title>core-ajax</title>
+
+  <script src="../../../platform/platform.js"></script>
+  <script src="../../../polymer-test-tools/chai/chai.js"></script>
+  <script src="../../../polymer-test-tools/htmltest.js"></script>
+
+  <link rel="import" href="../../core-ajax.html">
+
+</head>
+<body>
+
+  <core-ajax
+    url="http://gdata.youtube.com/feeds/api/videos/"
+    params='{"alt":"json", "q":"chrome"}'
+    handleAs="json"
+    auto></core-ajax>
+
+  <script>
+
+    document.addEventListener('polymer-ready', function() {
+      var assert = chai.assert;
+      var ajax = document.querySelector('core-ajax');
+      ajax.addEventListener("core-response", function(event) {
+        assert.isTrue(event.detail.response.feed.entry.length > 0);
+        done();
+      });
+    });
+
+  </script>
+
+</body>
+</html>
diff --git a/tests/js/htmltests.js b/tests/js/htmltests.js
@@ -0,0 +1,3 @@
+htmlSuite('core-ajax', function() {
+  htmlTest('html/core-ajax.html');
+});
diff --git a/tests/runner.html b/tests/runner.html
@@ -0,0 +1,14 @@
+<!doctype htmlz>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+  <title>Web Component Test Runner</title>
+  <script src="../../polymer-test-tools/ci-support.js"></script>
+</head>
+<body>
+  <script>
+    runTests('tests.json');
+  </script>
+</body>
+</html>
diff --git a/tests/tests.json b/tests/tests.json
@@ -0,0 +1,6 @@
+{
+  "tools": ["chai", "mocha-tdd"],
+  "tests": [
+    "js/htmltests.js"
+  ]
+}