fix(testing): preserve the old coverage layout

vsavkin · vsavkin · commit 34d861d23473 · 2022-12-11T14:47:16.000-05:00
diff --git a/docs/shared/angular-standalone-tutorial/3-task-running.md b/docs/shared/angular-standalone-tutorial/3-task-running.md
@@ -40,7 +40,7 @@ Here's the `project.json` file for your `shared-ui` project:
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectName}"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "shared/ui/jest.config.ts",
         "passWithNoTests": true
diff --git a/docs/shared/angular-standalone-tutorial/4-task-pipelines.md b/docs/shared/angular-standalone-tutorial/4-task-pipelines.md
@@ -157,7 +157,7 @@ Here are the outputs defined for the `shared-ui` project:
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectName}"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "shared/ui/jest.config.ts",
         "passWithNoTests": true
diff --git a/docs/shared/angular-tutorial/3-task-running.md b/docs/shared/angular-tutorial/3-task-running.md
@@ -24,7 +24,7 @@ Here's the `project.json` file for your `common-ui` project:
   "targets": {
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectName}"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/common-ui/jest.config.ts",
         "passWithNoTests": true
diff --git a/docs/shared/angular-tutorial/4-workspace-optimization.md b/docs/shared/angular-tutorial/4-workspace-optimization.md
@@ -89,7 +89,7 @@ Outputs are defined for every target in your workspace:
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectName}"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/products/jest.config.ts",
         "passWithNoTests": true
diff --git a/docs/shared/mental-model/large-tasks.json b/docs/shared/mental-model/large-tasks.json
@@ -14215,7 +14215,7 @@
           },
           "test": {
             "executor": "@nrwl/jest:jest",
-            "outputs": ["{workspaceRoot}/coverage/{projectName}"],
+            "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
               "jestConfig": "graph/ui-graph/jest.config.ts",
               "passWithNoTests": true
diff --git a/e2e/nx-run/src/affected-graph.test.ts b/e2e/nx-run/src/affected-graph.test.ts
@@ -331,7 +331,7 @@ describe('Nx Affected and Graph Tests', () => {
           target: 'test',
         },
         command: `${runNx} run ${myapp}:test`,
-        outputs: [`coverage/${myapp}`],
+        outputs: [`coverage/apps/${myapp}`],
       });
       compareTwoArrays(resWithTarget.projects, [myapp]);
 
diff --git a/graph/ui-graph/project.json b/graph/ui-graph/project.json
@@ -14,7 +14,7 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectName}"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "graph/ui-graph/jest.config.ts",
         "passWithNoTests": true
diff --git a/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -214,7 +214,7 @@ Object {
         "passWithNoTests": true,
       },
       "outputs": Array [
-        "{workspaceRoot}/coverage/{projectName}",
+        "{workspaceRoot}/coverage/{projectRoot}",
       ],
     },
   },
@@ -385,7 +385,7 @@ Object {
         "passWithNoTests": true,
       },
       "outputs": Array [
-        "{workspaceRoot}/coverage/{projectName}",
+        "{workspaceRoot}/coverage/{projectRoot}",
       ],
     },
   },
diff --git a/packages/angular/src/generators/application/__snapshots__/application.v14.spec.ts.snap b/packages/angular/src/generators/application/__snapshots__/application.v14.spec.ts.snap
@@ -222,7 +222,7 @@ Object {
         "passWithNoTests": true,
       },
       "outputs": Array [
-        "{workspaceRoot}/coverage/{projectName}",
+        "{workspaceRoot}/coverage/{projectRoot}",
       ],
     },
   },
@@ -393,7 +393,7 @@ Object {
         "passWithNoTests": true,
       },
       "outputs": Array [
-        "{workspaceRoot}/coverage/{projectName}",
+        "{workspaceRoot}/coverage/{projectRoot}",
       ],
     },
   },
