refactor: use nx-verdaccio for e2e testing (#842)

This PR uses `nx-verdaccio` for all but `cli-e2e` project. In a follow up PR #844 the `e2e-old` target gets refactored and the tooling code gets a cleanup --------- Signed-off-by: Vojtech Masek <[email protected]> Co-authored-by: Vojtech Masek <[email protected]> Co-authored-by: hanna-skryl <[email protected]>
code-pushup · Nov 5, 2024 · d61a19d · d61a19d
1 parent e9560f5
commit d61a19d
Show file tree

Hide file tree

Showing 18 changed files with 5,278 additions and 3,802 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -120,7 +120,7 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: E2E test affected projects
-        run: npx nx affected:e2e --parallel=1
+        run: npx nx affected -t nxv-e2e --exclude cli-e2e --parallel=1
       - name: E2E test cli-e2e project (due to bugs in the setup it has to run last :( )
         run: npx nx run cli-e2e:e2e-old
 

diff --git a/e2e/ci-e2e/project.json b/e2e/ci-e2e/project.json
@@ -18,6 +18,6 @@
       }
     }
   },
-  "implicitDependencies": ["models", "utils", "core", "cli", "ci"],
+  "implicitDependencies": ["cli", "ci"],
   "tags": ["scope:tooling", "type:e2e"]
 }
diff --git a/e2e/ci-e2e/vite.config.e2e.ts b/e2e/ci-e2e/vite.config.e2e.ts
@@ -16,7 +16,6 @@ export default defineConfig({
     },
     environment: 'node',
     include: ['tests/**/*.e2e.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    globalSetup: ['../../global-setup.verdaccio.ts'],
     setupFiles: ['../../testing/test-setup/src/lib/reset.mocks.ts'],
   },
 });
diff --git a/e2e/create-cli-e2e/vite.config.e2e.ts b/e2e/create-cli-e2e/vite.config.e2e.ts
@@ -17,7 +17,6 @@ export default defineConfig({
     },
     environment: 'node',
     include: ['tests/**/*.e2e.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    globalSetup: ['../../global-setup.verdaccio.ts'],
     setupFiles: ['../../testing/test-setup/src/lib/reset.mocks.ts'],
   },
 });
diff --git a/e2e/nx-plugin-e2e/project.json b/e2e/nx-plugin-e2e/project.json
@@ -18,13 +18,6 @@
       }
     }
   },
-  "implicitDependencies": [
-    "test-utils",
-    "models",
-    "utils",
-    "core",
-    "cli",
-    "nx-plugin"
-  ],
+  "implicitDependencies": ["test-utils", "nx-plugin"],
   "tags": ["scope:tooling", "type:e2e"]
 }
diff --git a/e2e/nx-plugin-e2e/tests/executor-cli.e2e.test.ts b/e2e/nx-plugin-e2e/tests/executor-cli.e2e.test.ts
@@ -47,6 +47,7 @@ async function addTargetToWorkspace(
         codeStrings: 'customPlugin()',
       },
     ],
+    // The upload test is skipped as it requires the @code-pushup/portal-client dependency
     upload: {
       server: 'https://dummy-server.dev',
       organization: 'dummy-organization',
@@ -108,8 +109,8 @@ describe('executor command', () => {
     await addTargetToWorkspace(tree, { cwd, project });
 
     const { stdout, code } = await executeProcess({
-      command: 'nx',
-      args: ['run', `${project}:code-pushup`, 'collect'],
+      command: 'npx',
+      args: ['nx', 'run', `${project}:code-pushup`, 'collect'],
       cwd,
     });
 
@@ -136,17 +137,4 @@ describe('executor command', () => {
       }),
     );
   });
-
-  it('should execute upload executor to throw if no report is present', async () => {
-    const cwd = join(baseDir, 'execute-upload-command');
-    await addTargetToWorkspace(tree, { cwd, project });
-
-    await expect(
-      executeProcess({
-        command: 'npx',
-        args: ['nx', 'run', `${project}:code-pushup`, 'upload'],
-        cwd,
-      }),
-    ).rejects.toThrow(/report.json/);
-  });
 });
diff --git a/e2e/nx-plugin-e2e/vite.config.e2e.ts b/e2e/nx-plugin-e2e/vite.config.e2e.ts
@@ -16,7 +16,6 @@ export default defineConfig({
     },
     environment: 'node',
     include: ['tests/**/*.e2e.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    globalSetup: ['../../global-setup.verdaccio.ts'],
     setupFiles: ['../../testing/test-setup/src/lib/reset.mocks.ts'],
   },
 });
diff --git a/e2e/plugin-lighthouse-e2e/project.json b/e2e/plugin-lighthouse-e2e/project.json
@@ -18,12 +18,6 @@
       }
     }
   },
-  "implicitDependencies": [
-    "models",
-    "utils",
-    "core",
-    "cli",
-    "plugin-lighthouse"
-  ],
+  "implicitDependencies": ["cli", "plugin-lighthouse"],
   "tags": ["scope:plugin", "type:e2e"]
 }
diff --git a/e2e/plugin-lighthouse-e2e/vite.config.e2e.ts b/e2e/plugin-lighthouse-e2e/vite.config.e2e.ts
@@ -16,7 +16,6 @@ export default defineConfig({
     },
     environment: 'node',
     include: ['tests/**/*.e2e.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    globalSetup: ['../../global-setup.verdaccio.ts'],
     setupFiles: ['../../testing/test-setup/src/lib/reset.mocks.ts'],
   },
 });
diff --git a/nx.json b/nx.json
@@ -111,6 +111,18 @@
     "releaseTagPattern": "v{version}"
   },
   "plugins": [
+    {
+      "plugin": "@push-based/nx-verdaccio",
+      "options": {
+        "environments": {
+          "environmentsDir": "tmp/e2e",
+          "targetNames": ["e2e"]
+        },
+        "packages": {
+          "filterByTags": ["publishable"]
+        }
+      }
+    },
     "./tools/src/debug/debug.plugin.ts",
     {
       "plugin": "./tools/src/npm/npm.plugin.ts",