chore(testing): remove depreciation warning

jest-preset-angular is now using setupZoneTestEnv
nrwl · Nov 25, 2024 · 3a4031e · 3a4031e
1 parent 128778e
commit 3a4031e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/packages/angular/src/generators/utils/add-jest.ts b/packages/angular/src/generators/utils/add-jest.ts
@@ -49,18 +49,25 @@ export async function addJest(
     'src',
     'test-setup.ts'
   );
-  if (options.strict && tree.exists(setupFile)) {
+  if (tree.exists(setupFile)) {
     const contents = tree.read(setupFile, 'utf-8');
-    tree.write(
-      setupFile,
-      `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
-globalThis.ngJest = {
-  testEnvironmentOptions: {
+    if (options.strict) {
+      tree.write(
+        setupFile,
+        `${contents}
+setupZoneTestEnv(
     errorOnUnknownElements: true,
-    errorOnUnknownProperties: true,
-  },
-};
-${contents}`
-    );
+    errorOnUnknownProperties: true
+);          
+`
+      );
+    } else {
+      tree.write(
+        setupFile,
+        `${contents}
+setupZoneTestEnv();          
+`
+      );
+    }
   }
 }
diff --git a/packages/jest/src/generators/configuration/configuration.spec.ts b/packages/jest/src/generators/configuration/configuration.spec.ts
@@ -55,7 +55,7 @@ describe('jestProject', () => {
     } as JestProjectSchema);
     expect(tree.read('libs/lib1/src/test-setup.ts', 'utf-8'))
       .toMatchInlineSnapshot(`
-      "import 'jest-preset-angular/setup-jest';
+      "import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
       "
     `);
     expect(tree.exists('libs/lib1/jest.config.ts')).toBeTruthy();

diff --git a/packages/jest/src/generators/configuration/files-angular/src/test-setup.ts__tmpl__ b/packages/jest/src/generators/configuration/files-angular/src/test-setup.ts__tmpl__
@@ -1 +1 @@
-import 'jest-preset-angular/setup-jest';
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import 'jest-preset-angular/setup-jest';
		import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';