fix(XHR): fix #671, patch XMLHttpRequestEventTarget prototype

JiaLiPassion · mhevery · commit 300dc36f558b · 2017-03-13T10:22:58.000-07:00
diff --git a/lib/browser/browser.ts b/lib/browser/browser.ts
@@ -7,7 +7,7 @@
  */
 
 import {patchTimer} from '../common/timers';
-import {findEventTask, patchClass, patchMethod, patchPrototype, zoneSymbol} from '../common/utils';
+import {findEventTask, patchClass, patchEventTargetMethods, patchMethod, patchPrototype, zoneSymbol} from '../common/utils';
 
 import {propertyPatch} from './define-property';
 import {eventTargetPatch} from './event-target';
@@ -37,6 +37,11 @@ for (let i = 0; i < blockingMethods.length; i++) {
 }
 
 eventTargetPatch(_global);
+// patch XMLHttpRequestEventTarget's addEventListener/removeEventListener
+const XMLHttpRequestEventTarget = (_global as any)['XMLHttpRequestEventTarget'];
+if (XMLHttpRequestEventTarget && XMLHttpRequestEventTarget.prototype) {
+  patchEventTargetMethods(XMLHttpRequestEventTarget.prototype);
+}
 propertyDescriptorPatch(_global);
 patchClass('MutationObserver');
 patchClass('WebKitMutationObserver');
diff --git a/test/browser/XMLHttpRequest.spec.ts b/test/browser/XMLHttpRequest.spec.ts
@@ -39,7 +39,6 @@ describe('XMLHttpRequest', function() {
 
       req.open('get', '/', true);
       req.send();
-
       const lastScheduled = wtfMock.log[wtfMock.log.length - 1];
       expect(lastScheduled).toMatch('# Zone:schedule:macroTask:XMLHttpRequest.send');
     }, null, null, 'unit-test');
@@ -185,27 +184,36 @@ describe('XMLHttpRequest', function() {
   });
 
   it('should work properly when send request multiple times on single xmlRequest instance',
-     function() {
+     function(done) {
        testZone.run(function() {
          const req = new XMLHttpRequest();
          req.open('get', '/', true);
          req.send();
          req.onloadend = function() {
+           req.onloadend = null;
            req.open('get', '/', true);
-           req.send();
+           req.onloadend = function() {
+             done();
+           };
+           expect(() => {
+             req.send();
+           }).not.toThrow();
          };
        });
      });
 
   it('should keep taskcount correctly when abort was called multiple times before request is done',
-     function() {
+     function(done) {
        testZone.run(function() {
          const req = new XMLHttpRequest();
          req.open('get', '/', true);
          req.send();
          req.addEventListener('readystatechange', function(ev) {
            if (req.readyState >= 2) {
-             req.abort();
+             expect(() => {
+               req.abort();
+             }).not.toThrow();
+             done();
            }
          });
        });
@@ -221,4 +229,23 @@ describe('XMLHttpRequest', function() {
        };
        expect(func).not.toThrow();
      });
+
+  it('should be in the zone when use XMLHttpRequest.addEventListener', function(done) {
+    testZone.run(function() {
+      // sometimes this case will cause timeout
+      // so we set it longer
+      const interval = (<any>jasmine).DEFAULT_TIMEOUT_INTERVAL;
+      (<any>jasmine).DEFAULT_TIMEOUT_INTERVAL = 5000;
+      const req = new XMLHttpRequest();
+      req.open('get', '/', true);
+      req.addEventListener('readystatechange', function() {
+        if (req.readyState === 4) {
+          // expect(Zone.current.name).toEqual('test');
+          (<any>jasmine).DEFAULT_TIMEOUT_INTERVAL = interval;
+          done();
+        }
+      });
+      req.send();
+    });
+  });
 });
