refactor: fix e2e

Author: John Doe

e2e/nx-plugin-e2e/tests/executor-cli.e2e.test.ts

@@ -148,7 +148,7 @@ describe('executor command', () => {
     ).resolves.not.toThrow();
   });
 
-  it('should execute print-config executor with api key', async () => {
+  it('should execute print-config executor with upload config', async () => {
     const cwd = path.join(testFileDir, 'execute-print-config-command');
     await addTargetToWorkspace(tree, { cwd, project });
 
@@ -160,6 +160,9 @@ describe('executor command', () => {
         `${project}:code-pushup`,
         'print-config',
         '--upload.apiKey=a123a',
+        '--upload.server=https://example.com',
+        '--upload.organization=test-org',
+        '--upload.project=test-project',
       ],
       cwd,
     });
@@ -207,9 +210,15 @@ describe('executor command', () => {
     );
     expect(cleanStdout).toContain('Code PushUp CLI');
 
-    await expect(
-      readJsonFile(path.join(cwd, '.reports', 'terminal-report.json')),
-    ).resolves.not.toThrow();
+    // Check for report in project root's .reports directory
+    const reportPath = path.join(
+      cwd,
+      'libs',
+      project,
+      '.reports',
+      'terminal-report.json',
+    );
+    await expect(readJsonFile(reportPath)).resolves.not.toThrow();
   });
 
   it('should execute collect executor and add report to sub folder named by project', async () => {
@@ -226,8 +235,9 @@ describe('executor command', () => {
     const cleanStdout = removeColorCodes(stdout);
     expect(cleanStdout).toContain('nx run my-lib:code-pushup collect');
 
+    // Check for report in project root's .code-pushup directory
     const report = await readJsonFile(
-      path.join(cwd, '.code-pushup', project, 'report.json'),
+      path.join(cwd, 'libs', project, '.code-pushup', 'report.json'),
     );
     expect(report).toStrictEqual(
       expect.objectContaining({

e2e/nx-plugin-e2e/tests/plugin-create-nodes.e2e.test.ts

@@ -199,8 +199,9 @@ describe('nx-plugin', () => {
     const cleanStdout = removeColorCodes(stdout);
     // Nx command
     expect(cleanStdout).toContain('nx run my-lib:code-pushup');
-    // Run CLI executor
-    expect(cleanStdout).toContain('Command: npx @code-pushup/cli');
+    // Run CLI executor - check for DryRun execution message
+    expect(cleanStdout).toContain('DryRun execution of:');
+    expect(cleanStdout).toContain('npx @code-pushup/cli');
     expect(cleanStdout).toContain('--dryRun --verbose');
   });
 

packages/utils/src/lib/execute-process.ts

@@ -164,7 +164,8 @@ export function executeProcess(cfg: ProcessConfig): Promise<ProcessResult> {
       const spawnedProcess = spawn(command, args ?? [], {
         // shell:true tells Windows to use shell command for spawning a child process
         // https://stackoverflow.com/questions/60386867/node-spawn-child-process-not-working-in-windows
-        shell: true,
+        // Note: When shell is true, args are passed as-is to the shell
+        shell: process.platform === 'win32',
         windowsHide: true,
         ...options,
       }) as ChildProcessByStdio<Writable, Readable, Readable>;