Skip to content

Commit e47ae67

Browse files
authored
refactor: import zone.js/testing instead of zone-testing-bundle (#2163)
Close #2162 From zone.js 0.13.2, the original `zone.js/bundles/zone-testing-bundle.js` is not easily import and will eventually removed from zone.js 0.14.0. The proper way to import zone.js and zone.js/testing is ``` import 'zone.js'; import 'zone.js/testing'; ``` So this PR use this way to import zone.js related bundles.
1 parent 65a848a commit e47ae67

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

setup-jest.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
require('zone.js/bundles/zone-testing-bundle.umd');
1+
require('zone.js');
2+
require('zone.js/testing');
23
const { getTestBed } = require('@angular/core/testing');
34
const {
45
BrowserDynamicTestingModule,

setup-jest.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import 'zone.js/fesm2015/zone-testing-bundle.min.js';
1+
import 'zone.js';
2+
import 'zone.js/testing';
23
import { getTestBed } from '@angular/core/testing';
34
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
45

src/config/setup-jest.spec.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
const mockInitTestEnvironment = jest.fn();
2-
const mockUmdZoneJs = jest.fn();
3-
const mockEsmZoneJs = jest.fn();
2+
const mockZoneJs = jest.fn();
3+
const mockZoneJsTesting = jest.fn();
44
const mockGetTestBed = jest.fn(() => {
55
return {
66
initTestEnvironment: mockInitTestEnvironment,
77
};
88
});
9-
jest.mock('zone.js/bundles/zone-testing-bundle.umd', () => {
10-
const mockedResult = mockUmdZoneJs();
9+
jest.mock('zone.js', () => {
10+
const mockedResult = mockZoneJs();
1111

1212
return {
1313
mockedResult,
1414
};
1515
});
16-
jest.mock('zone.js/fesm2015/zone-testing-bundle.min.js', () => {
17-
const mockedResult = mockEsmZoneJs();
16+
jest.mock('zone.js/testing', () => {
17+
const mockedResult = mockZoneJsTesting();
1818

1919
return {
2020
mockedResult,
@@ -66,7 +66,8 @@ describe('setup-jest', () => {
6666

6767
await import('../../setup-jest');
6868

69-
expect(mockUmdZoneJs).toHaveBeenCalled();
69+
expect(mockZoneJs).toHaveBeenCalled();
70+
expect(mockZoneJsTesting).toHaveBeenCalled();
7071
assertOnInitTestEnv();
7172
expect(mockInitTestEnvironment.mock.calls[0][2]).toEqual({
7273
teardown: {
@@ -94,7 +95,8 @@ describe('setup-jest', () => {
9495

9596
await import('../../setup-jest.mjs');
9697

97-
expect(mockEsmZoneJs).toHaveBeenCalled();
98+
expect(mockZoneJs).toHaveBeenCalled();
99+
expect(mockZoneJsTesting).toHaveBeenCalled();
98100
assertOnInitTestEnv();
99101
expect(mockInitTestEnvironment.mock.calls[0][2]).toEqual({
100102
teardown: {

website/versioned_docs/version-11.0/guides/angular-13+.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ The `jest-preset-angular/setup-jest` file doesn't work with ESM, because it uses
8888

8989
```ts
9090
// setup-jest.ts
91-
import 'zone.js/fesm2015/zone-testing-bundle.min.js';
91+
import 'zone.js';
92+
import 'zone.js/testing';
9293
import './jest-global-mocks';
9394

9495
import { getTestBed } from '@angular/core/testing';

website/versioned_docs/version-11.1/guides/angular-13+.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ The `jest-preset-angular/setup-jest` file doesn't work with ESM, because it uses
8888

8989
```ts
9090
// setup-jest.ts
91-
import 'zone.js/fesm2015/zone-testing-bundle.min.js';
91+
import 'zone.js';
92+
import 'zone.js/testing';
9293
import './jest-global-mocks';
9394

9495
import { getTestBed } from '@angular/core/testing';

0 commit comments

Comments
 (0)