fix: allow to just pass the destroyAfterEach flag

thymikee · May 16, 2022 · 99e4979 · 99e4979
1 parent 1bd5d35
commit 99e4979
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/setup-jest.js b/setup-jest.js
@@ -5,7 +5,14 @@ const {
   platformBrowserDynamicTesting,
 } = require('@angular/platform-browser-dynamic/testing');
 
-const teardown = globalThis.ngJest?.teardown;
+let teardown = globalThis.ngJest?.teardown;
+const configuredDestroyAfterEach = globalThis.ngJest?.destroyAfterEach;
+if (configuredDestroyAfterEach) {
+  teardown = {
+    destroyAfterEach: true,
+  };
+}
+
 if (teardown !== undefined) {
   getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
     teardown,

diff --git a/setup-jest.mjs b/setup-jest.mjs
@@ -2,7 +2,15 @@ import 'zone.js/fesm2015/zone-testing-bundle.min.js';
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 
-const teardown = globalThis.ngJest?.teardown;
+let teardown = globalThis.ngJest?.teardown;
+const configuredDestroyAfterEach = globalThis.ngJest?.destroyAfterEach;
+
+if (configuredDestroyAfterEach) {
+  teardown = {
+    destroyAfterEach: true,
+  };
+}
+
 if (teardown !== undefined) {
   getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
     teardown,

diff --git a/src/config/setup-jest.spec.ts b/src/config/setup-jest.spec.ts
@@ -48,14 +48,33 @@ describe('setup-jest', () => {
   beforeEach(() => {
     delete globalThis.ngJest;
     jest.clearAllMocks();
+    jest.resetModules();
   });
 
   test('should initialize test environment with getTestBed() and initTestEnvironment() for CJS setup-jest', async () => {
     globalThis.ngJest = {
       teardown: {
-        destroyAfterEach: true,
+        destroyAfterEach: false,
+        rethrowErrors: true,
+      },
+    };
+    await import('../../setup-jest');
+
+    expect(mockUmdZoneJs).toHaveBeenCalled();
+    assertOnInitTestEnv();
+    expect(mockInitTestEnvironment.mock.calls[0][2]).toEqual({
+      teardown: {
+        destroyAfterEach: false,
+        rethrowErrors: true,
       },
+    });
+  });
+
+  test('should initialize test environment with getTestBed() and initTestEnvironment() for CJS setup-jest / 2', async () => {
+    globalThis.ngJest = {
+      destroyAfterEach: true,
     };
+
     await import('../../setup-jest');
 
     expect(mockUmdZoneJs).toHaveBeenCalled();