feat(testing): update jest-preset-angular to v8.0.0 part 3

nrwl · Jan 31, 2020 · a482722 · a482722
1 parent 4068368
commit a482722
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 25 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,4 +1,4 @@
-{
-  "singleQuote": true,
-  "endOfLine": "lf"
-}
+{
+  "singleQuote": true,
+  "endOfLine": "lf"
+}
diff --git a/packages/jest/migrations.json b/packages/jest/migrations.json
@@ -10,15 +10,15 @@
       "description": "Update Jest testPathPattern option",
       "factory": "./src/migrations/update-8-7-0/update-8-7-0"
     },
-    "update-8.10.0": {
-      "version": "8.10.0",
-      "description": "Upgrades jest-preset-angular and runs migrations for breaking changes",
-      "factory": "./src/migrations/update-8-10-0/update-8-10-0"
+    "update-9.0.0": {
+      "version": "9.0.0",
+      "description": "Upgrades jest-preset-angular to 8.0.0",
+      "factory": "./src/migrations/update-9-0-0/update-9-0-0"
     }
   },
   "packageJsonUpdates": {
-    "8.10.0": {
-      "version": "8.10.0-beta.1",
+    "9.0.0": {
+      "version": "9.0.0-beta.1",
       "packages": {
         "jest-preset-angular": {
           "version": "8.0.0",

diff --git a/...tions/update-8-10-0/update-8-10-0.spec.ts → ...rations/update-9-0-0/update-9-0-0.spec.ts b/...tions/update-8-10-0/update-8-10-0.spec.ts → ...rations/update-9-0-0/update-9-0-0.spec.ts
@@ -5,7 +5,7 @@ import * as path from 'path';
 import { createEmptyWorkspace } from '@nrwl/workspace/testing';
 import { serializeJson } from '@nrwl/workspace';
 
-describe('Update 8.10.0', () => {
+describe('Update 9.0.0', () => {
   let initialTree: Tree;
   let schematicRunner: SchematicTestRunner;
 
@@ -105,7 +105,7 @@ describe('Update 8.10.0', () => {
 
   it('should update jest-preset-angular to 8.0.0', async () => {
     const result = await schematicRunner
-      .runSchematicAsync('update-8.10.0', {}, initialTree)
+      .runSchematicAsync('update-9.0.0', {}, initialTree)
       .toPromise();
 
     const { devDependencies } = readJsonInTree(result, 'package.json');
@@ -114,7 +114,7 @@ describe('Update 8.10.0', () => {
 
   it(`it should add '/build' into jest-preset-angular snapshotSerializers in any jest.config.js where it exists`, async () => {
     const result = await schematicRunner
-      .runSchematicAsync('update-8.10.0', {}, initialTree)
+      .runSchematicAsync('update-9.0.0', {}, initialTree)
       .toPromise();
 
     const updateJestAngularOne = result.readContent(

diff --git a/...migrations/update-8-10-0/update-8-10-0.ts → ...c/migrations/update-9-0-0/update-9-0-0.ts b/...migrations/update-8-10-0/update-8-10-0.ts → ...c/migrations/update-9-0-0/update-9-0-0.ts
@@ -26,7 +26,7 @@ export default function update(): Rule {
     displayInformation,
     updatePackagesInPackageJson(
       path.join(__dirname, '../../../', 'migrations.json'),
-      '8.10.0'
+      '9.0.0'
     ),
     updateJestConfigs,
     formatFiles()
@@ -54,18 +54,28 @@ function updateJestConfigs(host: Tree) {
     const workspaceConfig = readWorkspace(host);
     const jestConfigsToUpdate = [];
 
-    Object.keys(workspaceConfig.projects).forEach(name => {
-      const project = workspaceConfig.projects[name];
-      if (
-        project.architect &&
-        project.architect.test &&
-        project.architect.test.builder === '@nrwl/jest:jest' &&
-        project.architect.test.options &&
-        project.architect.test.options.jestConfig ===
-          project.root + 'jest.config.js'
-      ) {
-        jestConfigsToUpdate.push(project.root + 'jest.config.js');
+    Object.values<any>(workspaceConfig.projects).forEach(project => {
+      if (!project.architect) {
+        return;
       }
+
+      Object.values<any>(project.architect).forEach(target => {
+        if (target.builder !== '@nrwl/jest:jest') {
+          return;
+        }
+
+        if (target.options.jestConfig) {
+          jestConfigsToUpdate.push(target.options.jestConfig);
+        }
+
+        if (target.configurations) {
+          Object.values<any>(target.configurations).forEach(config => {
+            if (config.jestConfig) {
+              jestConfigsToUpdate.push(config.jestConfig);
+            }
+          });
+        }
+      });
     });
 
     jestConfigsToUpdate.forEach(configPath => {