Skip to content

Commit 6bf89a4

Browse files
committed
refactor: remove setup-jest files
BREAKING CHANGE - Use `setupZoneTestEnv` as a replacement for zone test environment setup - Use `setupZonelessTestEnv` as a replacement for zoneless test environment setup
1 parent 94dd3b1 commit 6bf89a4

File tree

4 files changed

+8
-108
lines changed

4 files changed

+8
-108
lines changed

scripts/test-examples.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ const executeTest = (projectPath) => {
3434
logger.log('installing bundled version of jest-preset-angular');
3535
logger.log();
3636

37-
['build', 'presets', 'jest-preset.js', 'package.json', 'setup-jest.js', 'setup-jest.mjs', 'setup-env'].forEach(
38-
(asset) => {
39-
const assetToReplace = join(projectPath, 'node_modules', 'jest-preset-angular', asset);
40-
const assetToCopy = join(rootDir, asset);
41-
copySync(assetToCopy, assetToReplace, {});
42-
},
43-
);
37+
['build', 'presets', 'jest-preset.js', 'package.json', 'setup-env'].forEach((asset) => {
38+
const assetToReplace = join(projectPath, 'node_modules', 'jest-preset-angular', asset);
39+
const assetToCopy = join(rootDir, asset);
40+
copySync(assetToCopy, assetToReplace, {});
41+
});
4442

4543
// then we can run the tests
4644
const cmdLine = ['yarn', 'test'];

setup-jest.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

setup-jest.mjs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/config/setup-jest.spec.ts renamed to src/config/setup-env.spec.ts

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jest.mock('@angular/core', () => {
4747
};
4848
});
4949

50-
describe('setup-jest', () => {
50+
describe('Setup env utilities', () => {
5151
const assertOnInitTestEnv = (): void => {
5252
expect(mockGetTestBed).toHaveBeenCalled();
5353
expect(mockInitTestEnvironment.mock.calls[0][0][0]).toBeInstanceOf(BrowserDynamicTestingModuleStub);
@@ -64,33 +64,12 @@ describe('setup-jest', () => {
6464
};
6565

6666
beforeEach(() => {
67-
delete globalThis.ngJest;
6867
delete globalThis.TextEncoder;
6968
jest.clearAllMocks();
7069
jest.resetModules();
7170
});
7271

73-
describe('for CJS setup-jest, test environment initialization', () => {
74-
it('should setup test environment with setup-jest file', async () => {
75-
globalThis.ngJest = {
76-
testEnvironmentOptions: {
77-
teardown: {
78-
destroyAfterEach: false,
79-
rethrowErrors: true,
80-
},
81-
errorOnUnknownElements: true,
82-
errorOnUnknownProperties: true,
83-
},
84-
};
85-
86-
await import('../../setup-jest.js');
87-
88-
expect(globalThis.TextEncoder).toBeDefined();
89-
expect(mockZoneJs).toHaveBeenCalled();
90-
expect(mockZoneJsTesting).toHaveBeenCalled();
91-
assertOnInitTestEnv();
92-
});
93-
72+
describe('for CJS, test environment initialization', () => {
9473
it('should setup test environment with setupZoneTestEnv()', async () => {
9574
const { setupZoneTestEnv } = await import('../../setup-env/zone/index.js');
9675

@@ -129,27 +108,7 @@ describe('setup-jest', () => {
129108
});
130109
});
131110

132-
describe('for ESM setup-jest, test environment initialization', () => {
133-
it('should setup test environment with setup-jest file', async () => {
134-
globalThis.ngJest = {
135-
testEnvironmentOptions: {
136-
teardown: {
137-
destroyAfterEach: false,
138-
rethrowErrors: true,
139-
},
140-
errorOnUnknownElements: true,
141-
errorOnUnknownProperties: true,
142-
},
143-
};
144-
145-
await import('../../setup-jest.mjs');
146-
147-
expect(globalThis.TextEncoder).toBeDefined();
148-
expect(mockZoneJs).toHaveBeenCalled();
149-
expect(mockZoneJsTesting).toHaveBeenCalled();
150-
assertOnInitTestEnv();
151-
});
152-
111+
describe('for ESM, test environment initialization', () => {
153112
it('should setup test environment with setupZoneTestEnv()', async () => {
154113
const { setupZoneTestEnv } = await import('../../setup-env/zone/index.mjs');
155114

0 commit comments

Comments
 (0)