fix: should also allow subclass Promise without Symbol.species (#34533)

JiaLiPassion · mhevery · commit 58b29f1503a1 · 2020-01-31T13:17:59.000-08:00
PR Close #34533
diff --git a/packages/zone.js/lib/common/promise.ts b/packages/zone.js/lib/common/promise.ts
@@ -384,7 +384,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
         null): Promise<TResult1|TResult2> {
       let C = (this.constructor as any)[Symbol.species];
       if (!C || typeof C !== 'function') {
-        C = ZoneAwarePromise;
+        C = this.constructor || ZoneAwarePromise;
       }
       const chainPromise: Promise<TResult1|TResult2> = new (C as typeof ZoneAwarePromise)(noop);
       const zone = Zone.current;
diff --git a/packages/zone.js/test/common/Promise.spec.ts b/packages/zone.js/test/common/Promise.spec.ts
@@ -103,7 +103,14 @@ describe(
         }).toThrowError('Must be an instanceof Promise.');
       });
 
-      it('should allow subclassing with Promise.specices', () => {
+      it('should allow subclassing without Symbol.species', () => {
+        class MyPromise extends Promise<any> {
+          constructor(fn: any) { super(fn); }
+        }
+        expect(new MyPromise(() => {}).then(() => null) instanceof MyPromise).toBe(true);
+      });
+
+      it('should allow subclassing with Symbol.species', () => {
         class MyPromise extends Promise<any> {
           constructor(fn: any) { super(fn); }
 
@@ -112,7 +119,7 @@ describe(
         expect(new MyPromise(() => {}).then(() => null) instanceof MyPromise).toBe(true);
       });
 
-      it('Promise.specices should return ZoneAwarePromise', () => {
+      it('Symbol.species should return ZoneAwarePromise', () => {
         const empty = function() {};
         const promise = Promise.resolve(1);
         const FakePromise = ((promise.constructor = {} as any) as any)[Symbol.species] = function(

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr`
`384`	`384`	`null): Promise<TResult1\|TResult2> {`
`385`	`385`	`let C = (this.constructor as any)[Symbol.species];`
`386`	`386`	`if (!C \|\| typeof C !== 'function') {`
`387`		`- C = ZoneAwarePromise;`
	`387`	`+ C = this.constructor \|\| ZoneAwarePromise;`
`388`	`388`	`}`
`389`	`389`	`const chainPromise: Promise<TResult1\|TResult2> = new (C as typeof ZoneAwarePromise)(noop);`
`390`	`390`	`const zone = Zone.current;`