Elgato_dark/angular
1
0
Fork 0
mirror of https://github.com/angular/angular synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(zone.js): more robust check for promise-like objects (#57388)

Browse source 
Fixes that Zone.js wasn't checking properly if an object is promise-like.

Fixes #57385.

PR Close #57388
This commit is contained in:
Kristiyan Kostadinov 2024-08-20 20:27:26 +02:00 committed by Alex Rickabaugh
parent 57202c4899
commit e608e6cfbb
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/zone.js/lib/common/promise.ts
View file

@ -83,7 +83,7 @@ export function patchPromise(Zone: ZoneType): void {
}
function isThenable(value: any): boolean {
return value && value.then;
return value && typeof value.then === 'function';
}
function forwardResolution(value: any): any {

24
packages/zone.js/test/common/Promise.spec.ts
View file

@ -501,7 +501,6 @@ describe(
(Promise as any)
.race([Promise.reject('rejection1'), 'v1'])
['catch']((v: any) => (value = v));
// expect(Zone.current.get('queue').length).toEqual(2);
flushMicrotasks();
expect(value).toEqual('rejection1');
});
@ -513,7 +512,6 @@ describe(
(Promise as any)
.race([Promise.resolve('resolution'), 'v1'])
.then((v: any) => (value = v));
// expect(Zone.current.get('queue').length).toEqual(2);
flushMicrotasks();
expect(value).toEqual('resolution');
});
@ -525,22 +523,11 @@ describe(
queueZone.run(() => {
let value: any = null;
Promise.all([Promise.reject('rejection'), 'v1'])['catch']((v: any) => (value = v));
// expect(Zone.current.get('queue').length).toEqual(2);
flushMicrotasks();
expect(value).toEqual('rejection');
});
});
it('should resolve the value', () => {
queueZone.run(() => {
let value: any = null;
Promise.all([Promise.resolve('resolution'), 'v1']).then((v: any) => (value = v));
// expect(Zone.current.get('queue').length).toEqual(2);
flushMicrotasks();
expect(value).toEqual(['resolution', 'v1']);
});
});
it('should resolve with the sync then operation', () => {
queueZone.run(() => {
let value: any = null;
@ -555,7 +542,6 @@ describe(
},
};
Promise.all([p1, 'v1', p2]).then((v: any) => (value = v));
// expect(Zone.current.get('queue').length).toEqual(2);
flushMicrotasks();
expect(value).toEqual(['p1', 'v1', 'p2']);
});
@ -578,13 +564,21 @@ describe(
Promise.all(generators()).then((val) => {
value = val;
});
// expect(Zone.current.get('queue').length).toEqual(2);
flushMicrotasks();
expect(value).toEqual([1, 2]);
});
},
),
);
it('should handle object with a truthy `then property`', () => {
queueZone.run(() => {
let value: any = null;
Promise.all([{then: 123}]).then((v: any) => (value = v));
flushMicrotasks();
expect(value).toEqual([jasmine.objectContaining({then: 123})]);
});
});
});
});