diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e8ebe65d..d3f35f72d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,7 +96,7 @@ jobs: - name: Install dependencies run: npm ci - name: Integration test affected projects - run: npx nx affected -t integration-test --parallel=3 --coverage.enabled + run: npx nx affected -t int-test --parallel=3 --coverage.enabled e2e: strategy: diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index a9750725c..79e9e2ef7 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -21,7 +21,7 @@ jobs: - plugin-coverage - plugin-js-packages - plugin-lighthouse - scope: [unit, integration] + scope: [unit, int] name: Update code coverage runs-on: ubuntu-latest steps: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1d0cd09de..e26b3b9fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,7 +45,7 @@ npx nx graph npx nx run-many -t unit-test # run integration tests for all projects -npx nx run-many -t integration-test +npx nx run-many -t int-test # run E2E tests for CLI npx nx e2e cli-e2e diff --git a/code-pushup.preset.ts b/code-pushup.preset.ts index 521d47c7d..849ca0450 100644 --- a/code-pushup.preset.ts +++ b/code-pushup.preset.ts @@ -178,11 +178,10 @@ export const coverageCoreConfigNx = async ( if (projectName) { throw new Error('coverageCoreConfigNx for single projects not implemented'); } - const targetNames = ['unit-test', 'integration-test']; + const targetNames = ['unit-test', 'int-test']; const targetArgs = [ '-t', - 'unit-test', - 'integration-test', + ...targetNames, '--coverage.enabled', '--skipNxCache', ]; diff --git a/docs/e2e.md b/docs/e2e.md index 6bf043d7f..d7bef85b0 100644 --- a/docs/e2e.md +++ b/docs/e2e.md @@ -46,12 +46,12 @@ The `e2e` testing process is complex and involves multiple steps and targets. #### Overview: - `nx run e2e ` - - `global-setup.e2e.ts#setup` (vitest setup script configured in `vite.config.e2e.ts`) + - `global-setup.e2e.ts#setup` (vitest setup script configured in `vitest.e2e.config.ts`) - setup - `nx start-verdaccio` - setup - `nx run-many -t publish` - setup - `nx run-many -t npm-install` - **run tests** - - `global-setup.e2e.ts#teardown` (vitest teardown script configured in `vite.config.e2e.ts`) + - `global-setup.e2e.ts#teardown` (vitest teardown script configured in `vitest.e2e.config.ts`) - teardown - `nx run-many -t npm-uninstall` - teardown - `process.kill()` @@ -74,7 +74,7 @@ Root/ │ └── -e2e/ │ ├── tests/ │ │ └── .e2e.ts -│ ├── vite.config.e2e.ts # uses `global-setup.e2e.ts` for as `globalSetup` script +│ ├── vitest.e2e.config.ts # uses `global-setup.e2e.ts` for as `globalSetup` script │ └── project.json ├── packages/ │ └── / @@ -115,14 +115,14 @@ Root/ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/-e2e/vite.config.e2e.ts", + "configFile": "e2e/-e2e/vitest.e2e.config.ts", }, }, }, } ``` -2. 1. The `vite.config.e2e.ts` file is used to configure the Vite test runner. +2. 1. The `vitest.e2e.config.ts` file is used to configure the Vite test runner. Inside the file, the `globalSetup` option is set to `global-setup.e2e.ts`: ```typescript diff --git a/e2e/ci-e2e/project.json b/e2e/ci-e2e/project.json index 1d8221488..563202450 100644 --- a/e2e/ci-e2e/project.json +++ b/e2e/ci-e2e/project.json @@ -14,7 +14,7 @@ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/ci-e2e/vite.config.e2e.ts" + "configFile": "e2e/ci-e2e/vitest.e2e.config.ts" } } }, diff --git a/e2e/ci-e2e/tsconfig.test.json b/e2e/ci-e2e/tsconfig.test.json index cc6383cf6..307a55e79 100644 --- a/e2e/ci-e2e/tsconfig.test.json +++ b/e2e/ci-e2e/tsconfig.test.json @@ -5,7 +5,7 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/ci-e2e/vite.config.e2e.ts b/e2e/ci-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/ci-e2e/vite.config.e2e.ts rename to e2e/ci-e2e/vitest.e2e.config.ts diff --git a/e2e/cli-e2e/project.json b/e2e/cli-e2e/project.json index d06a9fbea..d93b112c8 100644 --- a/e2e/cli-e2e/project.json +++ b/e2e/cli-e2e/project.json @@ -14,7 +14,7 @@ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/cli-e2e/vite.config.e2e.ts" + "configFile": "e2e/cli-e2e/vitest.e2e.config.ts" } } }, diff --git a/e2e/cli-e2e/tsconfig.test.json b/e2e/cli-e2e/tsconfig.test.json index cc6383cf6..307a55e79 100644 --- a/e2e/cli-e2e/tsconfig.test.json +++ b/e2e/cli-e2e/tsconfig.test.json @@ -5,7 +5,7 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/cli-e2e/vite.config.e2e.ts b/e2e/cli-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/cli-e2e/vite.config.e2e.ts rename to e2e/cli-e2e/vitest.e2e.config.ts diff --git a/e2e/create-cli-e2e/project.json b/e2e/create-cli-e2e/project.json index aa2fb00ae..71bb2986d 100644 --- a/e2e/create-cli-e2e/project.json +++ b/e2e/create-cli-e2e/project.json @@ -15,7 +15,7 @@ "executor": "@nx/vite:test", "options": { "keepServerRunning": true, - "configFile": "e2e/create-cli-e2e/vite.config.e2e.ts" + "configFile": "e2e/create-cli-e2e/vitest.e2e.config.ts" } } }, diff --git a/e2e/create-cli-e2e/tsconfig.test.json b/e2e/create-cli-e2e/tsconfig.test.json index cc6383cf6..307a55e79 100644 --- a/e2e/create-cli-e2e/tsconfig.test.json +++ b/e2e/create-cli-e2e/tsconfig.test.json @@ -5,7 +5,7 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/create-cli-e2e/vite.config.e2e.ts b/e2e/create-cli-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/create-cli-e2e/vite.config.e2e.ts rename to e2e/create-cli-e2e/vitest.e2e.config.ts diff --git a/e2e/nx-plugin-e2e/project.json b/e2e/nx-plugin-e2e/project.json index d45f90e9e..6caa7f3a8 100644 --- a/e2e/nx-plugin-e2e/project.json +++ b/e2e/nx-plugin-e2e/project.json @@ -14,7 +14,7 @@ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/nx-plugin-e2e/vite.config.e2e.ts" + "configFile": "e2e/nx-plugin-e2e/vitest.e2e.config.ts" } } }, diff --git a/e2e/nx-plugin-e2e/tsconfig.test.json b/e2e/nx-plugin-e2e/tsconfig.test.json index cc6383cf6..307a55e79 100644 --- a/e2e/nx-plugin-e2e/tsconfig.test.json +++ b/e2e/nx-plugin-e2e/tsconfig.test.json @@ -5,7 +5,7 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/nx-plugin-e2e/vite.config.e2e.ts b/e2e/nx-plugin-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/nx-plugin-e2e/vite.config.e2e.ts rename to e2e/nx-plugin-e2e/vitest.e2e.config.ts diff --git a/e2e/plugin-coverage-e2e/project.json b/e2e/plugin-coverage-e2e/project.json index 8a0932adf..742c195d5 100644 --- a/e2e/plugin-coverage-e2e/project.json +++ b/e2e/plugin-coverage-e2e/project.json @@ -14,7 +14,7 @@ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/plugin-coverage-e2e/vite.config.e2e.ts" + "configFile": "e2e/plugin-coverage-e2e/vitest.e2e.config.ts" } } }, diff --git a/e2e/plugin-coverage-e2e/tsconfig.test.json b/e2e/plugin-coverage-e2e/tsconfig.test.json index 22ad6e52a..dd2036995 100644 --- a/e2e/plugin-coverage-e2e/tsconfig.test.json +++ b/e2e/plugin-coverage-e2e/tsconfig.test.json @@ -7,7 +7,7 @@ }, "exclude": [], "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/plugin-coverage-e2e/vite.config.e2e.ts b/e2e/plugin-coverage-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/plugin-coverage-e2e/vite.config.e2e.ts rename to e2e/plugin-coverage-e2e/vitest.e2e.config.ts diff --git a/e2e/plugin-eslint-e2e/project.json b/e2e/plugin-eslint-e2e/project.json index 4a23956d0..cadc8583e 100644 --- a/e2e/plugin-eslint-e2e/project.json +++ b/e2e/plugin-eslint-e2e/project.json @@ -14,7 +14,7 @@ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/plugin-eslint-e2e/vite.config.e2e.ts" + "configFile": "e2e/plugin-eslint-e2e/vitest.e2e.config.ts" } } }, diff --git a/e2e/plugin-eslint-e2e/tsconfig.test.json b/e2e/plugin-eslint-e2e/tsconfig.test.json index 34f35e30f..616740f36 100644 --- a/e2e/plugin-eslint-e2e/tsconfig.test.json +++ b/e2e/plugin-eslint-e2e/tsconfig.test.json @@ -7,7 +7,7 @@ }, "exclude": ["__test-env__/**"], "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/plugin-eslint-e2e/vite.config.e2e.ts b/e2e/plugin-eslint-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/plugin-eslint-e2e/vite.config.e2e.ts rename to e2e/plugin-eslint-e2e/vitest.e2e.config.ts diff --git a/e2e/plugin-js-packages-e2e/project.json b/e2e/plugin-js-packages-e2e/project.json index edbd1594d..47cca177c 100644 --- a/e2e/plugin-js-packages-e2e/project.json +++ b/e2e/plugin-js-packages-e2e/project.json @@ -15,7 +15,7 @@ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/plugin-eslint-e2e/vite.config.e2e.ts" + "configFile": "e2e/plugin-eslint-e2e/vitest.e2e.config.ts" } } }, diff --git a/e2e/plugin-js-packages-e2e/tsconfig.test.json b/e2e/plugin-js-packages-e2e/tsconfig.test.json index 34f35e30f..616740f36 100644 --- a/e2e/plugin-js-packages-e2e/tsconfig.test.json +++ b/e2e/plugin-js-packages-e2e/tsconfig.test.json @@ -7,7 +7,7 @@ }, "exclude": ["__test-env__/**"], "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/plugin-js-packages-e2e/vite.config.e2e.ts b/e2e/plugin-js-packages-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/plugin-js-packages-e2e/vite.config.e2e.ts rename to e2e/plugin-js-packages-e2e/vitest.e2e.config.ts diff --git a/e2e/plugin-jsdocs-e2e/project.json b/e2e/plugin-jsdocs-e2e/project.json index 88d2c308b..d3f1542e9 100644 --- a/e2e/plugin-jsdocs-e2e/project.json +++ b/e2e/plugin-jsdocs-e2e/project.json @@ -16,7 +16,7 @@ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/plugin-jsdocs-e2e/vite.config.e2e.ts" + "configFile": "e2e/plugin-jsdocs-e2e/vitest.e2e.config.ts" } } } diff --git a/e2e/plugin-jsdocs-e2e/tsconfig.test.json b/e2e/plugin-jsdocs-e2e/tsconfig.test.json index 34f35e30f..616740f36 100644 --- a/e2e/plugin-jsdocs-e2e/tsconfig.test.json +++ b/e2e/plugin-jsdocs-e2e/tsconfig.test.json @@ -7,7 +7,7 @@ }, "exclude": ["__test-env__/**"], "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/plugin-jsdocs-e2e/vite.config.e2e.ts b/e2e/plugin-jsdocs-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/plugin-jsdocs-e2e/vite.config.e2e.ts rename to e2e/plugin-jsdocs-e2e/vitest.e2e.config.ts diff --git a/e2e/plugin-lighthouse-e2e/project.json b/e2e/plugin-lighthouse-e2e/project.json index 774d490fc..3ffd40f9e 100644 --- a/e2e/plugin-lighthouse-e2e/project.json +++ b/e2e/plugin-lighthouse-e2e/project.json @@ -14,7 +14,7 @@ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/plugin-lighthouse-e2e/vite.config.e2e.ts" + "configFile": "e2e/plugin-lighthouse-e2e/vitest.e2e.config.ts" } } }, diff --git a/e2e/plugin-lighthouse-e2e/tsconfig.test.json b/e2e/plugin-lighthouse-e2e/tsconfig.test.json index 10c7f79de..c212b6893 100644 --- a/e2e/plugin-lighthouse-e2e/tsconfig.test.json +++ b/e2e/plugin-lighthouse-e2e/tsconfig.test.json @@ -6,7 +6,7 @@ "target": "ES2020" }, "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/plugin-lighthouse-e2e/vite.config.e2e.ts b/e2e/plugin-lighthouse-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/plugin-lighthouse-e2e/vite.config.e2e.ts rename to e2e/plugin-lighthouse-e2e/vitest.e2e.config.ts diff --git a/e2e/plugin-typescript-e2e/project.json b/e2e/plugin-typescript-e2e/project.json index 4ec3f7c8a..6f07de55a 100644 --- a/e2e/plugin-typescript-e2e/project.json +++ b/e2e/plugin-typescript-e2e/project.json @@ -14,7 +14,7 @@ "e2e": { "executor": "@nx/vite:test", "options": { - "configFile": "e2e/plugin-typescript-e2e/vite.config.e2e.ts" + "configFile": "e2e/plugin-typescript-e2e/vitest.e2e.config.ts" } } }, diff --git a/e2e/plugin-typescript-e2e/tsconfig.test.json b/e2e/plugin-typescript-e2e/tsconfig.test.json index 10c7f79de..c212b6893 100644 --- a/e2e/plugin-typescript-e2e/tsconfig.test.json +++ b/e2e/plugin-typescript-e2e/tsconfig.test.json @@ -6,7 +6,7 @@ "target": "ES2020" }, "include": [ - "vite.config.e2e.ts", + "vitest.e2e.config.ts", "tests/**/*.e2e.test.ts", "tests/**/*.d.ts", "mocks/**/*.ts" diff --git a/e2e/plugin-typescript-e2e/vite.config.e2e.ts b/e2e/plugin-typescript-e2e/vitest.e2e.config.ts similarity index 100% rename from e2e/plugin-typescript-e2e/vite.config.e2e.ts rename to e2e/plugin-typescript-e2e/vitest.e2e.config.ts diff --git a/eslint.config.js b/eslint.config.js index 6cea14bdf..8a3e3c150 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -88,7 +88,7 @@ export default tseslint.config( 'vitest/consistent-test-filename': [ 'warn', { - pattern: String.raw`.*\.(bench|type|unit|integration|e2e)\.test\.[tj]sx?$`, + pattern: String.raw`.*\.(bench|type|unit|int|e2e)\.test\.[tj]sx?$`, }, ], }, diff --git a/examples/plugins/project.json b/examples/plugins/project.json index c939f536f..f64b7c7b7 100644 --- a/examples/plugins/project.json +++ b/examples/plugins/project.json @@ -25,16 +25,16 @@ "executor": "@nx/vite:test", "outputs": ["{options.reportsDirectory}"], "options": { - "configFile": "examples/plugins/vite.config.unit.ts", + "configFile": "examples/plugins/vitest.unit.config.ts", "reportsDirectory": "../../coverage/examples-plugins/unit-tests" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "outputs": ["{options.reportsDirectory}"], "options": { - "configFile": "examples/plugins/vite.config.integration.ts", - "reportsDirectory": "../../coverage/examples-plugins/integration-tests" + "configFile": "examples/plugins/vitest.int.config.ts", + "reportsDirectory": "../../coverage/examples-plugins/int-tests" } }, "run-collect": { diff --git a/examples/plugins/src/file-size/src/file-size.plugin.integration.test.ts b/examples/plugins/src/file-size/src/file-size.plugin.int.test.ts similarity index 100% rename from examples/plugins/src/file-size/src/file-size.plugin.integration.test.ts rename to examples/plugins/src/file-size/src/file-size.plugin.int.test.ts diff --git a/examples/plugins/src/lighthouse/src/lighthouse.plugin.integration.test.ts b/examples/plugins/src/lighthouse/src/lighthouse.plugin.int.test.ts similarity index 100% rename from examples/plugins/src/lighthouse/src/lighthouse.plugin.integration.test.ts rename to examples/plugins/src/lighthouse/src/lighthouse.plugin.int.test.ts diff --git a/examples/plugins/src/package-json/src/package-json.plugin.integration.test.ts b/examples/plugins/src/package-json/src/package-json.plugin.int.test.ts similarity index 100% rename from examples/plugins/src/package-json/src/package-json.plugin.integration.test.ts rename to examples/plugins/src/package-json/src/package-json.plugin.int.test.ts diff --git a/examples/plugins/tsconfig.lib.json b/examples/plugins/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/examples/plugins/tsconfig.lib.json +++ b/examples/plugins/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/examples/plugins/tsconfig.test.json b/examples/plugins/tsconfig.test.json index bb1ab5e0c..b243bb3c5 100644 --- a/examples/plugins/tsconfig.test.json +++ b/examples/plugins/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "src/**/*.test.tsx", diff --git a/examples/plugins/vite.config.integration.ts b/examples/plugins/vitest.int.config.ts similarity index 85% rename from examples/plugins/vite.config.integration.ts rename to examples/plugins/vitest.int.config.ts index 5859ca287..116936d7b 100644 --- a/examples/plugins/vite.config.integration.ts +++ b/examples/plugins/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/examples-plugins/integration-tests', + reportsDirectory: '../../coverage/examples-plugins/int-tests', exclude: ['**/mocks/**', '**/mock/**', 'code-pushup.config.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/fs.mock.ts', diff --git a/examples/plugins/vite.config.unit.ts b/examples/plugins/vitest.unit.config.ts similarity index 100% rename from examples/plugins/vite.config.unit.ts rename to examples/plugins/vitest.unit.config.ts diff --git a/knip.config.ts b/knip.config.ts index ece4aba2d..f76251784 100644 --- a/knip.config.ts +++ b/knip.config.ts @@ -68,7 +68,7 @@ const withNxStandards = (): KnipConfigPlugin => () => { // missing knip plugin for now, so this is in the root entry 'packages/models/zod2md.config.ts', '**/code-pushup.*.{js,mjs,ts,cjs,mts,cts}', - '**/vite.config.*.ts', + '**/vitest.*.config.ts', '**/*.d.ts', 'tools/**/*.{js,mjs,ts,cjs,mts,cts}', ], diff --git a/nx.json b/nx.json index 3bfc058ce..9efa6382c 100644 --- a/nx.json +++ b/nx.json @@ -46,7 +46,7 @@ "!{projectRoot}/src/test-setup.[jt]s", "!{projectRoot}/test-setup.[jt]s", "!{projectRoot}/**/?(*.)mock.[jt]s?(x)", - "!{projectRoot}/vite.config.@(unit|integration|e2e).[jt]s", + "!{projectRoot}/vitest.@(unit|int|e2e).config.[jt]s", "!{projectRoot}/@(test|mocks)/**/*", "!{projectRoot}/perf/**/*", "!{projectRoot}/tools/**/*", diff --git a/packages/ci/project.json b/packages/ci/project.json index 3dabfdfac..a74f13988 100644 --- a/packages/ci/project.json +++ b/packages/ci/project.json @@ -20,13 +20,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/ci/vite.config.unit.ts" + "configFile": "packages/ci/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/ci/vite.config.integration.ts" + "configFile": "packages/ci/vitest.int.config.ts" } } }, diff --git a/packages/ci/src/lib/create-execution-observer.integration.test.ts b/packages/ci/src/lib/create-execution-observer.int.test.ts similarity index 100% rename from packages/ci/src/lib/create-execution-observer.integration.test.ts rename to packages/ci/src/lib/create-execution-observer.int.test.ts diff --git a/packages/ci/src/lib/git.integration.test.ts b/packages/ci/src/lib/git.int.test.ts similarity index 100% rename from packages/ci/src/lib/git.integration.test.ts rename to packages/ci/src/lib/git.int.test.ts diff --git a/packages/ci/src/lib/run.integration.test.ts b/packages/ci/src/lib/run.int.test.ts similarity index 100% rename from packages/ci/src/lib/run.integration.test.ts rename to packages/ci/src/lib/run.int.test.ts diff --git a/packages/ci/tsconfig.lib.json b/packages/ci/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/packages/ci/tsconfig.lib.json +++ b/packages/ci/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/packages/ci/tsconfig.test.json b/packages/ci/tsconfig.test.json index 068b10c71..4c2574da1 100644 --- a/packages/ci/tsconfig.test.json +++ b/packages/ci/tsconfig.test.json @@ -11,8 +11,8 @@ ] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "src/**/*.test.tsx", diff --git a/packages/ci/vite.config.integration.ts b/packages/ci/vitest.int.config.ts similarity index 84% rename from packages/ci/vite.config.integration.ts rename to packages/ci/vitest.int.config.ts index 88517c4c7..dd5ebd0f9 100644 --- a/packages/ci/vite.config.integration.ts +++ b/packages/ci/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/ci/integration-tests', + reportsDirectory: '../../coverage/ci/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', diff --git a/packages/ci/vite.config.unit.ts b/packages/ci/vitest.unit.config.ts similarity index 100% rename from packages/ci/vite.config.unit.ts rename to packages/ci/vitest.unit.config.ts diff --git a/packages/cli/project.json b/packages/cli/project.json index ad1330e08..180ef5c3f 100644 --- a/packages/cli/project.json +++ b/packages/cli/project.json @@ -27,13 +27,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/cli/vite.config.unit.ts" + "configFile": "packages/cli/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/cli/vite.config.integration.ts" + "configFile": "packages/cli/vitest.int.config.ts" } }, "run-help": { diff --git a/packages/cli/src/lib/implementation/core-config.integration.test.ts b/packages/cli/src/lib/implementation/core-config.int.test.ts similarity index 100% rename from packages/cli/src/lib/implementation/core-config.integration.test.ts rename to packages/cli/src/lib/implementation/core-config.int.test.ts diff --git a/packages/cli/src/lib/implementation/core-config.middleware.integration.test.ts b/packages/cli/src/lib/implementation/core-config.middleware.int.test.ts similarity index 100% rename from packages/cli/src/lib/implementation/core-config.middleware.integration.test.ts rename to packages/cli/src/lib/implementation/core-config.middleware.int.test.ts diff --git a/packages/cli/src/lib/implementation/set-verbose.middleware.integration.test.ts b/packages/cli/src/lib/implementation/set-verbose.middleware.int.test.ts similarity index 100% rename from packages/cli/src/lib/implementation/set-verbose.middleware.integration.test.ts rename to packages/cli/src/lib/implementation/set-verbose.middleware.int.test.ts diff --git a/packages/cli/src/lib/yargs-cli.integration.test.ts b/packages/cli/src/lib/yargs-cli.int.test.ts similarity index 100% rename from packages/cli/src/lib/yargs-cli.integration.test.ts rename to packages/cli/src/lib/yargs-cli.int.test.ts diff --git a/packages/cli/tsconfig.lib.json b/packages/cli/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/packages/cli/tsconfig.lib.json +++ b/packages/cli/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/packages/cli/tsconfig.test.json b/packages/cli/tsconfig.test.json index 4de6650fc..54cacd82f 100644 --- a/packages/cli/tsconfig.test.json +++ b/packages/cli/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "src/**/*.test.tsx", diff --git a/packages/cli/vite.config.integration.ts b/packages/cli/vitest.int.config.ts similarity index 84% rename from packages/cli/vite.config.integration.ts rename to packages/cli/vitest.int.config.ts index f16f21744..822df760a 100644 --- a/packages/cli/vite.config.integration.ts +++ b/packages/cli/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/cli/integration-tests', + reportsDirectory: '../../coverage/cli/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', diff --git a/packages/cli/vite.config.unit.ts b/packages/cli/vitest.unit.config.ts similarity index 100% rename from packages/cli/vite.config.unit.ts rename to packages/cli/vitest.unit.config.ts diff --git a/packages/core/project.json b/packages/core/project.json index 0236cb78e..a830a353b 100644 --- a/packages/core/project.json +++ b/packages/core/project.json @@ -27,13 +27,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/core/vite.config.unit.ts" + "configFile": "packages/core/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/core/vite.config.integration.ts" + "configFile": "packages/core/vitest.int.config.ts" } } }, diff --git a/packages/core/src/lib/implementation/collect.integration.test.ts b/packages/core/src/lib/implementation/collect.int.test.ts similarity index 100% rename from packages/core/src/lib/implementation/collect.integration.test.ts rename to packages/core/src/lib/implementation/collect.int.test.ts diff --git a/packages/core/src/lib/implementation/read-rc-file.integration.test.ts b/packages/core/src/lib/implementation/read-rc-file.int.test.ts similarity index 100% rename from packages/core/src/lib/implementation/read-rc-file.integration.test.ts rename to packages/core/src/lib/implementation/read-rc-file.int.test.ts diff --git a/packages/core/tsconfig.lib.json b/packages/core/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/packages/core/tsconfig.lib.json +++ b/packages/core/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/packages/core/tsconfig.test.json b/packages/core/tsconfig.test.json index 6d65ad4d6..60324228c 100644 --- a/packages/core/tsconfig.test.json +++ b/packages/core/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.test.tsx", "src/**/*.test.js", diff --git a/packages/core/vite.config.integration.ts b/packages/core/vitest.int.config.ts similarity index 85% rename from packages/core/vite.config.integration.ts rename to packages/core/vitest.int.config.ts index 80fba4a58..819c3a5bb 100644 --- a/packages/core/vite.config.integration.ts +++ b/packages/core/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/core/integration-tests', + reportsDirectory: '../../coverage/core/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', diff --git a/packages/core/vite.config.unit.ts b/packages/core/vitest.unit.config.ts similarity index 100% rename from packages/core/vite.config.unit.ts rename to packages/core/vitest.unit.config.ts diff --git a/packages/create-cli/project.json b/packages/create-cli/project.json index 52a213363..ed0c24c55 100644 --- a/packages/create-cli/project.json +++ b/packages/create-cli/project.json @@ -27,13 +27,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/create-cli/vite.config.unit.ts" + "configFile": "packages/create-cli/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/create-cli/vite.config.integration.ts" + "configFile": "packages/create-cli/vitest.int.config.ts" } }, "exec-node": { diff --git a/packages/create-cli/tsconfig.lib.json b/packages/create-cli/tsconfig.lib.json index e1bbb7dde..d96298230 100644 --- a/packages/create-cli/tsconfig.lib.json +++ b/packages/create-cli/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "test/**/*.ts" ] diff --git a/packages/create-cli/tsconfig.test.json b/packages/create-cli/tsconfig.test.json index 2ac7baa82..7f9c54833 100644 --- a/packages/create-cli/tsconfig.test.json +++ b/packages/create-cli/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.test.tsx", "src/**/*.test.js", diff --git a/packages/create-cli/vite.config.integration.ts b/packages/create-cli/vitest.int.config.ts similarity index 84% rename from packages/create-cli/vite.config.integration.ts rename to packages/create-cli/vitest.int.config.ts index 4669fb226..2495fbe9c 100644 --- a/packages/create-cli/vite.config.integration.ts +++ b/packages/create-cli/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/create-cli/integration-tests', + reportsDirectory: '../../coverage/create-cli/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', diff --git a/packages/create-cli/vite.config.unit.ts b/packages/create-cli/vitest.unit.config.ts similarity index 100% rename from packages/create-cli/vite.config.unit.ts rename to packages/create-cli/vitest.unit.config.ts diff --git a/packages/models/project.json b/packages/models/project.json index 3568b7b9a..2f2d65e89 100644 --- a/packages/models/project.json +++ b/packages/models/project.json @@ -28,13 +28,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/models/vite.config.unit.ts" + "configFile": "packages/models/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/models/vite.config.integration.ts" + "configFile": "packages/models/vitest.int.config.ts" } }, "generate-docs": { diff --git a/packages/models/tsconfig.lib.json b/packages/models/tsconfig.lib.json index ae5510ec7..b741c8920 100644 --- a/packages/models/tsconfig.lib.json +++ b/packages/models/tsconfig.lib.json @@ -13,8 +13,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "code-pushup.config.ts", "zod2md.config.ts", "src/**/*.test.ts", diff --git a/packages/models/tsconfig.test.json b/packages/models/tsconfig.test.json index c7a178bbe..67645f7d5 100644 --- a/packages/models/tsconfig.test.json +++ b/packages/models/tsconfig.test.json @@ -6,8 +6,8 @@ }, "exclude": ["**/code-pushup.config.ts"], "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "src/**/*.test.tsx", diff --git a/packages/models/vite.config.integration.ts b/packages/models/vitest.int.config.ts similarity index 84% rename from packages/models/vite.config.integration.ts rename to packages/models/vitest.int.config.ts index 3026d7fe7..fc651cceb 100644 --- a/packages/models/vite.config.integration.ts +++ b/packages/models/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/models/integration-tests', + reportsDirectory: '../../coverage/models/int-tests', exclude: ['mocks/**', '**/types.ts', 'zod2md.config.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', diff --git a/packages/models/vite.config.unit.ts b/packages/models/vitest.unit.config.ts similarity index 100% rename from packages/models/vite.config.unit.ts rename to packages/models/vitest.unit.config.ts diff --git a/packages/nx-plugin/project.json b/packages/nx-plugin/project.json index ac2417f5f..73ed871d4 100644 --- a/packages/nx-plugin/project.json +++ b/packages/nx-plugin/project.json @@ -51,13 +51,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/nx-plugin/vite.config.unit.ts" + "configFile": "packages/nx-plugin/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/nx-plugin/vite.config.integration.ts" + "configFile": "packages/nx-plugin/vitest.int.config.ts" } } }, diff --git a/packages/nx-plugin/src/executors/cli/executor.integration.test.ts b/packages/nx-plugin/src/executors/cli/executor.int.test.ts similarity index 100% rename from packages/nx-plugin/src/executors/cli/executor.integration.test.ts rename to packages/nx-plugin/src/executors/cli/executor.int.test.ts diff --git a/packages/nx-plugin/src/executors/cli/utils.integration.test.ts b/packages/nx-plugin/src/executors/cli/utils.int.test.ts similarity index 100% rename from packages/nx-plugin/src/executors/cli/utils.integration.test.ts rename to packages/nx-plugin/src/executors/cli/utils.int.test.ts diff --git a/packages/nx-plugin/src/executors/internal/config.integration.test.ts b/packages/nx-plugin/src/executors/internal/config.int.test.ts similarity index 100% rename from packages/nx-plugin/src/executors/internal/config.integration.test.ts rename to packages/nx-plugin/src/executors/internal/config.int.test.ts diff --git a/packages/nx-plugin/src/generators/configuration/code-pushup-config.integration.test.ts b/packages/nx-plugin/src/generators/configuration/code-pushup-config.int.test.ts similarity index 100% rename from packages/nx-plugin/src/generators/configuration/code-pushup-config.integration.test.ts rename to packages/nx-plugin/src/generators/configuration/code-pushup-config.int.test.ts diff --git a/packages/nx-plugin/src/generators/configuration/generator.integration.test.ts b/packages/nx-plugin/src/generators/configuration/generator.int.test.ts similarity index 100% rename from packages/nx-plugin/src/generators/configuration/generator.integration.test.ts rename to packages/nx-plugin/src/generators/configuration/generator.int.test.ts diff --git a/packages/nx-plugin/src/generators/init/generator.integration.test.ts b/packages/nx-plugin/src/generators/init/generator.int.test.ts similarity index 100% rename from packages/nx-plugin/src/generators/init/generator.integration.test.ts rename to packages/nx-plugin/src/generators/init/generator.int.test.ts diff --git a/packages/nx-plugin/tsconfig.lib.json b/packages/nx-plugin/tsconfig.lib.json index c1c9dc3b7..71aabc78b 100644 --- a/packages/nx-plugin/tsconfig.lib.json +++ b/packages/nx-plugin/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/__snapshots__/*.ts", "src/**/*.test.ts", "src/**/*.mock.ts", diff --git a/packages/nx-plugin/tsconfig.test.json b/packages/nx-plugin/tsconfig.test.json index f5666b149..e7914d68f 100644 --- a/packages/nx-plugin/tsconfig.test.json +++ b/packages/nx-plugin/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mock/**/*.ts", "src/**/*.test.ts", "src/**/*.test.tsx", diff --git a/packages/nx-plugin/vite.config.integration.ts b/packages/nx-plugin/vitest.int.config.ts similarity index 83% rename from packages/nx-plugin/vite.config.integration.ts rename to packages/nx-plugin/vitest.int.config.ts index 9e09bb418..25d5530d1 100644 --- a/packages/nx-plugin/vite.config.integration.ts +++ b/packages/nx-plugin/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/nx-plugin/integration-tests', + reportsDirectory: '../../coverage/nx-plugin/int-tests', exclude: ['mocks/**', '**/types.ts', '**/__snapshots__/**'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', '../../testing/test-setup/src/lib/reset.mocks.ts', diff --git a/packages/nx-plugin/vite.config.unit.ts b/packages/nx-plugin/vitest.unit.config.ts similarity index 100% rename from packages/nx-plugin/vite.config.unit.ts rename to packages/nx-plugin/vitest.unit.config.ts diff --git a/packages/plugin-coverage/project.json b/packages/plugin-coverage/project.json index 5c33144ff..dbcc08847 100644 --- a/packages/plugin-coverage/project.json +++ b/packages/plugin-coverage/project.json @@ -28,13 +28,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-coverage/vite.config.unit.ts" + "configFile": "packages/plugin-coverage/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-coverage/vite.config.integration.ts" + "configFile": "packages/plugin-coverage/vitest.int.config.ts" } } }, diff --git a/packages/plugin-coverage/src/lib/runner/lcov/__snapshots__/lcov-runner.integration.test.ts.snap b/packages/plugin-coverage/src/lib/runner/lcov/__snapshots__/lcov-runner.int.test.ts.snap similarity index 100% rename from packages/plugin-coverage/src/lib/runner/lcov/__snapshots__/lcov-runner.integration.test.ts.snap rename to packages/plugin-coverage/src/lib/runner/lcov/__snapshots__/lcov-runner.int.test.ts.snap diff --git a/packages/plugin-coverage/src/lib/runner/lcov/lcov-runner.integration.test.ts b/packages/plugin-coverage/src/lib/runner/lcov/lcov-runner.int.test.ts similarity index 100% rename from packages/plugin-coverage/src/lib/runner/lcov/lcov-runner.integration.test.ts rename to packages/plugin-coverage/src/lib/runner/lcov/lcov-runner.int.test.ts diff --git a/packages/plugin-coverage/src/lib/runner/runner.integration.test.ts b/packages/plugin-coverage/src/lib/runner/runner.int.test.ts similarity index 100% rename from packages/plugin-coverage/src/lib/runner/runner.integration.test.ts rename to packages/plugin-coverage/src/lib/runner/runner.int.test.ts diff --git a/packages/plugin-coverage/tsconfig.lib.json b/packages/plugin-coverage/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/packages/plugin-coverage/tsconfig.lib.json +++ b/packages/plugin-coverage/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/packages/plugin-coverage/tsconfig.test.json b/packages/plugin-coverage/tsconfig.test.json index 211f44ad2..492b6afca 100644 --- a/packages/plugin-coverage/tsconfig.test.json +++ b/packages/plugin-coverage/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "../../testing/test-setup/src/vitest.d.ts" diff --git a/packages/plugin-coverage/vite.config.integration.ts b/packages/plugin-coverage/vitest.int.config.ts similarity index 83% rename from packages/plugin-coverage/vite.config.integration.ts rename to packages/plugin-coverage/vitest.int.config.ts index 4c4c6b107..a105197ee 100644 --- a/packages/plugin-coverage/vite.config.integration.ts +++ b/packages/plugin-coverage/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/plugin-coverage/integration-tests', + reportsDirectory: '../../coverage/plugin-coverage/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', diff --git a/packages/plugin-coverage/vite.config.unit.ts b/packages/plugin-coverage/vitest.unit.config.ts similarity index 100% rename from packages/plugin-coverage/vite.config.unit.ts rename to packages/plugin-coverage/vitest.unit.config.ts diff --git a/packages/plugin-eslint/project.json b/packages/plugin-eslint/project.json index ab6569a8b..5d6c7fbe9 100644 --- a/packages/plugin-eslint/project.json +++ b/packages/plugin-eslint/project.json @@ -28,13 +28,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-eslint/vite.config.unit.ts" + "configFile": "packages/plugin-eslint/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-eslint/vite.config.integration.ts" + "configFile": "packages/plugin-eslint/vitest.int.config.ts" } } }, diff --git a/packages/plugin-eslint/src/lib/__snapshots__/eslint-plugin.integration.test.ts.snap b/packages/plugin-eslint/src/lib/__snapshots__/eslint-plugin.int.test.ts.snap similarity index 100% rename from packages/plugin-eslint/src/lib/__snapshots__/eslint-plugin.integration.test.ts.snap rename to packages/plugin-eslint/src/lib/__snapshots__/eslint-plugin.int.test.ts.snap diff --git a/packages/plugin-eslint/src/lib/__snapshots__/runner.integration.test.ts.snap b/packages/plugin-eslint/src/lib/__snapshots__/runner.int.test.ts.snap similarity index 100% rename from packages/plugin-eslint/src/lib/__snapshots__/runner.integration.test.ts.snap rename to packages/plugin-eslint/src/lib/__snapshots__/runner.int.test.ts.snap diff --git a/packages/plugin-eslint/src/lib/eslint-plugin.integration.test.ts b/packages/plugin-eslint/src/lib/eslint-plugin.int.test.ts similarity index 100% rename from packages/plugin-eslint/src/lib/eslint-plugin.integration.test.ts rename to packages/plugin-eslint/src/lib/eslint-plugin.int.test.ts diff --git a/packages/plugin-eslint/src/lib/meta/rules.integration.test.ts b/packages/plugin-eslint/src/lib/meta/rules.int.test.ts similarity index 100% rename from packages/plugin-eslint/src/lib/meta/rules.integration.test.ts rename to packages/plugin-eslint/src/lib/meta/rules.int.test.ts diff --git a/packages/plugin-eslint/src/lib/meta/versions/flat.integration.test.ts b/packages/plugin-eslint/src/lib/meta/versions/flat.int.test.ts similarity index 100% rename from packages/plugin-eslint/src/lib/meta/versions/flat.integration.test.ts rename to packages/plugin-eslint/src/lib/meta/versions/flat.int.test.ts diff --git a/packages/plugin-eslint/src/lib/nx.integration.test.ts b/packages/plugin-eslint/src/lib/nx.int.test.ts similarity index 100% rename from packages/plugin-eslint/src/lib/nx.integration.test.ts rename to packages/plugin-eslint/src/lib/nx.int.test.ts diff --git a/packages/plugin-eslint/src/lib/runner.integration.test.ts b/packages/plugin-eslint/src/lib/runner.int.test.ts similarity index 100% rename from packages/plugin-eslint/src/lib/runner.integration.test.ts rename to packages/plugin-eslint/src/lib/runner.int.test.ts diff --git a/packages/plugin-eslint/tsconfig.lib.json b/packages/plugin-eslint/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/packages/plugin-eslint/tsconfig.lib.json +++ b/packages/plugin-eslint/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/packages/plugin-eslint/tsconfig.test.json b/packages/plugin-eslint/tsconfig.test.json index 4de6650fc..54cacd82f 100644 --- a/packages/plugin-eslint/tsconfig.test.json +++ b/packages/plugin-eslint/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "src/**/*.test.tsx", diff --git a/packages/plugin-eslint/vite.config.integration.ts b/packages/plugin-eslint/vitest.int.config.ts similarity index 83% rename from packages/plugin-eslint/vite.config.integration.ts rename to packages/plugin-eslint/vitest.int.config.ts index f7c0e3b58..4019fef85 100644 --- a/packages/plugin-eslint/vite.config.integration.ts +++ b/packages/plugin-eslint/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/plugin-eslint/integration-tests', + reportsDirectory: '../../coverage/plugin-eslint/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', diff --git a/packages/plugin-eslint/vite.config.unit.ts b/packages/plugin-eslint/vitest.unit.config.ts similarity index 100% rename from packages/plugin-eslint/vite.config.unit.ts rename to packages/plugin-eslint/vitest.unit.config.ts diff --git a/packages/plugin-js-packages/project.json b/packages/plugin-js-packages/project.json index c0c3c06ec..44de3c7f5 100644 --- a/packages/plugin-js-packages/project.json +++ b/packages/plugin-js-packages/project.json @@ -28,13 +28,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-js-packages/vite.config.unit.ts" + "configFile": "packages/plugin-js-packages/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-js-packages/vite.config.integration.ts" + "configFile": "packages/plugin-js-packages/vitest.int.config.ts" } } }, diff --git a/packages/plugin-js-packages/src/lib/runner/runner.integration.test.ts b/packages/plugin-js-packages/src/lib/runner/runner.int.test.ts similarity index 100% rename from packages/plugin-js-packages/src/lib/runner/runner.integration.test.ts rename to packages/plugin-js-packages/src/lib/runner/runner.int.test.ts diff --git a/packages/plugin-js-packages/tsconfig.lib.json b/packages/plugin-js-packages/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/packages/plugin-js-packages/tsconfig.lib.json +++ b/packages/plugin-js-packages/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/packages/plugin-js-packages/tsconfig.test.json b/packages/plugin-js-packages/tsconfig.test.json index 9f29d6bb0..74520418f 100644 --- a/packages/plugin-js-packages/tsconfig.test.json +++ b/packages/plugin-js-packages/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts" ] diff --git a/packages/plugin-js-packages/vite.config.integration.ts b/packages/plugin-js-packages/vitest.int.config.ts similarity index 83% rename from packages/plugin-js-packages/vite.config.integration.ts rename to packages/plugin-js-packages/vitest.int.config.ts index 1d22bec69..aee4b57a1 100644 --- a/packages/plugin-js-packages/vite.config.integration.ts +++ b/packages/plugin-js-packages/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/plugin-js-packages/integration-tests', + reportsDirectory: '../../coverage/plugin-js-packages/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', diff --git a/packages/plugin-js-packages/vite.config.unit.ts b/packages/plugin-js-packages/vitest.unit.config.ts similarity index 100% rename from packages/plugin-js-packages/vite.config.unit.ts rename to packages/plugin-js-packages/vitest.unit.config.ts diff --git a/packages/plugin-jsdocs/project.json b/packages/plugin-jsdocs/project.json index 545006933..2eb8ef30b 100644 --- a/packages/plugin-jsdocs/project.json +++ b/packages/plugin-jsdocs/project.json @@ -28,13 +28,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-jsdocs/vite.config.unit.ts" + "configFile": "packages/plugin-jsdocs/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-jsdocs/vite.config.integration.ts" + "configFile": "packages/plugin-jsdocs/vitest.int.config.ts" } } } diff --git a/packages/plugin-jsdocs/src/lib/runner/doc-processor.integration.test.ts b/packages/plugin-jsdocs/src/lib/runner/doc-processor.int.test.ts similarity index 100% rename from packages/plugin-jsdocs/src/lib/runner/doc-processor.integration.test.ts rename to packages/plugin-jsdocs/src/lib/runner/doc-processor.int.test.ts diff --git a/packages/plugin-jsdocs/src/lib/runner/runner.integration.test.ts b/packages/plugin-jsdocs/src/lib/runner/runner.int.test.ts similarity index 100% rename from packages/plugin-jsdocs/src/lib/runner/runner.integration.test.ts rename to packages/plugin-jsdocs/src/lib/runner/runner.int.test.ts diff --git a/packages/plugin-jsdocs/tsconfig.lib.json b/packages/plugin-jsdocs/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/packages/plugin-jsdocs/tsconfig.lib.json +++ b/packages/plugin-jsdocs/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/packages/plugin-jsdocs/tsconfig.test.json b/packages/plugin-jsdocs/tsconfig.test.json index 211f44ad2..492b6afca 100644 --- a/packages/plugin-jsdocs/tsconfig.test.json +++ b/packages/plugin-jsdocs/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "../../testing/test-setup/src/vitest.d.ts" diff --git a/packages/plugin-jsdocs/vite.config.integration.ts b/packages/plugin-jsdocs/vitest.int.config.ts similarity index 84% rename from packages/plugin-jsdocs/vite.config.integration.ts rename to packages/plugin-jsdocs/vitest.int.config.ts index 8923fa06f..52301cf7d 100644 --- a/packages/plugin-jsdocs/vite.config.integration.ts +++ b/packages/plugin-jsdocs/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/plugin-jsdocs/integration-tests', + reportsDirectory: '../../coverage/plugin-jsdocs/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/console.mock.ts', diff --git a/packages/plugin-jsdocs/vite.config.unit.ts b/packages/plugin-jsdocs/vitest.unit.config.ts similarity index 100% rename from packages/plugin-jsdocs/vite.config.unit.ts rename to packages/plugin-jsdocs/vitest.unit.config.ts diff --git a/packages/plugin-lighthouse/CONTRIBUTING.md b/packages/plugin-lighthouse/CONTRIBUTING.md index e0c0254bb..6ab94e123 100644 --- a/packages/plugin-lighthouse/CONTRIBUTING.md +++ b/packages/plugin-lighthouse/CONTRIBUTING.md @@ -98,7 +98,7 @@ _A helpful chromium setup is preconfigured with the following settings:_ 2. Increase Timeout Lighthouse has a longer runtime which can time out in different environments. - **Try increasing the test timeout** in `lighthouse-plugin.integration.test.ts` for `runner creation and execution` test suite. + **Try increasing the test timeout** in `lighthouse-plugin.int.test.ts` for `runner creation and execution` test suite. 3. Turn on debug mode Show debug logs of Lighthouse. Set the following environment variable: `DEBUG='*'` diff --git a/packages/plugin-lighthouse/project.json b/packages/plugin-lighthouse/project.json index 84f7f91f1..fb62179c0 100644 --- a/packages/plugin-lighthouse/project.json +++ b/packages/plugin-lighthouse/project.json @@ -27,13 +27,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-lighthouse/vite.config.unit.ts" + "configFile": "packages/plugin-lighthouse/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-lighthouse/vite.config.integration.ts" + "configFile": "packages/plugin-lighthouse/vitest.int.config.ts" } } }, diff --git a/packages/plugin-lighthouse/tsconfig.lib.json b/packages/plugin-lighthouse/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/packages/plugin-lighthouse/tsconfig.lib.json +++ b/packages/plugin-lighthouse/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/packages/plugin-lighthouse/tsconfig.test.json b/packages/plugin-lighthouse/tsconfig.test.json index 4de6650fc..54cacd82f 100644 --- a/packages/plugin-lighthouse/tsconfig.test.json +++ b/packages/plugin-lighthouse/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "src/**/*.test.tsx", diff --git a/packages/plugin-lighthouse/vite.config.integration.ts b/packages/plugin-lighthouse/vitest.int.config.ts similarity index 84% rename from packages/plugin-lighthouse/vite.config.integration.ts rename to packages/plugin-lighthouse/vitest.int.config.ts index 1636c3fca..6d7eae79b 100644 --- a/packages/plugin-lighthouse/vite.config.integration.ts +++ b/packages/plugin-lighthouse/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/plugin-lighthouse/integration-tests', + reportsDirectory: '../../coverage/plugin-lighthouse/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/cliui.mock.ts', diff --git a/packages/plugin-lighthouse/vite.config.unit.ts b/packages/plugin-lighthouse/vitest.unit.config.ts similarity index 100% rename from packages/plugin-lighthouse/vite.config.unit.ts rename to packages/plugin-lighthouse/vitest.unit.config.ts diff --git a/packages/plugin-typescript/project.json b/packages/plugin-typescript/project.json index a34587731..92da1ecdb 100644 --- a/packages/plugin-typescript/project.json +++ b/packages/plugin-typescript/project.json @@ -27,13 +27,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-typescript/vite.config.unit.ts" + "configFile": "packages/plugin-typescript/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/plugin-typescript/vite.config.integration.ts" + "configFile": "packages/plugin-typescript/vitest.int.config.ts" } } }, diff --git a/packages/plugin-typescript/src/lib/runner/__snapshots__/runner.integration.test.ts.snap b/packages/plugin-typescript/src/lib/runner/__snapshots__/runner.int.test.ts.snap similarity index 100% rename from packages/plugin-typescript/src/lib/runner/__snapshots__/runner.integration.test.ts.snap rename to packages/plugin-typescript/src/lib/runner/__snapshots__/runner.int.test.ts.snap diff --git a/packages/plugin-typescript/src/lib/runner/runner.integration.test.ts b/packages/plugin-typescript/src/lib/runner/runner.int.test.ts similarity index 100% rename from packages/plugin-typescript/src/lib/runner/runner.integration.test.ts rename to packages/plugin-typescript/src/lib/runner/runner.int.test.ts diff --git a/packages/plugin-typescript/src/lib/runner/ts-runner.integration.test.ts b/packages/plugin-typescript/src/lib/runner/ts-runner.int.test.ts similarity index 100% rename from packages/plugin-typescript/src/lib/runner/ts-runner.integration.test.ts rename to packages/plugin-typescript/src/lib/runner/ts-runner.int.test.ts diff --git a/packages/plugin-typescript/src/lib/runner/utils.integration.test.ts b/packages/plugin-typescript/src/lib/runner/utils.int.test.ts similarity index 100% rename from packages/plugin-typescript/src/lib/runner/utils.integration.test.ts rename to packages/plugin-typescript/src/lib/runner/utils.int.test.ts diff --git a/packages/plugin-typescript/tsconfig.lib.json b/packages/plugin-typescript/tsconfig.lib.json index ef2f7e2b3..76a3dbec1 100644 --- a/packages/plugin-typescript/tsconfig.lib.json +++ b/packages/plugin-typescript/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts" diff --git a/packages/plugin-typescript/tsconfig.test.json b/packages/plugin-typescript/tsconfig.test.json index bb1ab5e0c..b243bb3c5 100644 --- a/packages/plugin-typescript/tsconfig.test.json +++ b/packages/plugin-typescript/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "src/**/*.test.tsx", diff --git a/packages/plugin-typescript/vite.config.integration.ts b/packages/plugin-typescript/vitest.int.config.ts similarity index 84% rename from packages/plugin-typescript/vite.config.integration.ts rename to packages/plugin-typescript/vitest.int.config.ts index 557752a81..42d047592 100644 --- a/packages/plugin-typescript/vite.config.integration.ts +++ b/packages/plugin-typescript/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/plugin-typescript/integration-tests', + reportsDirectory: '../../coverage/plugin-typescript/int-tests', exclude: ['mocks/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/cliui.mock.ts', diff --git a/packages/plugin-typescript/vite.config.unit.ts b/packages/plugin-typescript/vitest.unit.config.ts similarity index 100% rename from packages/plugin-typescript/vite.config.unit.ts rename to packages/plugin-typescript/vitest.unit.config.ts diff --git a/packages/utils/project.json b/packages/utils/project.json index a4c623dab..ccf3c97f3 100644 --- a/packages/utils/project.json +++ b/packages/utils/project.json @@ -39,13 +39,13 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/utils/vite.config.unit.ts" + "configFile": "packages/utils/vitest.unit.config.ts" } }, - "integration-test": { + "int-test": { "executor": "@nx/vite:test", "options": { - "configFile": "packages/utils/vite.config.integration.ts" + "configFile": "packages/utils/vitest.int.config.ts" } } }, diff --git a/packages/utils/src/lib/file-system.integration.test.ts b/packages/utils/src/lib/file-system.int.test.ts similarity index 100% rename from packages/utils/src/lib/file-system.integration.test.ts rename to packages/utils/src/lib/file-system.int.test.ts diff --git a/packages/utils/src/lib/format-command-log.integration.test.ts b/packages/utils/src/lib/format-command-log.int.test.ts similarity index 100% rename from packages/utils/src/lib/format-command-log.integration.test.ts rename to packages/utils/src/lib/format-command-log.int.test.ts diff --git a/packages/utils/src/lib/git/git.commits-and-tags.integration.test.ts b/packages/utils/src/lib/git/git.commits-and-tags.int.test.ts similarity index 100% rename from packages/utils/src/lib/git/git.commits-and-tags.integration.test.ts rename to packages/utils/src/lib/git/git.commits-and-tags.int.test.ts diff --git a/packages/utils/src/lib/git/git.integration.test.ts b/packages/utils/src/lib/git/git.int.test.ts similarity index 100% rename from packages/utils/src/lib/git/git.integration.test.ts rename to packages/utils/src/lib/git/git.int.test.ts diff --git a/packages/utils/src/lib/progress.integration.test.ts b/packages/utils/src/lib/progress.int.test.ts similarity index 100% rename from packages/utils/src/lib/progress.integration.test.ts rename to packages/utils/src/lib/progress.int.test.ts diff --git a/packages/utils/src/lib/reports/__snapshots__/sorting.integration.test.ts.snap b/packages/utils/src/lib/reports/__snapshots__/sorting.int.test.ts.snap similarity index 100% rename from packages/utils/src/lib/reports/__snapshots__/sorting.integration.test.ts.snap rename to packages/utils/src/lib/reports/__snapshots__/sorting.int.test.ts.snap diff --git a/packages/utils/src/lib/reports/generate-md-report.integration.test.ts b/packages/utils/src/lib/reports/generate-md-report.int.test.ts similarity index 100% rename from packages/utils/src/lib/reports/generate-md-report.integration.test.ts rename to packages/utils/src/lib/reports/generate-md-report.int.test.ts diff --git a/packages/utils/src/lib/reports/generate-md-reports-diff.integration.test.ts b/packages/utils/src/lib/reports/generate-md-reports-diff.int.test.ts similarity index 100% rename from packages/utils/src/lib/reports/generate-md-reports-diff.integration.test.ts rename to packages/utils/src/lib/reports/generate-md-reports-diff.int.test.ts diff --git a/packages/utils/src/lib/reports/log-stdout-summary.integration.test.ts b/packages/utils/src/lib/reports/log-stdout-summary.int.test.ts similarity index 100% rename from packages/utils/src/lib/reports/log-stdout-summary.integration.test.ts rename to packages/utils/src/lib/reports/log-stdout-summary.int.test.ts diff --git a/packages/utils/src/lib/reports/sorting.integration.test.ts b/packages/utils/src/lib/reports/sorting.int.test.ts similarity index 100% rename from packages/utils/src/lib/reports/sorting.integration.test.ts rename to packages/utils/src/lib/reports/sorting.int.test.ts diff --git a/packages/utils/tsconfig.lib.json b/packages/utils/tsconfig.lib.json index a51a95ed1..17dadcedf 100644 --- a/packages/utils/tsconfig.lib.json +++ b/packages/utils/tsconfig.lib.json @@ -7,8 +7,8 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "src/**/*.test.ts", "src/**/*.mock.ts", "mocks/**/*.ts", diff --git a/packages/utils/tsconfig.test.json b/packages/utils/tsconfig.test.json index 4de6650fc..54cacd82f 100644 --- a/packages/utils/tsconfig.test.json +++ b/packages/utils/tsconfig.test.json @@ -5,8 +5,8 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", - "vite.config.integration.ts", + "vitest.unit.config.ts", + "vitest.int.config.ts", "mocks/**/*.ts", "src/**/*.test.ts", "src/**/*.test.tsx", diff --git a/packages/utils/vite.config.integration.ts b/packages/utils/vitest.int.config.ts similarity index 85% rename from packages/utils/vite.config.integration.ts rename to packages/utils/vitest.int.config.ts index 2a5523111..61c01ddad 100644 --- a/packages/utils/vite.config.integration.ts +++ b/packages/utils/vitest.int.config.ts @@ -15,11 +15,11 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true } }, coverage: { reporter: ['text', 'lcov'], - reportsDirectory: '../../coverage/utils/integration-tests', + reportsDirectory: '../../coverage/utils/int-tests', exclude: ['mocks/**', 'perf/**', '**/types.ts'], }, environment: 'node', - include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], globalSetup: ['../../global-setup.ts'], setupFiles: [ '../../testing/test-setup/src/lib/cliui.mock.ts', diff --git a/packages/utils/vite.config.unit.ts b/packages/utils/vitest.unit.config.ts similarity index 100% rename from packages/utils/vite.config.unit.ts rename to packages/utils/vitest.unit.config.ts diff --git a/testing/test-nx-utils/project.json b/testing/test-nx-utils/project.json index 09bce6cdf..c6272ad77 100644 --- a/testing/test-nx-utils/project.json +++ b/testing/test-nx-utils/project.json @@ -24,7 +24,7 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "testing/test-nx-utils/vite.config.unit.ts" + "configFile": "testing/test-nx-utils/vitest.unit.config.ts" } } }, diff --git a/testing/test-nx-utils/src/lib/utils/tree.integration.test.ts b/testing/test-nx-utils/src/lib/utils/tree.int.test.ts similarity index 100% rename from testing/test-nx-utils/src/lib/utils/tree.integration.test.ts rename to testing/test-nx-utils/src/lib/utils/tree.int.test.ts diff --git a/testing/test-nx-utils/tsconfig.lib.json b/testing/test-nx-utils/tsconfig.lib.json index 6be5bf6e7..09cc715cc 100644 --- a/testing/test-nx-utils/tsconfig.lib.json +++ b/testing/test-nx-utils/tsconfig.lib.json @@ -6,5 +6,5 @@ "types": ["node"] }, "include": ["src/**/*.ts"], - "exclude": ["vite.config.unit.ts", "src/**/*.unit.test.ts"] + "exclude": ["vitest.unit.config.ts", "src/**/*.unit.test.ts"] } diff --git a/testing/test-nx-utils/tsconfig.test.json b/testing/test-nx-utils/tsconfig.test.json index 69b6c0716..cafb05dd2 100644 --- a/testing/test-nx-utils/tsconfig.test.json +++ b/testing/test-nx-utils/tsconfig.test.json @@ -4,5 +4,5 @@ "outDir": "../../dist/out-tsc", "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, - "include": ["vite.config.unit.ts", "src/**/*.unit.test.ts"] + "include": ["vitest.unit.config.ts", "src/**/*.unit.test.ts"] } diff --git a/testing/test-nx-utils/vite.config.unit.ts b/testing/test-nx-utils/vitest.unit.config.ts similarity index 100% rename from testing/test-nx-utils/vite.config.unit.ts rename to testing/test-nx-utils/vitest.unit.config.ts diff --git a/testing/test-setup/README.md b/testing/test-setup/README.md index 963826169..db0ce1eba 100644 --- a/testing/test-setup/README.md +++ b/testing/test-setup/README.md @@ -6,7 +6,7 @@ More on this subject as well as all the testing strategy principles can be found ## Mock setup -In this library you can find all files that can be used in `setupFiles` property of `vitest.config.(unit|integration|e2e).ts` files. Currently include: +In this library you can find all files that can be used in `setupFiles` property of `vitest.config.(unit|int|e2e).ts` files. Currently include: - [console](./src/lib/console.mock.ts) mocking - [file system](./src/lib/fs.mock.ts) mocking diff --git a/testing/test-setup/project.json b/testing/test-setup/project.json index 320a534e5..613d2436d 100644 --- a/testing/test-setup/project.json +++ b/testing/test-setup/project.json @@ -17,7 +17,7 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "testing/test-setup/vite.config.unit.ts" + "configFile": "testing/test-setup/vitest.unit.config.ts" } }, "lint": { diff --git a/testing/test-setup/tsconfig.lib.json b/testing/test-setup/tsconfig.lib.json index 51167c9db..3cc313086 100644 --- a/testing/test-setup/tsconfig.lib.json +++ b/testing/test-setup/tsconfig.lib.json @@ -7,9 +7,9 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", + "vitest.unit.config.ts", "src/vitest.d.ts", "src/**/*.unit.test.ts", - "src/**/*.integration.test.ts" + "src/**/*.int.test.ts" ] } diff --git a/testing/test-setup/tsconfig.test.json b/testing/test-setup/tsconfig.test.json index 71916ea12..5fddc20ae 100644 --- a/testing/test-setup/tsconfig.test.json +++ b/testing/test-setup/tsconfig.test.json @@ -5,10 +5,10 @@ "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, "include": [ - "vite.config.unit.ts", + "vitest.unit.config.ts", "src/vitest.d.ts", "src/**/*.unit.test.ts", "src/**/*.d.ts", - "src/**/*.integration.test.ts" + "src/**/*.int.test.ts" ] } diff --git a/testing/test-setup/vite.config.unit.ts b/testing/test-setup/vitest.unit.config.ts similarity index 100% rename from testing/test-setup/vite.config.unit.ts rename to testing/test-setup/vitest.unit.config.ts diff --git a/testing/test-utils/project.json b/testing/test-utils/project.json index 72be74b70..ee6ef8ec4 100644 --- a/testing/test-utils/project.json +++ b/testing/test-utils/project.json @@ -24,7 +24,7 @@ "unit-test": { "executor": "@nx/vite:test", "options": { - "configFile": "testing/test-utils/vite.config.unit.ts" + "configFile": "testing/test-utils/vitest.unit.config.ts" } }, "nx-release-publish": { diff --git a/testing/test-utils/tsconfig.lib.json b/testing/test-utils/tsconfig.lib.json index e306ad2b6..3975fe4ed 100644 --- a/testing/test-utils/tsconfig.lib.json +++ b/testing/test-utils/tsconfig.lib.json @@ -7,7 +7,7 @@ }, "include": ["src/**/*.ts"], "exclude": [ - "vite.config.unit.ts", + "vitest.unit.config.ts", "src/**/*.unit.test.ts", "src/lib/fixtures/configs" ] diff --git a/testing/test-utils/tsconfig.test.json b/testing/test-utils/tsconfig.test.json index 69b6c0716..cafb05dd2 100644 --- a/testing/test-utils/tsconfig.test.json +++ b/testing/test-utils/tsconfig.test.json @@ -4,5 +4,5 @@ "outDir": "../../dist/out-tsc", "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"] }, - "include": ["vite.config.unit.ts", "src/**/*.unit.test.ts"] + "include": ["vitest.unit.config.ts", "src/**/*.unit.test.ts"] } diff --git a/testing/test-utils/vite.config.unit.ts b/testing/test-utils/vitest.unit.config.ts similarity index 100% rename from testing/test-utils/vite.config.unit.ts rename to testing/test-utils/vitest.unit.config.ts