test: unify fs mock constant and application, clean up testing-utils

Tlacenka · Tlacenka · commit fc281a0f52d3 · 2024-01-08T18:20:24.000+01:00
diff --git a/packages/core/src/lib/implementation/persist.unit.test.ts b/packages/core/src/lib/implementation/persist.unit.test.ts
@@ -3,12 +3,9 @@ import { vol } from 'memfs';
 import { join } from 'path';
 import { beforeEach, describe, expect, it } from 'vitest';
 import { Report } from '@code-pushup/models';
-import { MEMFS_VOLUME } from '@code-pushup/models/testing';
-import { MINIMAL_REPORT_MOCK } from '@code-pushup/testing-utils';
+import { MEMFS_VOLUME, MINIMAL_REPORT_MOCK } from '@code-pushup/testing-utils';
 import { logPersistedResults, persistReport } from './persist';
 
-// @TODO: should throw PersistDirError
-// @TODO: should throw PersistError
 describe('persistReport', () => {
   beforeEach(() => {
     vol.fromJSON({}, MEMFS_VOLUME);
diff --git a/packages/core/src/lib/upload.unit.test.ts b/packages/core/src/lib/upload.unit.test.ts
@@ -1,9 +1,9 @@
 import { vol } from 'memfs';
 import { describe, expect } from 'vitest';
 import { PortalUploadArgs, uploadToPortal } from '@code-pushup/portal-client';
-import { MEMFS_VOLUME } from '@code-pushup/models/testing';
 import {
   ISO_STRING_REGEXP,
+  MEMFS_VOLUME,
   MINIMAL_REPORT_MOCK,
 } from '@code-pushup/testing-utils';
 import { upload } from './upload';
diff --git a/packages/models/test/index.ts b/packages/models/test/index.ts
@@ -1,6 +1,5 @@
 export { config, minimalConfig, minimalReport } from './fixtures/config.mock';
 export { reportMock } from './fixtures/report.mock';
-export * from './memfs';
 
 export { eslintPluginConfig } from './fixtures/eslint-plugin.mock';
 export { lighthousePluginConfig } from './fixtures/lighthouse-plugin.mock';
diff --git a/packages/models/test/memfs.ts b/packages/models/test/memfs.ts
diff --git a/packages/models/vite.config.unit.ts b/packages/models/vite.config.unit.ts
@@ -14,6 +14,7 @@ export default defineConfig({
     include: ['src/**/*.unit.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     globalSetup: ['global-setup.ts'],
     setupFiles: [
+      '../../testing-utils/src/lib/setup/fs.mock.ts',
       '../../testing-utils/src/lib/setup/console.mock.ts',
       '../../testing-utils/src/lib/setup/reset.mocks.ts',
     ],
diff --git a/packages/nx-plugin/src/generators/configuration/generator.integration.test.ts b/packages/nx-plugin/src/generators/configuration/generator.integration.test.ts
diff --git a/packages/nx-plugin/src/generators/init/generator.integration.test.ts b/packages/nx-plugin/src/generators/init/generator.integration.test.ts
diff --git a/packages/nx-plugin/vite.config.unit.ts b/packages/nx-plugin/vite.config.unit.ts
@@ -13,6 +13,7 @@ export default defineConfig({
     environment: 'node',
     include: ['src/**/*.unit.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     setupFiles: [
+      '../../testing-utils/src/lib/setup/fs.mock.ts',
       '../../testing-utils/src/lib/setup/console.mock.ts',
       '../../testing-utils/src/lib/setup/reset.mocks.ts',
     ],
diff --git a/packages/plugin-eslint/src/lib/nx/projects-to-config.unit.test.ts b/packages/plugin-eslint/src/lib/nx/projects-to-config.unit.test.ts
@@ -6,6 +6,7 @@ import type {
 import type { ESLint } from 'eslint';
 import { vol } from 'memfs';
 import type { SpyInstance } from 'vitest';
+import { MEMFS_VOLUME } from '@code-pushup/testing-utils';
 import type { ESLintPluginConfig } from '../config';
 import { nxProjectsToConfig } from './projects-to-config';
 
@@ -46,8 +47,6 @@ describe('nxProjectsToConfig', () => {
     ),
   });
 
-  const MEMFS_VOLUME = '/test';
-
   let cwdSpy: SpyInstance;
 
   beforeAll(() => {
diff --git a/packages/plugin-eslint/src/lib/nx/utils.unit.test.ts b/packages/plugin-eslint/src/lib/nx/utils.unit.test.ts
@@ -1,9 +1,9 @@
 import { vol } from 'memfs';
 import type { SpyInstance } from 'vitest';
+import { MEMFS_VOLUME } from '@code-pushup/testing-utils';
 import { findCodePushupEslintrc } from './utils';
 
 describe('find code-pushup.eslintrc.* file', () => {
-  const MEMFS_VOLUME = '/test';
   let cwdSpy: SpyInstance;
 
   beforeAll(() => {
diff --git a/packages/plugin-lighthouse/test/.gitkeep b/packages/plugin-lighthouse/test/.gitkeep
diff --git a/packages/plugin-lighthouse/test/index.ts b/packages/plugin-lighthouse/test/index.ts
diff --git a/packages/plugin-lighthouse/tsconfig.lib.json b/packages/plugin-lighthouse/tsconfig.lib.json
@@ -11,6 +11,6 @@
     "vite.config.integration.ts",
     "src/**/*.test.ts",
     "src/**/*.mock.ts",
-    "test/**/*.ts"
+    "mocks/**/*.ts"
   ]
 }
diff --git a/packages/plugin-lighthouse/tsconfig.test.json b/packages/plugin-lighthouse/tsconfig.test.json
@@ -7,7 +7,7 @@
   "include": [
     "vite.config.unit.ts",
     "vite.config.integration.ts",
-    "test/**/*.ts",
+    "mocks/**/*.ts",
     "src/**/*.test.ts",
     "src/**/*.test.tsx",
     "src/**/*.test.js",
diff --git a/packages/plugin-lighthouse/vite.config.unit.ts b/packages/plugin-lighthouse/vite.config.unit.ts
@@ -14,6 +14,7 @@ export default defineConfig({
     include: ['src/**/*.unit.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     globalSetup: ['global-setup.ts'],
     setupFiles: [
+      '../../testing-utils/src/lib/setup/fs.mock.ts',
       '../../testing-utils/src/lib/setup/console.mock.ts',
       '../../testing-utils/src/lib/setup/reset.mocks.ts',
     ],
diff --git a/packages/utils/src/lib/file-system.unit.test.ts b/packages/utils/src/lib/file-system.unit.test.ts
@@ -2,7 +2,7 @@ import { stat } from 'fs/promises';
 import { vol } from 'memfs';
 import { join } from 'path';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { MEMFS_VOLUME } from '@code-pushup/models/testing';
+import { MEMFS_VOLUME } from '@code-pushup/testing-utils';
 import {
   FileResult,
   crawlFileSystem,
diff --git a/packages/utils/src/lib/report.unit.test.ts b/packages/utils/src/lib/report.unit.test.ts
@@ -1,7 +1,8 @@
 import { vol } from 'memfs';
 import { describe, expect, it } from 'vitest';
 import { Issue, IssueSeverity, PluginReport } from '@code-pushup/models';
-import { MEMFS_VOLUME, reportMock } from '@code-pushup/models/testing';
+import { reportMock } from '@code-pushup/models/testing';
+import { MEMFS_VOLUME } from '@code-pushup/testing-utils';
 import {
   calcDuration,
   compareIssueSeverity,
diff --git a/testing-utils/src/index.ts b/testing-utils/src/index.ts
@@ -2,5 +2,4 @@ export * from './lib/constants';
 export * from './lib/fixtures/configs/core-config.mock';
 export * from './lib/fixtures/configs/minimal-config.mock';
 export * from './lib/fixtures/report.mock';
-export * from './lib/testing-utils';
 export * from './lib/utils/execute-process-helper.mock';
diff --git a/testing-utils/src/lib/testing-utils.ts b/testing-utils/src/lib/testing-utils.ts
diff --git a/testing-utils/src/lib/testing-utils.unit.test.ts b/testing-utils/src/lib/testing-utils.unit.test.ts
diff --git a/testing-utils/vite.config.unit.ts b/testing-utils/vite.config.unit.ts
@@ -14,6 +14,7 @@ export default defineConfig({
     include: ['src/**/*.unit.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
     globalSetup: ['global-setup.ts'],
     setupFiles: [
+      'src/lib/setup/fs.mock.ts',
       'src/lib/setup/console.mock.ts',
       'src/lib/setup/reset.mocks.ts',
     ],
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -25,9 +25,6 @@
       "@code-pushup/lighthouse-plugin": [
         "packages/plugin-lighthouse/src/index.ts"
       ],
-      "@code-pushup/lighthouse-plugin/testing": [
-        "packages/plugin-lighthouse/test/index.ts"
-      ],
       "@code-pushup/models": ["packages/models/src/index.ts"],
       "@code-pushup/models/testing": ["packages/models/test/index.ts"],
       "@code-pushup/nx-plugin": ["packages/nx-plugin/src/index.ts"],
