feat(zone.js): support Android browser

angular · Aug 20, 2015 · 93b5555 · 93b5555
1 parent 3b0ca3f
commit 93b5555
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/lib/patch/property-descriptor.js b/lib/patch/property-descriptor.js
@@ -11,21 +11,24 @@ function apply() {
     return;
   }
 
+  var supportsWebSocket = typeof WebSocket !== 'undefined';
   if (canPatchViaPropertyDescriptor()) {
     // for browsers that we can patch the descriptor:  Chrome & Firefox
     var onEventNames = eventNames.map(function (property) {
       return 'on' + property;
     });
     utils.patchProperties(HTMLElement.prototype, onEventNames);
     utils.patchProperties(XMLHttpRequest.prototype);
-    if (typeof WebSocket !== 'undefined') {
+    if (supportsWebSocket) {
       utils.patchProperties(WebSocket.prototype);
     }
   } else {
-    // Safari
+    // Safari, Android browsers (Jelly Bean)
     patchViaCapturingAllTheEvents();
     utils.patchClass('XMLHttpRequest');
-    webSocketPatch.apply();
+    if (supportsWebSocket) {
+      webSocketPatch.apply();
+    }
   }
 }
 

diff --git a/sauce.conf.js b/sauce.conf.js
@@ -49,6 +49,12 @@ module.exports = function (config) {
       browserName: 'internet explorer',
       platform: 'Windows 8.1',
       version: '11'
+    },
+    'SL_ANDROID4.3': {
+      base: 'SauceLabs',
+      browserName: 'android',
+      platform: 'Linux',
+      version: '4.3'
     }
   };
 

diff --git a/test/patch/XMLHttpRequest.spec.js b/test/patch/XMLHttpRequest.spec.js
@@ -48,8 +48,13 @@ describe('XMLHttpRequest', function () {
     var req = new XMLHttpRequest();
     req.open('get', '/', true);
     req.send();
-    req.responseType = 'document';
-    expect(req.responseType).toBe('document');
+    try {
+      req.responseType = 'document';
+      expect(req.responseType).toBe('document');
+    } catch (e) {
+      //Android browser: using this setter throws, this should be preserved
+      expect(e.message).toBe('INVALID_STATE_ERR: DOM Exception 11');
+    }
   });
 
   it('should preserve static constants', function() {