Merge pull request #300 from PolymerElements/timeout-set-undef-async

opts.async is undef sets timeout

Author: e111077

iron-request.html

@@ -85,8 +85,8 @@
        * if there is an error before the `xhr` completes.
        * The resolve callback is called with the original request as an argument.
        * By default, the reject callback is called with an `Error` as an argument.
-       * If `rejectWithRequest` is true, the reject callback is called with an 
-       * object with two keys: `request`, the original request, and `error`, the 
+       * If `rejectWithRequest` is true, the reject callback is called with an
+       * object with two keys: `request`, the original request, and `error`, the
        * error object.
        *
        * @type {Promise}
@@ -267,10 +267,11 @@
       }.bind(this));
 
       this.url = options.url;
+      var isXHRAsync = options.async !== false;
       xhr.open(
         options.method || 'GET',
         options.url,
-        options.async !== false
+        isXHRAsync
       );
 
       var acceptType = {
@@ -300,10 +301,8 @@
         );
       }, this);
 
-      if (options.async !== false) {
-        if (options.async) {
-          xhr.timeout = options.timeout;
-        }
+      if (isXHRAsync) {
+        xhr.timeout = options.timeout;
 
         var handleAs = options.handleAs;
 

test/iron-request.html

@@ -84,6 +84,12 @@
           async: true,
           timeout: 100
         };
+
+        asynchronousUndefSuccessfulRequestOptions = {
+          url: '/responds_to_get_with_json',
+          async: undefined,
+          timeout: 100
+        };
       });
 
       teardown(function() {
@@ -106,8 +112,8 @@
           expect(request.xhr.timeout).to.be.eql(undefined);
         });
 
-        test('timeout set if asynchronous', function() {
-          request.send(asynchronousSuccessfulRequestOptions);
+        test('timeout set if asynchronous is undefined', function() {
+          request.send(asynchronousUndefSuccessfulRequestOptions);
 
           expect(request.xhr.async).to.be.eql(true);
           expect(request.xhr.timeout).to.be.eql(100);