Skip to content

fix(zone.js): update several flaky cases #41526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JiaLiPassion wants to merge 1 commit into from
Closed

fix(zone.js): update several flaky cases #41526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions packages/zone.js/test/browser/browser.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,16 +395,22 @@ describe('Zone', function() {

it('get window onerror should not throw error',
ifEnvSupports(canPatchOnProperty(window, 'onerror'), function() {
const oriOnError = window.onerror;
const testFn = function() {
let onerror = window.onerror;
window.onerror = function() {};
onerror = window.onerror;
try {
let onerror = window.onerror;
window.onerror = function() {};
onerror = window.onerror;
} finally {
window.onerror = oriOnError;
}
};
expect(testFn).not.toThrow();
}));

it('window.onerror callback signiture should be (message, source, lineno, colno, error)',
ifEnvSupportsWithDone(canPatchOnProperty(window, 'onerror'), function(done: DoneFn) {
const oriOnError = window.onerror;
let testError = new Error('testError');
window.onerror = function(
message: any, source?: string, lineno?: number, colno?: number, error?: any) {
Expand All @@ -413,7 +419,7 @@ describe('Zone', function() {
// Edge 14, error will be undefined.
expect(error).toBe(testError);
}
(window as any).onerror = null;
(window as any).onerror = oriOnError;
setTimeout(done);
return true;
};
Expand Down
34 changes: 17 additions & 17 deletions packages/zone.js/test/common/zone.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,23 +334,23 @@ describe('Zone', function() {
Zone.assertZonePatched();
});

// xit('should throw error if ZoneAwarePromise has been overwritten', () => {
// class WrongPromise {
// static resolve(value: any) {}

// then() {}
// }

// const ZoneAwarePromise = global.Promise;
// try {
// global.Promise = WrongPromise;
// expect(Zone.assertZonePatched()).toThrow();
// } finally {
// // restore it.
// global.Promise = ZoneAwarePromise;
// }
// Zone.assertZonePatched();
// });
it('should throw error if ZoneAwarePromise has been overwritten', () => {
class WrongPromise {
static resolve(value: any) {}

then() {}
}

const ZoneAwarePromise = global.Promise;
try {
(global as any).Promise = WrongPromise;
expect(() => Zone.assertZonePatched()).toThrow();
} finally {
// restore it.
global.Promise = ZoneAwarePromise;
}
Zone.assertZonePatched();
});
});
});

Expand Down