refactor: wip

Author: John Doe

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

@@ -27,17 +27,21 @@ async function addTargetToWorkspace(
 ) {
   const { cwd, project } = options;
   const projectCfg = readProjectConfiguration(tree, project);
+  const { root } = projectCfg;
+  const configPath = path.join(root, 'code-pushup.config.ts');
   updateProjectConfiguration(tree, project, {
     ...projectCfg,
     targets: {
       ...projectCfg.targets,
       'code-pushup': {
         executor: '@code-pushup/nx-plugin:cli',
-        ...(executorOptions && { options: executorOptions }),
+        options: {
+          config: configPath,
+          ...executorOptions,
+        },
       },
     },
   });
-  const { root } = projectCfg;
   generateCodePushupConfig(tree, root, {
     plugins: [
       {
@@ -144,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 });
 
@@ -156,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,
     });
@@ -203,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 () => {
@@ -223,7 +236,7 @@ describe('executor command', () => {
     expect(cleanStdout).toContain('nx run my-lib:code-pushup collect');
 
     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

@@ -29,6 +29,7 @@ describe('nx-plugin', () => {
     TEST_OUTPUT_DIR,
     'plugin-create-nodes',
   );
+  const PACKAGE_NAME = '@code-pushup/nx-plugin';
 
   beforeEach(async () => {
     tree = await generateWorkspaceAndProject(project);
@@ -120,7 +121,7 @@ describe('nx-plugin', () => {
     expect(projectJson.targets).toStrictEqual({
       'code-pushup--configuration': expect.objectContaining({
         options: {
-          command: `nx g XYZ:configuration --project="${project}"`,
+          command: `nx g ${PACKAGE_NAME}:configuration --project="${project}"`,
         },
       }),
     });
@@ -198,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');
   });