fix: e2e tests

Author: BioPhoton

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

@@ -1,7 +1,7 @@
-import {type Tree, updateProjectConfiguration} from '@nx/devkit';
+import { type Tree, updateProjectConfiguration } from '@nx/devkit';
 import path from 'node:path';
-import {readProjectConfiguration} from 'nx/src/generators/utils/project-configuration';
-import {afterEach, expect} from 'vitest';
+import { readProjectConfiguration } from 'nx/src/generators/utils/project-configuration';
+import { afterEach, expect } from 'vitest';
 import {
   type AutorunCommandExecutorOptions,
   generateCodePushupConfig,
@@ -17,27 +17,27 @@ import {
   removeColorCodes,
   teardownTestFolder,
 } from '@code-pushup/test-utils';
-import {executeProcess, readJsonFile} from '@code-pushup/utils';
-import {INLINE_PLUGIN} from './inline-plugin.js';
+import { executeProcess, readJsonFile } from '@code-pushup/utils';
+import { INLINE_PLUGIN } from './inline-plugin.js';
 
 async function addTargetToWorkspace(
   tree: Tree,
   options: { cwd: string; project: string },
   executorOptions?: AutorunCommandExecutorOptions,
 ) {
-  const {cwd, project} = options;
+  const { cwd, project } = options;
   const projectCfg = readProjectConfiguration(tree, project);
   updateProjectConfiguration(tree, project, {
     ...projectCfg,
     targets: {
       ...projectCfg.targets,
       'code-pushup': {
         executor: '@code-pushup/nx-plugin:cli',
-        ...(executorOptions && {options: executorOptions}),
+        ...(executorOptions && { options: executorOptions }),
       },
     },
   });
-  const {root} = projectCfg;
+  const { root } = projectCfg;
   generateCodePushupConfig(tree, root, {
     plugins: [
       {
@@ -73,8 +73,8 @@ describe('executor command', () => {
 
   it('should execute no specific command by default', async () => {
     const cwd = path.join(testFileDir, 'execute-default-command');
-    await addTargetToWorkspace(tree, {cwd, project});
-    const {stdout, code} = await executeProcess({
+    await addTargetToWorkspace(tree, { cwd, project });
+    const { stdout, code } = await executeProcess({
       command: 'npx',
       args: ['nx', 'run', `${project}:code-pushup`, '--dryRun'],
       cwd,
@@ -87,9 +87,9 @@ describe('executor command', () => {
 
   it('should execute print-config executor', async () => {
     const cwd = path.join(testFileDir, 'execute-print-config-command');
-    await addTargetToWorkspace(tree, {cwd, project});
+    await addTargetToWorkspace(tree, { cwd, project });
 
-    const {stdout, code} = await executeProcess({
+    const { stdout, code } = await executeProcess({
       command: 'npx',
       args: ['nx', 'run', `${project}:code-pushup`, 'print-config'],
       cwd,
@@ -106,9 +106,9 @@ describe('executor command', () => {
 
   it('should execute print-config executor with api key', async () => {
     const cwd = path.join(testFileDir, 'execute-print-config-command');
-    await addTargetToWorkspace(tree, {cwd, project});
+    await addTargetToWorkspace(tree, { cwd, project });
 
-    const {stdout, code} = await executeProcess({
+    const { stdout, code } = await executeProcess({
       command: 'npx',
       args: [
         'nx',
@@ -134,7 +134,7 @@ describe('executor command', () => {
     const cwd = path.join(testFileDir, 'execute-collect-with-merged-options');
     await addTargetToWorkspace(
       tree,
-      {cwd, project},
+      { cwd, project },
       {
         persist: {
           outputDir: '.reports',
@@ -143,7 +143,7 @@ describe('executor command', () => {
       },
     );
 
-    const {stdout, code} = await executeProcess({
+    const { stdout, code } = await executeProcess({
       command: 'npx',
       args: [
         'nx',
@@ -168,9 +168,9 @@ describe('executor command', () => {
 
   it('should execute collect executor and add report to sub folder named by project', async () => {
     const cwd = path.join(testFileDir, 'execute-collect-command');
-    await addTargetToWorkspace(tree, {cwd, project});
+    await addTargetToWorkspace(tree, { cwd, project });
 
-    const {stdout, code} = await executeProcess({
+    const { stdout, code } = await executeProcess({
       command: 'npx',
       args: ['nx', 'run', `${project}:code-pushup`, 'collect'],
       cwd,

packages/nx-plugin/src/executors/cli/executor.unit.test.ts

@@ -1,6 +1,6 @@
 import { logger } from '@nx/devkit';
 import { execSync } from 'node:child_process';
-import { afterEach, expect, vi } from 'vitest';
+import { afterAll, afterEach, beforeEach, expect, vi } from 'vitest';
 import { executorContext } from '@code-pushup/test-nx-utils';
 import { MEMFS_VOLUME } from '@code-pushup/test-utils';
 import runAutorunExecutor from './executor.js';
@@ -19,14 +19,31 @@ vi.mock('node:child_process', async () => {
 });
 
 describe('runAutorunExecutor', () => {
+  const processEnvCP = Object.fromEntries(
+    Object.entries(process.env).filter(([k]) => k.startsWith('CP_')),
+  );
   const loggerInfoSpy = vi.spyOn(logger, 'info');
   const loggerWarnSpy = vi.spyOn(logger, 'warn');
 
+  beforeAll(() => {
+    Object.entries(process.env)
+      .filter(([k]) => k.startsWith('CP_'))
+      .forEach(([k]) => delete process.env[k]);
+  });
+
+  beforeEach(() => {
+    vi.unstubAllEnvs();
+  });
+
   afterEach(() => {
     loggerWarnSpy.mockReset();
     loggerInfoSpy.mockReset();
   });
 
+  afterAll(() => {
+    Object.entries(processEnvCP).forEach(([k, v]) => (process.env[k] = v));
+  });
+
   it('should call execSync with return result', async () => {
     const output = await runAutorunExecutor({}, executorContext('utils'));
     expect(output.success).toBe(true);
@@ -63,7 +80,20 @@ describe('runAutorunExecutor', () => {
     expect(output.command).toMatch('--persist.filename="REPORT"');
   });
 
-  it('should create command from context, options and arguments', async () => {
+  it('should create command from context and options if no api key is set', async () => {
+    vi.stubEnv('CP_PROJECT', 'CLI');
+    const output = await runAutorunExecutor(
+      { persist: { filename: 'REPORT', format: ['md', 'json'] } },
+      executorContext('core'),
+    );
+    expect(output.command).toMatch('--persist.filename="REPORT"');
+    expect(output.command).toMatch(
+      '--persist.format="md" --persist.format="json"',
+    );
+  });
+
+  it('should create command from context, options and arguments if api key is set', async () => {
+    vi.stubEnv('CP_API_KEY', 'cp_1234567');
     vi.stubEnv('CP_PROJECT', 'CLI');
     const output = await runAutorunExecutor(
       { persist: { filename: 'REPORT', format: ['md', 'json'] } },
@@ -73,6 +103,7 @@ describe('runAutorunExecutor', () => {
     expect(output.command).toMatch(
       '--persist.format="md" --persist.format="json"',
     );
+    expect(output.command).toMatch('--upload.apiKey="cp_1234567"');
     expect(output.command).toMatch('--upload.project="CLI"');
   });