diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts index 4a9824ee82f75..c1bd7e47c0bfd 100644 --- a/packages/platform-browser/test/testing_public_spec.ts +++ b/packages/platform-browser/test/testing_public_spec.ts @@ -860,7 +860,7 @@ describe('public testing API', () => { }))); itPromise.then(() => done.fail('Expected test to fail, but it did not'), (err) => { - expect(err.message).toEqual('Uncaught (in promise): baz'); + expect(err.message).toEqual('baz'); done(); }); restoreJasmineIt(); diff --git a/packages/zone.js/lib/common/promise.ts b/packages/zone.js/lib/common/promise.ts index 215646a16459b..8f73655ed1275 100644 --- a/packages/zone.js/lib/common/promise.ts +++ b/packages/zone.js/lib/common/promise.ts @@ -23,7 +23,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr const __symbol__ = api.symbol; const _uncaughtPromiseErrors: UncaughtPromiseError[] = []; const isDisableWrappingUncaughtPromiseRejection = - global[__symbol__('DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION')] === true; + global[__symbol__('DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION')] !== false; const symbolPromise = __symbol__('Promise'); const symbolThen = __symbol__('then'); const creationTrace = '__creationTrace__'; diff --git a/packages/zone.js/lib/zone.configurations.api.ts b/packages/zone.js/lib/zone.configurations.api.ts index 6a602b8cfff57..93dd691870c37 100644 --- a/packages/zone.js/lib/zone.configurations.api.ts +++ b/packages/zone.js/lib/zone.configurations.api.ts @@ -576,11 +576,11 @@ interface ZoneGlobalConfigurations { /** * Disable wrapping uncaught promise rejection. * - * By default, `zone.js` wraps the uncaught promise rejection in a new `Error` object - * which contains additional information such as a value of the rejection and a stack trace. + * By default, `zone.js` throws the original error occurs in the uncaught promise rejection. * - * If you set `__zone_symbol__DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION = true;` before - * importing `zone.js`, `zone.js` will not wrap the uncaught promise rejection. + * If you set `__zone_symbol__DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION = false;` before + * importing `zone.js`, `zone.js` will wrap the uncaught promise rejection in a new `Error` object + * which contains additional information such as a value of the rejection and a stack trace. */ __zone_symbol__DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION?: boolean; } diff --git a/packages/zone.js/test/browser-zone-setup.ts b/packages/zone.js/test/browser-zone-setup.ts index 264d797b7ac97..26c0cd2c6b268 100644 --- a/packages/zone.js/test/browser-zone-setup.ts +++ b/packages/zone.js/test/browser-zone-setup.ts @@ -9,6 +9,7 @@ if (typeof window !== 'undefined') { const zoneSymbol = (window as any).Zone.__symbol__; (window as any)['__Zone_enable_cross_context_check'] = true; (window as any)[zoneSymbol('fakeAsyncAutoFakeAsyncWhenClockPatched')] = true; + (window as any)[zoneSymbol('DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION')] = false; } import '../lib/common/to-string'; import '../lib/browser/api-util'; diff --git a/packages/zone.js/test/browser_disable_wrap_uncaught_promise_rejection_setup.ts b/packages/zone.js/test/browser_disable_wrap_uncaught_promise_rejection_setup.ts index 7665ce669189d..f2aef91cde2b3 100644 --- a/packages/zone.js/test/browser_disable_wrap_uncaught_promise_rejection_setup.ts +++ b/packages/zone.js/test/browser_disable_wrap_uncaught_promise_rejection_setup.ts @@ -5,5 +5,4 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ - -(window as any)['__zone_symbol__DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION'] = true; +// This is an empty karma test entry file just to keep the bazel macro happy. diff --git a/packages/zone.js/test/browser_symbol_setup.ts b/packages/zone.js/test/browser_symbol_setup.ts index 81cbcc163817d..b73003c47d2aa 100644 --- a/packages/zone.js/test/browser_symbol_setup.ts +++ b/packages/zone.js/test/browser_symbol_setup.ts @@ -1,3 +1,4 @@ (window as any).global = window; // Change default symbol prefix for testing to ensure no hard-coded references. (window as any)['__Zone_symbol_prefix'] = '_test__'; +(window as any)['_test__DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION'] = false; diff --git a/packages/zone.js/test/node-env-setup.ts b/packages/zone.js/test/node-env-setup.ts index 77f6606835cd3..0bf818bbc9228 100644 --- a/packages/zone.js/test/node-env-setup.ts +++ b/packages/zone.js/test/node-env-setup.ts @@ -1,2 +1,3 @@ // Change default symbol prefix for testing to ensure no hard-coded references. (global as any)['__Zone_symbol_prefix'] = '__zone_symbol_test__'; +(global as any)['__zone_symbol_test__DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION'] = false;