test: adjust middleware tests

Author: BioPhoton

packages/cli/src/lib/compare/compare-command.unit.test.ts

@@ -41,12 +41,19 @@ describe('compare-command', () => {
           outputDir: DEFAULT_PERSIST_OUTPUT_DIR,
           filename: DEFAULT_PERSIST_FILENAME,
           format: DEFAULT_PERSIST_FORMAT,
+          report: true,
+        },
+        upload: {
+          apiKey: 'dummy-api-key',
+          organization: 'code-pushup',
+          project: 'cli',
+          server: 'https://example.com/api',
         },
-        upload: expect.any(Object),
       },
       {
         before: 'source-report.json',
         after: 'target-report.json',
+        label: undefined,
       },
     );
   });

packages/cli/src/lib/implementation/core-config.int.test.ts

@@ -64,6 +64,7 @@ describe('parsing values from CLI and middleware', () => {
       filename: DEFAULT_PERSIST_FILENAME,
       format: DEFAULT_PERSIST_FORMAT,
       outputDir: DEFAULT_PERSIST_OUTPUT_DIR,
+      report: true,
     });
   });
 
@@ -85,6 +86,7 @@ describe('parsing values from CLI and middleware', () => {
       filename: 'cli-filename',
       format: ['md'],
       outputDir: 'cli-outputDir',
+      report: true,
     });
   });
 
@@ -101,6 +103,7 @@ describe('parsing values from CLI and middleware', () => {
       filename: 'rc-filename',
       format: ['json', 'md'],
       outputDir: 'rc-outputDir',
+      report: true,
     });
   });
 
@@ -122,6 +125,7 @@ describe('parsing values from CLI and middleware', () => {
       filename: 'cli-filename',
       format: ['md'],
       outputDir: 'cli-outputDir',
+      report: true,
     });
   });
 
@@ -141,6 +145,7 @@ describe('parsing values from CLI and middleware', () => {
       filename: 'rc-filename',
       format: DEFAULT_PERSIST_FORMAT,
       outputDir: 'cli-outputdir',
+      report: true,
     });
   });
 

packages/cli/src/lib/implementation/core-config.middleware.ts

@@ -23,7 +23,6 @@ export async function coreConfigMiddleware<
     tsconfig,
     persist: cliPersist,
     upload: cliUpload,
-    cache: cliCache,
     ...remainingCliOptions
   } = processArgs;
   // Search for possible configuration file extensions if path is not given
@@ -44,11 +43,6 @@ export async function coreConfigMiddleware<
         });
   return {
     ...(config != null && { config }),
-    cache: {
-      write: false,
-      read: false,
-      ...cliCache,
-    },
     persist: {
       outputDir:
         cliPersist?.outputDir ??

packages/cli/src/lib/implementation/core-config.middleware.unit.test.ts

@@ -73,14 +73,4 @@ describe('coreConfigMiddleware', () => {
       'apps/website/tsconfig.json',
     );
   });
-
-  it('should forward normalize --persist.report option', async () => {
-    await coreConfigMiddleware({
-      config: 'apps/website/code-pushup.config.ts',
-    } as GeneralCliOptions & CoreConfigCliOptions & FilterOptions);
-    expect(readRcByPath).toHaveBeenCalledWith(
-      'apps/website/code-pushup.config.ts',
-      'apps/website/tsconfig.json',
-    );
-  });
 });

packages/cli/src/lib/implementation/core-config.model.ts

@@ -19,6 +19,6 @@ export type ConfigCliOptions = {
   verbose?: string;
 };
 
-export type CoreConfigCliOptions = Pick<CoreConfig, 'persist' | 'cache'> & {
+export type CoreConfigCliOptions = Pick<CoreConfig, 'persist'> & {
   upload?: Partial<Omit<UploadConfig, 'timeout'>>;
 };

packages/cli/src/lib/merge-diffs/merge-diffs-command.unit.test.ts

@@ -47,6 +47,7 @@ describe('merge-diffs-command', () => {
         outputDir: DEFAULT_PERSIST_OUTPUT_DIR,
         filename: DEFAULT_PERSIST_FILENAME,
         format: DEFAULT_PERSIST_FORMAT,
+        report: true,
       },
     );
   });