diff --git a/packages/jest/src/generators/jest-project/__snapshots__/jest-project.spec.ts.snap b/packages/jest/src/generators/jest-project/__snapshots__/jest-project.spec.ts.snap
@@ -117,7 +117,7 @@ Object {
     "passWithNoTests": true,
   },
   "outputs": Array [
-    "{workspaceRoot}/coverage/{projectName}",
+    "{workspaceRoot}/coverage/{projectRoot}",
   ],
 }
 `;
diff --git a/packages/jest/src/generators/jest-project/jest-project.spec.ts b/packages/jest/src/generators/jest-project/jest-project.spec.ts
@@ -74,7 +74,7 @@ describe('jestProject', () => {
     const lib1 = readProjectConfiguration(tree, 'lib1');
     expect(lib1.targets.test).toEqual({
       executor: '@nrwl/jest:jest',
-      outputs: ['{workspaceRoot}/coverage/{projectName}'],
+      outputs: ['{workspaceRoot}/coverage/{projectRoot}'],
       options: {
         jestConfig: 'libs/lib1/jest.config.ts',
         passWithNoTests: true,
diff --git a/packages/jest/src/generators/jest-project/jest-project.ts b/packages/jest/src/generators/jest-project/jest-project.ts
@@ -3,7 +3,6 @@ import { checkForTestTarget } from './lib/check-for-test-target';
 import { createFiles } from './lib/create-files';
 import { updateTsConfig } from './lib/update-tsconfig';
 import { updateWorkspace } from './lib/update-workspace';
-import { updateJestConfig } from './lib/update-jestconfig';
 import { JestProjectSchema } from './schema';
 import { formatFiles, Tree, convertNxGenerator } from '@nrwl/devkit';
 
diff --git a/packages/jest/src/generators/jest-project/lib/update-workspace.ts b/packages/jest/src/generators/jest-project/lib/update-workspace.ts
@@ -12,7 +12,9 @@ export function updateWorkspace(tree: Tree, options: JestProjectSchema) {
   projectConfig.targets.test = {
     executor: '@nrwl/jest:jest',
     outputs: [
-      joinPathFragments('{workspaceRoot}', 'coverage', '{projectName}'),
+      options.rootProject
+        ? joinPathFragments('{workspaceRoot}', 'coverage', '{projectName}')
+        : joinPathFragments('{workspaceRoot}', 'coverage', '{projectRoot}'),
     ],
     options: {
       jestConfig: joinPathFragments(
diff --git a/packages/linter/src/generators/workspace-rules-project/workspace-rules-project.spec.ts b/packages/linter/src/generators/workspace-rules-project/workspace-rules-project.spec.ts
@@ -87,7 +87,7 @@ describe('@nrwl/linter:workspace-rules-project', () => {
               "passWithNoTests": true,
             },
             "outputs": Array [
-              "{workspaceRoot}/coverage/{projectName}",
+              "{workspaceRoot}/coverage/{projectRoot}",
             ],
           },
         },
diff --git a/packages/nest/src/generators/library/library.spec.ts b/packages/nest/src/generators/library/library.spec.ts
@@ -34,7 +34,7 @@ describe('lib', () => {
       });
       expect(workspaceJson.projects[libFileName].architect.test).toEqual({
         builder: '@nrwl/jest:jest',
-        outputs: [`{workspaceRoot}/coverage/{projectName}`],
+        outputs: [`{workspaceRoot}/coverage/{projectRoot}`],
         options: {
           jestConfig: `libs/${libFileName}/jest.config.ts`,
           passWithNoTests: true,
diff --git a/packages/node/src/generators/library/library.spec.ts b/packages/node/src/generators/library/library.spec.ts
@@ -38,7 +38,7 @@ describe('lib', () => {
       });
       expect(workspaceJson.projects['my-lib'].architect.test).toEqual({
         builder: '@nrwl/jest:jest',
-        outputs: ['{workspaceRoot}/coverage/{projectName}'],
+        outputs: ['{workspaceRoot}/coverage/{projectRoot}'],
         options: {
           jestConfig: 'libs/my-lib/jest.config.ts',
           passWithNoTests: true,
diff --git a/packages/nx-plugin/src/generators/plugin/plugin.spec.ts b/packages/nx-plugin/src/generators/plugin/plugin.spec.ts
@@ -80,7 +80,7 @@ describe('NxPlugin Plugin Generator', () => {
     });
     expect(project.targets.test).toEqual({
       executor: '@nrwl/jest:jest',
-      outputs: ['{workspaceRoot}/coverage/{projectName}'],
+      outputs: ['{workspaceRoot}/coverage/{projectRoot}'],
       options: {
         jestConfig: 'libs/my-plugin/jest.config.ts',
         passWithNoTests: true,
diff --git a/packages/vite/src/generators/configuration/__snapshots__/configuration.spec.ts.snap b/packages/vite/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
@@ -71,7 +71,7 @@ exports[`@nrwl/vite:configuration transform React app to use Vite should transfo
         \\"test\\": {
           \\"builder\\": \\"@nrwl/jest:jest\\",
           \\"outputs\\": [
-            \\"{workspaceRoot}/coverage/{projectName}\\"
+            \\"{workspaceRoot}/coverage/{projectRoot}\\"
           ],
           \\"options\\": {
             \\"jestConfig\\": \\"apps/my-test-react-app/jest.config.ts\\",
@@ -148,7 +148,7 @@ exports[`@nrwl/vite:configuration transform Web app to use Vite should transform
         \\"test\\": {
           \\"builder\\": \\"@nrwl/jest:jest\\",
           \\"outputs\\": [
-            \\"{workspaceRoot}/coverage/{projectName}\\"
+            \\"{workspaceRoot}/coverage/{projectRoot}\\"
           ],
           \\"options\\": {
             \\"jestConfig\\": \\"apps/my-test-web-app/jest.config.ts\\",
diff --git a/packages/vite/src/generators/vitest/vitest.spec.ts b/packages/vite/src/generators/vitest/vitest.spec.ts
@@ -28,7 +28,7 @@ describe('vitest generator', () => {
           "passWithNoTests": true,
         },
         "outputs": Array [
-          "{workspaceRoot}/coverage/{projectName}",
+          "{workspaceRoot}/coverage/{projectRoot}",
         ],
       }
     `);
diff --git a/packages/vite/src/utils/test-files/react-project.config.json b/packages/vite/src/utils/test-files/react-project.config.json
@@ -74,7 +74,7 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectName}"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/my-test-react-app/jest.config.ts",
         "passWithNoTests": true
diff --git a/packages/vite/src/utils/test-files/web-project.config.json b/packages/vite/src/utils/test-files/web-project.config.json
@@ -62,7 +62,7 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectName}"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/my-test-web-app/jest.config.ts",
         "passWithNoTests": true

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ Object {`
`117`	`117`	`"passWithNoTests": true,`
`118`	`118`	`},`
`119`	`119`	`"outputs": Array [`
`120`		`- "{workspaceRoot}/coverage/{projectName}",`
	`120`	`+ "{workspaceRoot}/coverage/{projectRoot}",`
`121`	`121`	`],`
`122`	`122`	`}`
`123`	`123`	`;