wip

code-pushup · Oct 13, 2024 · 465595b · 465595b
1 parent 1071e60
commit 465595b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/e2e/nx-plugin-e2e/tests/executor-cli.e2e.test.ts b/e2e/nx-plugin-e2e/tests/executor-cli.e2e.test.ts
@@ -45,6 +45,12 @@ async function addTargetToWorkspace(
         codeStrings: 'customPlugin()',
       },
     ],
+    upload: {
+      server: 'https://dummy-server.dev',
+      organization: 'dummy-organization',
+      apiKey: 'dummy-api-key',
+      project: 'dummy-project',
+    },
   });
   await materializeTree(tree, cwd);
 }
@@ -95,13 +101,13 @@ describe('executor command', () => {
     ).rejects.toThrow('');
   });
 
-  it('should execute collect executor', async () => {
+  it('should execute collect executor and add report to sub folder named by project', async () => {
     const cwd = join(baseDir, 'execute-collect-command');
     await addTargetToWorkspace(tree, { cwd, project });
 
     const { stdout, code } = await executeProcess({
-      command: 'npx',
-      args: ['nx', 'run', `${project}:code-pushup`, 'collect'],
+      command: 'nx',
+      args: ['run', `${project}:code-pushup`, 'collect'],
       cwd,
     });
 

diff --git a/e2e/nx-plugin-e2e/vite.config.e2e.ts b/e2e/nx-plugin-e2e/vite.config.e2e.ts
@@ -6,7 +6,7 @@ export default defineConfig({
   cacheDir: '../../node_modules/.vite/nx-plugin-e2e',
   test: {
     reporters: ['basic'],
-    testTimeout: 60_000,
+    testTimeout: 160_000,
     globals: true,
     alias: tsconfigPathAliases(),
     pool: 'threads',

diff --git a/packages/nx-plugin/src/executors/internal/config.ts b/packages/nx-plugin/src/executors/internal/config.ts
@@ -56,7 +56,7 @@ export function uploadConfig(
   return {
     ...(projectName
       ? {
-          project: applyPrefix ? `${prefix}${projectName}` : projectName, // provide correct project
+          project: applyPrefix ? `${prefix}${projectName}` : projectName,
         }
       : {}),
     ...parseEnv(process.env),