diff --git a/scripts/test-examples.js b/scripts/test-examples.js index 75ffce751e..e32f77bfdc 100755 --- a/scripts/test-examples.js +++ b/scripts/test-examples.js @@ -34,13 +34,11 @@ const executeTest = (projectPath) => { logger.log('installing bundled version of jest-preset-angular'); logger.log(); - ['build', 'presets', 'jest-preset.js', 'package.json', 'setup-jest.js', 'setup-jest.mjs', 'setup-env'].forEach( - (asset) => { - const assetToReplace = join(projectPath, 'node_modules', 'jest-preset-angular', asset); - const assetToCopy = join(rootDir, asset); - copySync(assetToCopy, assetToReplace, {}); - }, - ); + ['build', 'presets', 'jest-preset.js', 'package.json', 'setup-env'].forEach((asset) => { + const assetToReplace = join(projectPath, 'node_modules', 'jest-preset-angular', asset); + const assetToCopy = join(rootDir, asset); + copySync(assetToCopy, assetToReplace, {}); + }); // then we can run the tests const cmdLine = ['yarn', 'test']; diff --git a/setup-jest.js b/setup-jest.js deleted file mode 100644 index 4ac9724c84..0000000000 --- a/setup-jest.js +++ /dev/null @@ -1,32 +0,0 @@ -console.warn(` - Importing "setup-jest.js" directly is deprecated. The file "setup-jest.js" will be removed in the future. - Please use "setupZoneTestEnv" function instead. Example: - - // setup-jest.ts - import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'; - - setupZoneTestEnv(); -`); - -require('zone.js'); -require('zone.js/testing'); -const { TextEncoder, TextDecoder } = require('util'); - -const { getTestBed } = require('@angular/core/testing'); -const { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting, -} = require('@angular/platform-browser-dynamic/testing'); - -if (typeof globalThis.TextEncoder === 'undefined') { - globalThis.TextEncoder = TextEncoder; - globalThis.TextDecoder = TextDecoder; -} - -const testEnvironmentOptions = globalThis.ngJest?.testEnvironmentOptions ?? Object.create(null); - -getTestBed().initTestEnvironment( - [BrowserDynamicTestingModule], - platformBrowserDynamicTesting(), - testEnvironmentOptions, -); diff --git a/setup-jest.mjs b/setup-jest.mjs deleted file mode 100644 index e4bd512a42..0000000000 --- a/setup-jest.mjs +++ /dev/null @@ -1,25 +0,0 @@ -console.warn(` - Importing "setup-jest.mjs" directly is deprecated. The file "setup-jest.mjs" will be removed in the future. - Please use "setupZoneTestEnv" function instead. Example: - - // setup-jest.ts - import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone/index.mjs'; - - setupZoneTestEnv(); -`); - -import 'zone.js'; -import 'zone.js/testing'; -import { TextEncoder, TextDecoder } from 'util'; - -import { getTestBed } from '@angular/core/testing'; -import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; - -if (typeof globalThis.TextEncoder === 'undefined') { - globalThis.TextEncoder = TextEncoder; - globalThis.TextDecoder = TextDecoder; -} - -const testEnvironmentOptions = globalThis.ngJest?.testEnvironmentOptions ?? Object.create(null); - -getTestBed().initTestEnvironment([BrowserDynamicTestingModule], platformBrowserDynamicTesting(), testEnvironmentOptions); diff --git a/src/config/setup-jest.spec.ts b/src/config/setup-jest.spec.ts index 634f6fbbec..1c75c70744 100644 --- a/src/config/setup-jest.spec.ts +++ b/src/config/setup-jest.spec.ts @@ -64,33 +64,12 @@ describe('setup-jest', () => { }; beforeEach(() => { - delete globalThis.ngJest; delete globalThis.TextEncoder; jest.clearAllMocks(); jest.resetModules(); }); describe('for CJS setup-jest, test environment initialization', () => { - it('should setup test environment with setup-jest file', async () => { - globalThis.ngJest = { - testEnvironmentOptions: { - teardown: { - destroyAfterEach: false, - rethrowErrors: true, - }, - errorOnUnknownElements: true, - errorOnUnknownProperties: true, - }, - }; - - await import('../../setup-jest.js'); - - expect(globalThis.TextEncoder).toBeDefined(); - expect(mockZoneJs).toHaveBeenCalled(); - expect(mockZoneJsTesting).toHaveBeenCalled(); - assertOnInitTestEnv(); - }); - it('should setup test environment with setupZoneTestEnv()', async () => { const { setupZoneTestEnv } = await import('../../setup-env/zone/index.js'); @@ -130,26 +109,6 @@ describe('setup-jest', () => { }); describe('for ESM setup-jest, test environment initialization', () => { - it('should setup test environment with setup-jest file', async () => { - globalThis.ngJest = { - testEnvironmentOptions: { - teardown: { - destroyAfterEach: false, - rethrowErrors: true, - }, - errorOnUnknownElements: true, - errorOnUnknownProperties: true, - }, - }; - - await import('../../setup-jest.mjs'); - - expect(globalThis.TextEncoder).toBeDefined(); - expect(mockZoneJs).toHaveBeenCalled(); - expect(mockZoneJsTesting).toHaveBeenCalled(); - assertOnInitTestEnv(); - }); - it('should setup test environment with setupZoneTestEnv()', async () => { const { setupZoneTestEnv } = await import('../../setup-env/zone/index.mjs');