diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 600fcd9b9..de00a7a64 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1254,57 +1254,6 @@ importers: specifier: 'catalog:' version: 3.2.0 - test/config: - devDependencies: - '@test/test-dep-config': - specifier: link:./deps/test-dep-config - version: link:deps/test-dep-config - '@vitejs/test-dep-virtual': - specifier: file:./deps/test-dep-virtual - version: file:test/config/deps/test-dep-virtual - '@vitest/browser-playwright': - specifier: workspace:* - version: link:../../packages/browser-playwright - '@vitest/browser-preview': - specifier: workspace:* - version: link:../../packages/browser-preview - '@vitest/browser-webdriverio': - specifier: workspace:* - version: link:../../packages/browser-webdriverio - '@vitest/test-dep-optimizer-external': - specifier: file:./deps/optimizer/external - version: file:test/config/deps/optimizer/external - '@vitest/test-dep-optimizer-optimized': - specifier: file:./deps/optimizer/optimized - version: file:test/config/deps/optimizer/optimized - inline-dep: - specifier: file:./deps/vite-ssr-resolve/inline-dep - version: file:test/config/deps/vite-ssr-resolve/inline-dep - other-dep: - specifier: file:./deps/vite-ssr-resolve/other-dep - version: file:test/config/deps/vite-ssr-resolve/other-dep - ssr-no-external-dep: - specifier: file:./deps/vite-ssr-resolve/ssr-no-external-dep - version: file:test/config/deps/vite-ssr-resolve/ssr-no-external-dep - test-dep-conditions: - specifier: file:./deps/test-dep-conditions - version: file:test/config/deps/test-dep-conditions - tinyexec: - specifier: ^1.0.2 - version: 1.0.2 - vite: - specifier: 8.0.11 - version: 8.0.11(@types/node@24.12.0)(esbuild@0.27.3)(jiti@2.6.1)(sass-embedded@1.97.3)(sass@1.97.3)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2) - vitest: - specifier: workspace:* - version: link:../../packages/vitest - - test/config/fixtures/conditions-pkg: - dependencies: - subpackage: - specifier: file:../conditions-subpackage - version: file:test/config/fixtures/conditions-subpackage - test/coverage-test: devDependencies: '@jridgewell/remapping': @@ -1385,6 +1334,9 @@ importers: '@test/pkg-reporter': specifier: link:./deps/pkg-reporter version: link:deps/pkg-reporter + '@test/test-dep-config': + specifier: link:./deps/test-dep-config + version: link:deps/test-dep-config '@test/test-dep-error': specifier: file:./deps/error version: file:test/e2e/deps/error @@ -1400,6 +1352,9 @@ importers: '@vitejs/plugin-basic-ssl': specifier: ^2.1.4 version: 2.1.4(vite@8.0.11(@types/node@24.12.0)(esbuild@0.27.3)(jiti@2.6.1)(sass-embedded@1.97.3)(sass@1.97.3)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)) + '@vitejs/test-dep-virtual': + specifier: file:./deps/test-dep-virtual + version: file:test/e2e/deps/test-dep-virtual '@vitest/browser-playwright': specifier: workspace:* version: link:../../packages/browser-playwright @@ -1415,6 +1370,12 @@ importers: '@vitest/runner': specifier: workspace:* version: link:../../packages/runner + '@vitest/test-dep-optimizer-external': + specifier: file:./deps/optimizer/external + version: file:test/e2e/deps/optimizer/external + '@vitest/test-dep-optimizer-optimized': + specifier: file:./deps/optimizer/optimized + version: file:test/e2e/deps/optimizer/optimized '@vitest/utils': specifier: workspace:* version: link:../../packages/utils @@ -1424,21 +1385,36 @@ importers: flatted: specifier: 'catalog:' version: 3.4.2 + inline-dep: + specifier: file:./deps/vite-ssr-resolve/inline-dep + version: file:test/e2e/deps/vite-ssr-resolve/inline-dep jest-image-snapshot: specifier: ^6.5.1 version: 6.5.1 obug: specifier: ^2.1.1 version: 2.1.1 + other-dep: + specifier: file:./deps/vite-ssr-resolve/other-dep + version: file:test/e2e/deps/vite-ssr-resolve/other-dep playwright: specifier: 'catalog:' version: 1.59.0 + ssr-no-external-dep: + specifier: file:./deps/vite-ssr-resolve/ssr-no-external-dep + version: file:test/e2e/deps/vite-ssr-resolve/ssr-no-external-dep + test-dep-conditions: + specifier: file:./deps/test-dep-conditions + version: file:test/e2e/deps/test-dep-conditions test-dep-invalid: specifier: link:./deps/dep-invalid version: link:deps/dep-invalid test-dep-simple: specifier: file:./deps/dep-simple version: file:test/e2e/deps/dep-simple + tinyexec: + specifier: ^1.0.2 + version: 1.0.2 tinyspy: specifier: 'catalog:' version: 4.0.4 @@ -1509,6 +1485,12 @@ importers: specifier: workspace:* version: link:../../../../packages/vitest + test/e2e/fixtures/conditions-pkg: + dependencies: + subpackage: + specifier: file:../conditions-subpackage + version: file:test/e2e/fixtures/conditions-subpackage + test/node-runner: {} test/test-utils: @@ -5425,8 +5407,8 @@ packages: vite: 8.0.11 vue: ^3.2.25 - '@vitejs/test-dep-virtual@file:test/config/deps/test-dep-virtual': - resolution: {directory: test/config/deps/test-dep-virtual, type: directory} + '@vitejs/test-dep-virtual@file:test/e2e/deps/test-dep-virtual': + resolution: {directory: test/e2e/deps/test-dep-virtual, type: directory} '@vitest/cjs-lib@file:test/browser/cjs-lib': resolution: {directory: test/browser/cjs-lib, type: directory} @@ -5450,11 +5432,11 @@ packages: '@vitest/test-dep-nested-cjs@file:test/unit/deps/dep-nested-cjs': resolution: {directory: test/unit/deps/dep-nested-cjs, type: directory} - '@vitest/test-dep-optimizer-external@file:test/config/deps/optimizer/external': - resolution: {directory: test/config/deps/optimizer/external, type: directory} + '@vitest/test-dep-optimizer-external@file:test/e2e/deps/optimizer/external': + resolution: {directory: test/e2e/deps/optimizer/external, type: directory} - '@vitest/test-dep-optimizer-optimized@file:test/config/deps/optimizer/optimized': - resolution: {directory: test/config/deps/optimizer/optimized, type: directory} + '@vitest/test-dep-optimizer-optimized@file:test/e2e/deps/optimizer/optimized': + resolution: {directory: test/e2e/deps/optimizer/optimized, type: directory} '@vitest/test-dep1@file:test/unit/deps/dep1': resolution: {directory: test/unit/deps/dep1, type: directory} @@ -7451,8 +7433,8 @@ packages: ini@1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - inline-dep@file:test/config/deps/vite-ssr-resolve/inline-dep: - resolution: {directory: test/config/deps/vite-ssr-resolve/inline-dep, type: directory} + inline-dep@file:test/e2e/deps/vite-ssr-resolve/inline-dep: + resolution: {directory: test/e2e/deps/vite-ssr-resolve/inline-dep, type: directory} internal-slot@1.1.0: resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==} @@ -8554,8 +8536,8 @@ packages: resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} - other-dep@file:test/config/deps/vite-ssr-resolve/other-dep: - resolution: {directory: test/config/deps/vite-ssr-resolve/other-dep, type: directory} + other-dep@file:test/e2e/deps/vite-ssr-resolve/other-dep: + resolution: {directory: test/e2e/deps/vite-ssr-resolve/other-dep, type: directory} outvariant@1.4.3: resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==} @@ -9512,8 +9494,8 @@ packages: ssim.js@3.5.0: resolution: {integrity: sha512-Aj6Jl2z6oDmgYFFbQqK7fght19bXdOxY7Tj03nF+03M9gCBAjeIiO8/PlEGMfKDwYpw4q6iBqVq2YuREorGg/g==} - ssr-no-external-dep@file:test/config/deps/vite-ssr-resolve/ssr-no-external-dep: - resolution: {directory: test/config/deps/vite-ssr-resolve/ssr-no-external-dep, type: directory} + ssr-no-external-dep@file:test/e2e/deps/vite-ssr-resolve/ssr-no-external-dep: + resolution: {directory: test/e2e/deps/vite-ssr-resolve/ssr-no-external-dep, type: directory} stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} @@ -9617,8 +9599,8 @@ packages: strnum@2.1.1: resolution: {integrity: sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==} - subpackage@file:test/config/fixtures/conditions-subpackage: - resolution: {directory: test/config/fixtures/conditions-subpackage, type: directory} + subpackage@file:test/e2e/fixtures/conditions-subpackage: + resolution: {directory: test/e2e/fixtures/conditions-subpackage, type: directory} superagent@10.3.0: resolution: {integrity: sha512-B+4Ik7ROgVKrQsXTV0Jwp2u+PXYLSlqtDAhYnkkD+zn3yg8s/zjA2MeGayPoY/KICrbitwneDHrjSotxKL+0XQ==} @@ -9703,11 +9685,11 @@ packages: engines: {node: '>=10'} hasBin: true - test-dep-conditions-indirect@file:test/config/deps/test-dep-conditions-indirect: - resolution: {directory: test/config/deps/test-dep-conditions-indirect, type: directory} + test-dep-conditions-indirect@file:test/e2e/deps/test-dep-conditions-indirect: + resolution: {directory: test/e2e/deps/test-dep-conditions-indirect, type: directory} - test-dep-conditions@file:test/config/deps/test-dep-conditions: - resolution: {directory: test/config/deps/test-dep-conditions, type: directory} + test-dep-conditions@file:test/e2e/deps/test-dep-conditions: + resolution: {directory: test/e2e/deps/test-dep-conditions, type: directory} test-dep-error@file:test/browser/deps/test-dep-error: resolution: {directory: test/browser/deps/test-dep-error, type: directory} @@ -13920,7 +13902,7 @@ snapshots: vite: 8.0.11(@types/node@24.12.0)(esbuild@0.27.3)(jiti@2.6.1)(sass-embedded@1.97.3)(sass@1.97.3)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2) vue: 3.5.29(typescript@5.9.3) - '@vitejs/test-dep-virtual@file:test/config/deps/test-dep-virtual': {} + '@vitejs/test-dep-virtual@file:test/e2e/deps/test-dep-virtual': {} '@vitest/cjs-lib@file:test/browser/cjs-lib': {} @@ -13939,9 +13921,9 @@ snapshots: '@vitest/test-dep-nested-cjs@file:test/unit/deps/dep-nested-cjs': {} - '@vitest/test-dep-optimizer-external@file:test/config/deps/optimizer/external': {} + '@vitest/test-dep-optimizer-external@file:test/e2e/deps/optimizer/external': {} - '@vitest/test-dep-optimizer-optimized@file:test/config/deps/optimizer/optimized': {} + '@vitest/test-dep-optimizer-optimized@file:test/e2e/deps/optimizer/optimized': {} '@vitest/test-dep1@file:test/unit/deps/dep1': {} @@ -16334,7 +16316,7 @@ snapshots: ini@1.3.8: {} - inline-dep@file:test/config/deps/vite-ssr-resolve/inline-dep: {} + inline-dep@file:test/e2e/deps/vite-ssr-resolve/inline-dep: {} internal-slot@1.1.0: dependencies: @@ -17598,7 +17580,7 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - other-dep@file:test/config/deps/vite-ssr-resolve/other-dep: {} + other-dep@file:test/e2e/deps/vite-ssr-resolve/other-dep: {} outvariant@1.4.3: {} @@ -18810,7 +18792,7 @@ snapshots: ssim.js@3.5.0: {} - ssr-no-external-dep@file:test/config/deps/vite-ssr-resolve/ssr-no-external-dep: {} + ssr-no-external-dep@file:test/e2e/deps/vite-ssr-resolve/ssr-no-external-dep: {} stackback@0.0.2: {} @@ -18935,7 +18917,7 @@ snapshots: strnum@2.1.1: {} - subpackage@file:test/config/fixtures/conditions-subpackage: {} + subpackage@file:test/e2e/fixtures/conditions-subpackage: {} superagent@10.3.0: dependencies: @@ -19038,11 +19020,11 @@ snapshots: commander: 2.20.3 source-map-support: 0.5.21 - test-dep-conditions-indirect@file:test/config/deps/test-dep-conditions-indirect: {} + test-dep-conditions-indirect@file:test/e2e/deps/test-dep-conditions-indirect: {} - test-dep-conditions@file:test/config/deps/test-dep-conditions: + test-dep-conditions@file:test/e2e/deps/test-dep-conditions: dependencies: - test-dep-conditions-indirect: file:test/config/deps/test-dep-conditions-indirect + test-dep-conditions-indirect: file:test/e2e/deps/test-dep-conditions-indirect test-dep-error@file:test/browser/deps/test-dep-error: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 74eb8051c..e669a1ad5 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -25,7 +25,7 @@ packages: - examples/* - test/* - test/e2e/dts/* - - test/config/fixtures/conditions-pkg + - test/e2e/fixtures/conditions-pkg overrides: '@types/node': $@types/node '@vitest/browser': workspace:* diff --git a/test/config/fixtures/vitest.config.js b/test/config/fixtures/vitest.config.js deleted file mode 100644 index c6bcfed02..000000000 --- a/test/config/fixtures/vitest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - test: {} -} \ No newline at end of file diff --git a/test/config/package.json b/test/config/package.json deleted file mode 100644 index 13d5ea706..000000000 --- a/test/config/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "@vitest/test-config", - "type": "module", - "private": true, - "scripts": { - "test": "vitest --typecheck.enabled" - }, - "devDependencies": { - "@test/test-dep-config": "link:./deps/test-dep-config", - "@vitejs/test-dep-virtual": "file:./deps/test-dep-virtual", - "@vitest/browser-playwright": "workspace:*", - "@vitest/browser-preview": "workspace:*", - "@vitest/browser-webdriverio": "workspace:*", - "@vitest/test-dep-optimizer-external": "file:./deps/optimizer/external", - "@vitest/test-dep-optimizer-optimized": "file:./deps/optimizer/optimized", - "inline-dep": "file:./deps/vite-ssr-resolve/inline-dep", - "other-dep": "file:./deps/vite-ssr-resolve/other-dep", - "ssr-no-external-dep": "file:./deps/vite-ssr-resolve/ssr-no-external-dep", - "test-dep-conditions": "file:./deps/test-dep-conditions", - "tinyexec": "^1.0.2", - "vite": "latest", - "vitest": "workspace:*" - } -} diff --git a/test/config/tsconfig.json b/test/config/tsconfig.json deleted file mode 100644 index 321bfb22f..000000000 --- a/test/config/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "lib": ["DOM", "ESNext"], - "types": ["vite/client"] - }, - "exclude": [ - "**/dist/**" - ] -} diff --git a/test/config/vitest.config.ts b/test/config/vitest.config.ts deleted file mode 100644 index cf268219e..000000000 --- a/test/config/vitest.config.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { defineConfig } from 'vitest/config' - -export default defineConfig({ - // Note: One test expects coverage.thresholds not to be defined in here - test: { - include: ['test/**.test.ts'], - reporters: ['verbose'], - testTimeout: 60_000, - pool: 'forks', - fileParallelism: false, - chaiConfig: { - truncateThreshold: 999, - }, - coverage: { - // test that empty reporter does not throw - reporter: [], - }, - typecheck: { - ignoreSourceErrors: true, - }, - }, -}) diff --git a/test/config/deps/optimizer/external/index.js b/test/e2e/deps/optimizer/external/index.js similarity index 100% rename from test/config/deps/optimizer/external/index.js rename to test/e2e/deps/optimizer/external/index.js diff --git a/test/config/deps/optimizer/external/package.json b/test/e2e/deps/optimizer/external/package.json similarity index 100% rename from test/config/deps/optimizer/external/package.json rename to test/e2e/deps/optimizer/external/package.json diff --git a/test/config/deps/optimizer/optimized/index.js b/test/e2e/deps/optimizer/optimized/index.js similarity index 100% rename from test/config/deps/optimizer/optimized/index.js rename to test/e2e/deps/optimizer/optimized/index.js diff --git a/test/config/deps/optimizer/optimized/package.json b/test/e2e/deps/optimizer/optimized/package.json similarity index 100% rename from test/config/deps/optimizer/optimized/package.json rename to test/e2e/deps/optimizer/optimized/package.json diff --git a/test/config/deps/test-dep-conditions-indirect/false.js b/test/e2e/deps/test-dep-conditions-indirect/false.js similarity index 100% rename from test/config/deps/test-dep-conditions-indirect/false.js rename to test/e2e/deps/test-dep-conditions-indirect/false.js diff --git a/test/config/deps/test-dep-conditions-indirect/package.json b/test/e2e/deps/test-dep-conditions-indirect/package.json similarity index 100% rename from test/config/deps/test-dep-conditions-indirect/package.json rename to test/e2e/deps/test-dep-conditions-indirect/package.json diff --git a/test/config/deps/test-dep-conditions-indirect/true.js b/test/e2e/deps/test-dep-conditions-indirect/true.js similarity index 100% rename from test/config/deps/test-dep-conditions-indirect/true.js rename to test/e2e/deps/test-dep-conditions-indirect/true.js diff --git a/test/config/deps/test-dep-conditions/false.js b/test/e2e/deps/test-dep-conditions/false.js similarity index 100% rename from test/config/deps/test-dep-conditions/false.js rename to test/e2e/deps/test-dep-conditions/false.js diff --git a/test/config/deps/test-dep-conditions/indirect.js b/test/e2e/deps/test-dep-conditions/indirect.js similarity index 100% rename from test/config/deps/test-dep-conditions/indirect.js rename to test/e2e/deps/test-dep-conditions/indirect.js diff --git a/test/config/deps/test-dep-conditions/inline.js b/test/e2e/deps/test-dep-conditions/inline.js similarity index 100% rename from test/config/deps/test-dep-conditions/inline.js rename to test/e2e/deps/test-dep-conditions/inline.js diff --git a/test/config/deps/test-dep-conditions/package.json b/test/e2e/deps/test-dep-conditions/package.json similarity index 100% rename from test/config/deps/test-dep-conditions/package.json rename to test/e2e/deps/test-dep-conditions/package.json diff --git a/test/config/deps/test-dep-conditions/true.js b/test/e2e/deps/test-dep-conditions/true.js similarity index 100% rename from test/config/deps/test-dep-conditions/true.js rename to test/e2e/deps/test-dep-conditions/true.js diff --git a/test/config/deps/test-dep-config/index.js b/test/e2e/deps/test-dep-config/index.js similarity index 100% rename from test/config/deps/test-dep-config/index.js rename to test/e2e/deps/test-dep-config/index.js diff --git a/test/config/deps/test-dep-config/package.json b/test/e2e/deps/test-dep-config/package.json similarity index 100% rename from test/config/deps/test-dep-config/package.json rename to test/e2e/deps/test-dep-config/package.json diff --git a/test/config/deps/test-dep-virtual/index.js b/test/e2e/deps/test-dep-virtual/index.js similarity index 100% rename from test/config/deps/test-dep-virtual/index.js rename to test/e2e/deps/test-dep-virtual/index.js diff --git a/test/config/deps/test-dep-virtual/package.json b/test/e2e/deps/test-dep-virtual/package.json similarity index 100% rename from test/config/deps/test-dep-virtual/package.json rename to test/e2e/deps/test-dep-virtual/package.json diff --git a/test/config/deps/vite-ssr-resolve/inline-dep/index.js b/test/e2e/deps/vite-ssr-resolve/inline-dep/index.js similarity index 100% rename from test/config/deps/vite-ssr-resolve/inline-dep/index.js rename to test/e2e/deps/vite-ssr-resolve/inline-dep/index.js diff --git a/test/config/deps/vite-ssr-resolve/inline-dep/package.json b/test/e2e/deps/vite-ssr-resolve/inline-dep/package.json similarity index 100% rename from test/config/deps/vite-ssr-resolve/inline-dep/package.json rename to test/e2e/deps/vite-ssr-resolve/inline-dep/package.json diff --git a/test/config/deps/vite-ssr-resolve/other-dep/index.js b/test/e2e/deps/vite-ssr-resolve/other-dep/index.js similarity index 100% rename from test/config/deps/vite-ssr-resolve/other-dep/index.js rename to test/e2e/deps/vite-ssr-resolve/other-dep/index.js diff --git a/test/config/deps/vite-ssr-resolve/other-dep/package.json b/test/e2e/deps/vite-ssr-resolve/other-dep/package.json similarity index 100% rename from test/config/deps/vite-ssr-resolve/other-dep/package.json rename to test/e2e/deps/vite-ssr-resolve/other-dep/package.json diff --git a/test/config/deps/vite-ssr-resolve/ssr-no-external-dep/index.js b/test/e2e/deps/vite-ssr-resolve/ssr-no-external-dep/index.js similarity index 100% rename from test/config/deps/vite-ssr-resolve/ssr-no-external-dep/index.js rename to test/e2e/deps/vite-ssr-resolve/ssr-no-external-dep/index.js diff --git a/test/config/deps/vite-ssr-resolve/ssr-no-external-dep/package.json b/test/e2e/deps/vite-ssr-resolve/ssr-no-external-dep/package.json similarity index 100% rename from test/config/deps/vite-ssr-resolve/ssr-no-external-dep/package.json rename to test/e2e/deps/vite-ssr-resolve/ssr-no-external-dep/package.json diff --git a/test/config/fixtures/allowed-exec-args-fixtures/allowed-exec-argv.test.ts b/test/e2e/fixtures/allowed-exec-args-fixtures/allowed-exec-argv.test.ts similarity index 100% rename from test/config/fixtures/allowed-exec-args-fixtures/allowed-exec-argv.test.ts rename to test/e2e/fixtures/allowed-exec-args-fixtures/allowed-exec-argv.test.ts diff --git a/test/config/fixtures/allowed-exec-args-fixtures/vitest.config.ts b/test/e2e/fixtures/allowed-exec-args-fixtures/vitest.config.ts similarity index 100% rename from test/config/fixtures/allowed-exec-args-fixtures/vitest.config.ts rename to test/e2e/fixtures/allowed-exec-args-fixtures/vitest.config.ts diff --git a/test/config/fixtures/browser-no-config/vitest.config.ts b/test/e2e/fixtures/browser-no-config/vitest.config.ts similarity index 100% rename from test/config/fixtures/browser-no-config/vitest.config.ts rename to test/e2e/fixtures/browser-no-config/vitest.config.ts diff --git a/test/config/fixtures/browser-persistent-context/basic.test.ts b/test/e2e/fixtures/browser-persistent-context/basic.test.ts similarity index 100% rename from test/config/fixtures/browser-persistent-context/basic.test.ts rename to test/e2e/fixtures/browser-persistent-context/basic.test.ts diff --git a/test/config/fixtures/browser-persistent-context/vitest.config.ts b/test/e2e/fixtures/browser-persistent-context/vitest.config.ts similarity index 100% rename from test/config/fixtures/browser-persistent-context/vitest.config.ts rename to test/e2e/fixtures/browser-persistent-context/vitest.config.ts diff --git a/test/config/fixtures/cache/basic.test.ts b/test/e2e/fixtures/cache/basic.test.ts similarity index 100% rename from test/config/fixtures/cache/basic.test.ts rename to test/e2e/fixtures/cache/basic.test.ts diff --git a/test/config/fixtures/cache/second.test.ts b/test/e2e/fixtures/cache/second.test.ts similarity index 100% rename from test/config/fixtures/cache/second.test.ts rename to test/e2e/fixtures/cache/second.test.ts diff --git a/test/config/fixtures/conditions-pkg/index.js b/test/e2e/fixtures/conditions-pkg/index.js similarity index 100% rename from test/config/fixtures/conditions-pkg/index.js rename to test/e2e/fixtures/conditions-pkg/index.js diff --git a/test/config/fixtures/conditions-pkg/package.json b/test/e2e/fixtures/conditions-pkg/package.json similarity index 100% rename from test/config/fixtures/conditions-pkg/package.json rename to test/e2e/fixtures/conditions-pkg/package.json diff --git a/test/config/fixtures/conditions-projects/project-a/basic.test.js b/test/e2e/fixtures/conditions-projects/project-a/basic.test.js similarity index 100% rename from test/config/fixtures/conditions-projects/project-a/basic.test.js rename to test/e2e/fixtures/conditions-projects/project-a/basic.test.js diff --git a/test/config/fixtures/conditions-projects/project-a/vitest.config.ts b/test/e2e/fixtures/conditions-projects/project-a/vitest.config.ts similarity index 100% rename from test/config/fixtures/conditions-projects/project-a/vitest.config.ts rename to test/e2e/fixtures/conditions-projects/project-a/vitest.config.ts diff --git a/test/config/fixtures/conditions-projects/project-b/basic.test.js b/test/e2e/fixtures/conditions-projects/project-b/basic.test.js similarity index 100% rename from test/config/fixtures/conditions-projects/project-b/basic.test.js rename to test/e2e/fixtures/conditions-projects/project-b/basic.test.js diff --git a/test/config/fixtures/conditions-projects/project-b/vitest.config.ts b/test/e2e/fixtures/conditions-projects/project-b/vitest.config.ts similarity index 100% rename from test/config/fixtures/conditions-projects/project-b/vitest.config.ts rename to test/e2e/fixtures/conditions-projects/project-b/vitest.config.ts diff --git a/test/config/fixtures/conditions-projects/vite.config.ts b/test/e2e/fixtures/conditions-projects/vite.config.ts similarity index 100% rename from test/config/fixtures/conditions-projects/vite.config.ts rename to test/e2e/fixtures/conditions-projects/vite.config.ts diff --git a/test/config/fixtures/conditions-subpackage/custom.js b/test/e2e/fixtures/conditions-subpackage/custom.js similarity index 100% rename from test/config/fixtures/conditions-subpackage/custom.js rename to test/e2e/fixtures/conditions-subpackage/custom.js diff --git a/test/config/fixtures/conditions-subpackage/default.js b/test/e2e/fixtures/conditions-subpackage/default.js similarity index 100% rename from test/config/fixtures/conditions-subpackage/default.js rename to test/e2e/fixtures/conditions-subpackage/default.js diff --git a/test/config/fixtures/conditions-subpackage/development.js b/test/e2e/fixtures/conditions-subpackage/development.js similarity index 100% rename from test/config/fixtures/conditions-subpackage/development.js rename to test/e2e/fixtures/conditions-subpackage/development.js diff --git a/test/config/fixtures/conditions-subpackage/package.json b/test/e2e/fixtures/conditions-subpackage/package.json similarity index 100% rename from test/config/fixtures/conditions-subpackage/package.json rename to test/e2e/fixtures/conditions-subpackage/package.json diff --git a/test/config/fixtures/conditions-subpackage/production.js b/test/e2e/fixtures/conditions-subpackage/production.js similarity index 100% rename from test/config/fixtures/conditions-subpackage/production.js rename to test/e2e/fixtures/conditions-subpackage/production.js diff --git a/test/config/fixtures/conditions-test/conditions.test.js b/test/e2e/fixtures/conditions-test/conditions.test.js similarity index 100% rename from test/config/fixtures/conditions-test/conditions.test.js rename to test/e2e/fixtures/conditions-test/conditions.test.js diff --git a/test/config/fixtures/conditions-test/vitest.config.ts b/test/e2e/fixtures/conditions-test/vitest.config.ts similarity index 100% rename from test/config/fixtures/conditions-test/vitest.config.ts rename to test/e2e/fixtures/conditions-test/vitest.config.ts diff --git a/test/config/fixtures/conditions/basic.test.js b/test/e2e/fixtures/conditions/basic.test.js similarity index 100% rename from test/config/fixtures/conditions/basic.test.js rename to test/e2e/fixtures/conditions/basic.test.js diff --git a/test/config/fixtures/conditions/vite.config.ts b/test/e2e/fixtures/conditions/vite.config.ts similarity index 100% rename from test/config/fixtures/conditions/vite.config.ts rename to test/e2e/fixtures/conditions/vite.config.ts diff --git a/test/config/fixtures/console-batch/basic.test.ts b/test/e2e/fixtures/console-batch/basic.test.ts similarity index 100% rename from test/config/fixtures/console-batch/basic.test.ts rename to test/e2e/fixtures/console-batch/basic.test.ts diff --git a/test/config/fixtures/console-color/basic.test.ts b/test/e2e/fixtures/console-color/basic.test.ts similarity index 100% rename from test/config/fixtures/console-color/basic.test.ts rename to test/e2e/fixtures/console-color/basic.test.ts diff --git a/test/config/fixtures/console-color/vitest.config.ts b/test/e2e/fixtures/console-color/vitest.config.ts similarity index 100% rename from test/config/fixtures/console-color/vitest.config.ts rename to test/e2e/fixtures/console-color/vitest.config.ts diff --git a/test/config/fixtures/console/basic.test.ts b/test/e2e/fixtures/console-config/basic.test.ts similarity index 100% rename from test/config/fixtures/console/basic.test.ts rename to test/e2e/fixtures/console-config/basic.test.ts diff --git a/test/config/fixtures/console/vitest.config.ts b/test/e2e/fixtures/console-config/vitest.config.ts similarity index 100% rename from test/config/fixtures/console/vitest.config.ts rename to test/e2e/fixtures/console-config/vitest.config.ts diff --git a/test/config/fixtures/coverage-test/example.ts b/test/e2e/fixtures/coverage-test/example.ts similarity index 100% rename from test/config/fixtures/coverage-test/example.ts rename to test/e2e/fixtures/coverage-test/example.ts diff --git a/test/config/fixtures/css/App.css b/test/e2e/fixtures/css/App.css similarity index 100% rename from test/config/fixtures/css/App.css rename to test/e2e/fixtures/css/App.css diff --git a/test/config/fixtures/css/App.module.css b/test/e2e/fixtures/css/App.module.css similarity index 100% rename from test/config/fixtures/css/App.module.css rename to test/e2e/fixtures/css/App.module.css diff --git a/test/config/fixtures/css/test/default-css.spec.ts b/test/e2e/fixtures/css/test/default-css.spec.ts similarity index 100% rename from test/config/fixtures/css/test/default-css.spec.ts rename to test/e2e/fixtures/css/test/default-css.spec.ts diff --git a/test/config/fixtures/css/test/non-scope-module.spec.ts b/test/e2e/fixtures/css/test/non-scope-module.spec.ts similarity index 100% rename from test/config/fixtures/css/test/non-scope-module.spec.ts rename to test/e2e/fixtures/css/test/non-scope-module.spec.ts diff --git a/test/config/fixtures/css/test/process-css.spec.ts b/test/e2e/fixtures/css/test/process-css.spec.ts similarity index 100% rename from test/config/fixtures/css/test/process-css.spec.ts rename to test/e2e/fixtures/css/test/process-css.spec.ts diff --git a/test/config/fixtures/css/test/process-inline.spec.ts b/test/e2e/fixtures/css/test/process-inline.spec.ts similarity index 100% rename from test/config/fixtures/css/test/process-inline.spec.ts rename to test/e2e/fixtures/css/test/process-inline.spec.ts diff --git a/test/config/fixtures/css/test/process-module.spec.ts b/test/e2e/fixtures/css/test/process-module.spec.ts similarity index 100% rename from test/config/fixtures/css/test/process-module.spec.ts rename to test/e2e/fixtures/css/test/process-module.spec.ts diff --git a/test/config/fixtures/css/test/scope-module.spec.ts b/test/e2e/fixtures/css/test/scope-module.spec.ts similarity index 100% rename from test/config/fixtures/css/test/scope-module.spec.ts rename to test/e2e/fixtures/css/test/scope-module.spec.ts diff --git a/test/config/fixtures/css/utils.ts b/test/e2e/fixtures/css/utils.ts similarity index 100% rename from test/config/fixtures/css/utils.ts rename to test/e2e/fixtures/css/utils.ts diff --git a/test/config/fixtures/diff/basic.test.ts b/test/e2e/fixtures/diff/basic.test.ts similarity index 100% rename from test/config/fixtures/diff/basic.test.ts rename to test/e2e/fixtures/diff/basic.test.ts diff --git a/test/config/fixtures/diff/vite.config.ts b/test/e2e/fixtures/diff/vite.config.ts similarity index 100% rename from test/config/fixtures/diff/vite.config.ts rename to test/e2e/fixtures/diff/vite.config.ts diff --git a/test/config/fixtures/exclude/math.test.ts b/test/e2e/fixtures/exclude/math.test.ts similarity index 100% rename from test/config/fixtures/exclude/math.test.ts rename to test/e2e/fixtures/exclude/math.test.ts diff --git a/test/config/fixtures/exclude/math.ts b/test/e2e/fixtures/exclude/math.ts similarity index 100% rename from test/config/fixtures/exclude/math.ts rename to test/e2e/fixtures/exclude/math.ts diff --git a/test/config/fixtures/exclude/string.test.ts b/test/e2e/fixtures/exclude/string.test.ts similarity index 100% rename from test/config/fixtures/exclude/string.test.ts rename to test/e2e/fixtures/exclude/string.test.ts diff --git a/test/config/fixtures/exclude/string.ts b/test/e2e/fixtures/exclude/string.ts similarity index 100% rename from test/config/fixtures/exclude/string.ts rename to test/e2e/fixtures/exclude/string.ts diff --git a/test/config/fixtures/exclude/vitest.exclude.config.ts b/test/e2e/fixtures/exclude/vitest.exclude.config.ts similarity index 100% rename from test/config/fixtures/exclude/vitest.exclude.config.ts rename to test/e2e/fixtures/exclude/vitest.exclude.config.ts diff --git a/test/config/fixtures/exec-args-fixtures/forks.test.ts b/test/e2e/fixtures/exec-args-fixtures/forks.test.ts similarity index 100% rename from test/config/fixtures/exec-args-fixtures/forks.test.ts rename to test/e2e/fixtures/exec-args-fixtures/forks.test.ts diff --git a/test/config/fixtures/exec-args-fixtures/threads.test.ts b/test/e2e/fixtures/exec-args-fixtures/threads.test.ts similarity index 100% rename from test/config/fixtures/exec-args-fixtures/threads.test.ts rename to test/e2e/fixtures/exec-args-fixtures/threads.test.ts diff --git a/test/config/fixtures/exec-args-fixtures/vmThreads.test.ts b/test/e2e/fixtures/exec-args-fixtures/vmThreads.test.ts similarity index 100% rename from test/config/fixtures/exec-args-fixtures/vmThreads.test.ts rename to test/e2e/fixtures/exec-args-fixtures/vmThreads.test.ts diff --git a/test/config/fixtures/external/dynamic/basic.test.ts b/test/e2e/fixtures/external/dynamic/basic.test.ts similarity index 100% rename from test/config/fixtures/external/dynamic/basic.test.ts rename to test/e2e/fixtures/external/dynamic/basic.test.ts diff --git a/test/config/fixtures/external/dynamic/vitest.config.ts b/test/e2e/fixtures/external/dynamic/vitest.config.ts similarity index 100% rename from test/config/fixtures/external/dynamic/vitest.config.ts rename to test/e2e/fixtures/external/dynamic/vitest.config.ts diff --git a/test/config/fixtures/filters-slash/test/basic-foo/a.test.ts b/test/e2e/fixtures/filters-slash/test/basic-foo/a.test.ts similarity index 100% rename from test/config/fixtures/filters-slash/test/basic-foo/a.test.ts rename to test/e2e/fixtures/filters-slash/test/basic-foo/a.test.ts diff --git a/test/config/fixtures/filters-slash/test/basic.test.ts b/test/e2e/fixtures/filters-slash/test/basic.test.ts similarity index 100% rename from test/config/fixtures/filters-slash/test/basic.test.ts rename to test/e2e/fixtures/filters-slash/test/basic.test.ts diff --git a/test/config/fixtures/filters-slash/test/basic/a.test.ts b/test/e2e/fixtures/filters-slash/test/basic/a.test.ts similarity index 100% rename from test/config/fixtures/filters-slash/test/basic/a.test.ts rename to test/e2e/fixtures/filters-slash/test/basic/a.test.ts diff --git a/test/config/fixtures/filters-slash/test/foo-basic/a.test.ts b/test/e2e/fixtures/filters-slash/test/foo-basic/a.test.ts similarity index 100% rename from test/config/fixtures/filters-slash/test/foo-basic/a.test.ts rename to test/e2e/fixtures/filters-slash/test/foo-basic/a.test.ts diff --git a/test/config/fixtures/filters-slash/vitest.config.ts b/test/e2e/fixtures/filters-slash/vitest.config.ts similarity index 100% rename from test/config/fixtures/filters-slash/vitest.config.ts rename to test/e2e/fixtures/filters-slash/vitest.config.ts diff --git a/test/config/fixtures/filters/test/config.test.ts b/test/e2e/fixtures/filters/test/config.test.ts similarity index 100% rename from test/config/fixtures/filters/test/config.test.ts rename to test/e2e/fixtures/filters/test/config.test.ts diff --git a/test/config/fixtures/filters/test/dont-run-this.test.ts b/test/e2e/fixtures/filters/test/dont-run-this.test.ts similarity index 100% rename from test/config/fixtures/filters/test/dont-run-this.test.ts rename to test/e2e/fixtures/filters/test/dont-run-this.test.ts diff --git a/test/config/fixtures/filters/test/example.test.ts b/test/e2e/fixtures/filters/test/example.test.ts similarity index 100% rename from test/config/fixtures/filters/test/example.test.ts rename to test/e2e/fixtures/filters/test/example.test.ts diff --git a/test/config/fixtures/fixture-no-async/basic.test.ts b/test/e2e/fixtures/fixture-no-async/basic.test.ts similarity index 100% rename from test/config/fixtures/fixture-no-async/basic.test.ts rename to test/e2e/fixtures/fixture-no-async/basic.test.ts diff --git a/test/config/fixtures/fixture-no-async/vitest.config.ts b/test/e2e/fixtures/fixture-no-async/vitest.config.ts similarity index 100% rename from test/config/fixtures/fixture-no-async/vitest.config.ts rename to test/e2e/fixtures/fixture-no-async/vitest.config.ts diff --git a/test/config/fixtures/hook-timeout/basic.test.ts b/test/e2e/fixtures/hook-timeout/basic.test.ts similarity index 100% rename from test/config/fixtures/hook-timeout/basic.test.ts rename to test/e2e/fixtures/hook-timeout/basic.test.ts diff --git a/test/config/fixtures/inline-setup-file/file-setup.js b/test/e2e/fixtures/inline-setup-file/file-setup.js similarity index 100% rename from test/config/fixtures/inline-setup-file/file-setup.js rename to test/e2e/fixtures/inline-setup-file/file-setup.js diff --git a/test/config/fixtures/inline-setup-file/test.test.js b/test/e2e/fixtures/inline-setup-file/test.test.js similarity index 100% rename from test/config/fixtures/inline-setup-file/test.test.js rename to test/e2e/fixtures/inline-setup-file/test.test.js diff --git a/test/config/fixtures/inline-setup-file/vitest.config.js b/test/e2e/fixtures/inline-setup-file/vitest.config.js similarity index 100% rename from test/config/fixtures/inline-setup-file/vitest.config.js rename to test/e2e/fixtures/inline-setup-file/vitest.config.js diff --git a/test/config/fixtures/mixed-environments/project/test/happy-dom.test.ts b/test/e2e/fixtures/mixed-environments/project/test/happy-dom.test.ts similarity index 100% rename from test/config/fixtures/mixed-environments/project/test/happy-dom.test.ts rename to test/e2e/fixtures/mixed-environments/project/test/happy-dom.test.ts diff --git a/test/config/fixtures/mixed-environments/project/test/jsdom.test.ts b/test/e2e/fixtures/mixed-environments/project/test/jsdom.test.ts similarity index 100% rename from test/config/fixtures/mixed-environments/project/test/jsdom.test.ts rename to test/e2e/fixtures/mixed-environments/project/test/jsdom.test.ts diff --git a/test/config/fixtures/mixed-environments/project/test/node.test.ts b/test/e2e/fixtures/mixed-environments/project/test/node.test.ts similarity index 100% rename from test/config/fixtures/mixed-environments/project/test/node.test.ts rename to test/e2e/fixtures/mixed-environments/project/test/node.test.ts diff --git a/test/config/fixtures/mixed-environments/project/test/workspace-project.test.ts b/test/e2e/fixtures/mixed-environments/project/test/workspace-project.test.ts similarity index 100% rename from test/config/fixtures/mixed-environments/project/test/workspace-project.test.ts rename to test/e2e/fixtures/mixed-environments/project/test/workspace-project.test.ts diff --git a/test/config/fixtures/mixed-environments/vitest.config.ts b/test/e2e/fixtures/mixed-environments/vitest.config.ts similarity index 100% rename from test/config/fixtures/mixed-environments/vitest.config.ts rename to test/e2e/fixtures/mixed-environments/vitest.config.ts diff --git a/test/config/fixtures/mode/example.benchmark.ts b/test/e2e/fixtures/mode/example.benchmark.ts similarity index 100% rename from test/config/fixtures/mode/example.benchmark.ts rename to test/e2e/fixtures/mode/example.benchmark.ts diff --git a/test/config/fixtures/mode/example.test.ts b/test/e2e/fixtures/mode/example.test.ts similarity index 100% rename from test/config/fixtures/mode/example.test.ts rename to test/e2e/fixtures/mode/example.test.ts diff --git a/test/config/fixtures/mode/vitest.benchmark.config.ts b/test/e2e/fixtures/mode/vitest.benchmark.config.ts similarity index 100% rename from test/config/fixtures/mode/vitest.benchmark.config.ts rename to test/e2e/fixtures/mode/vitest.benchmark.config.ts diff --git a/test/config/fixtures/mode/vitest.test.config.ts b/test/e2e/fixtures/mode/vitest.test.config.ts similarity index 100% rename from test/config/fixtures/mode/vitest.test.config.ts rename to test/e2e/fixtures/mode/vitest.test.config.ts diff --git a/test/config/fixtures/no-browser-workspace/vitest.config.ts b/test/e2e/fixtures/no-browser-workspace/vitest.config.ts similarity index 100% rename from test/config/fixtures/no-browser-workspace/vitest.config.ts rename to test/e2e/fixtures/no-browser-workspace/vitest.config.ts diff --git a/test/config/fixtures/no-exec-args-fixtures/no-exec-argv.test.ts b/test/e2e/fixtures/no-exec-args-fixtures/no-exec-argv.test.ts similarity index 100% rename from test/config/fixtures/no-exec-args-fixtures/no-exec-argv.test.ts rename to test/e2e/fixtures/no-exec-args-fixtures/no-exec-argv.test.ts diff --git a/test/config/fixtures/no-exec-args-fixtures/vitest.config.ts b/test/e2e/fixtures/no-exec-args-fixtures/vitest.config.ts similarity index 100% rename from test/config/fixtures/no-exec-args-fixtures/vitest.config.ts rename to test/e2e/fixtures/no-exec-args-fixtures/vitest.config.ts diff --git a/test/config/fixtures/optimizer/external/basic.test.ts b/test/e2e/fixtures/optimizer/external/basic.test.ts similarity index 100% rename from test/config/fixtures/optimizer/external/basic.test.ts rename to test/e2e/fixtures/optimizer/external/basic.test.ts diff --git a/test/config/fixtures/optimizer/external/vitest.config.ts b/test/e2e/fixtures/optimizer/external/vitest.config.ts similarity index 100% rename from test/config/fixtures/optimizer/external/vitest.config.ts rename to test/e2e/fixtures/optimizer/external/vitest.config.ts diff --git a/test/config/fixtures/pool/a.test.ts b/test/e2e/fixtures/pool/a.test.ts similarity index 100% rename from test/config/fixtures/pool/a.test.ts rename to test/e2e/fixtures/pool/a.test.ts diff --git a/test/config/fixtures/pool/b.test.ts b/test/e2e/fixtures/pool/b.test.ts similarity index 100% rename from test/config/fixtures/pool/b.test.ts rename to test/e2e/fixtures/pool/b.test.ts diff --git a/test/config/fixtures/pool/c.test.ts b/test/e2e/fixtures/pool/c.test.ts similarity index 100% rename from test/config/fixtures/pool/c.test.ts rename to test/e2e/fixtures/pool/c.test.ts diff --git a/test/config/fixtures/pool/print-config.test.ts b/test/e2e/fixtures/pool/print-config.test.ts similarity index 100% rename from test/config/fixtures/pool/print-config.test.ts rename to test/e2e/fixtures/pool/print-config.test.ts diff --git a/test/config/fixtures/pool/print-testfiles.test.ts b/test/e2e/fixtures/pool/print-testfiles.test.ts similarity index 100% rename from test/config/fixtures/pool/print-testfiles.test.ts rename to test/e2e/fixtures/pool/print-testfiles.test.ts diff --git a/test/config/fixtures/pool/write-to-stdout-and-stderr.test.ts b/test/e2e/fixtures/pool/write-to-stdout-and-stderr.test.ts similarity index 100% rename from test/config/fixtures/pool/write-to-stdout-and-stderr.test.ts rename to test/e2e/fixtures/pool/write-to-stdout-and-stderr.test.ts diff --git a/test/config/fixtures/public-config/vitest.config.ts b/test/e2e/fixtures/public-config/vitest.config.ts similarity index 100% rename from test/config/fixtures/public-config/vitest.config.ts rename to test/e2e/fixtures/public-config/vitest.config.ts diff --git a/test/config/fixtures/public-config/vitest.custom.config.ts b/test/e2e/fixtures/public-config/vitest.custom.config.ts similarity index 100% rename from test/config/fixtures/public-config/vitest.custom.config.ts rename to test/e2e/fixtures/public-config/vitest.custom.config.ts diff --git a/test/config/fixtures/retry/retry.test.ts b/test/e2e/fixtures/retry/retry.test.ts similarity index 100% rename from test/config/fixtures/retry/retry.test.ts rename to test/e2e/fixtures/retry/retry.test.ts diff --git a/test/config/fixtures/retry/vitest.config.ts b/test/e2e/fixtures/retry/vitest.config.ts similarity index 100% rename from test/config/fixtures/retry/vitest.config.ts rename to test/e2e/fixtures/retry/vitest.config.ts diff --git a/test/config/fixtures/run-mode/example.test.ts b/test/e2e/fixtures/run-mode/example.test.ts similarity index 100% rename from test/config/fixtures/run-mode/example.test.ts rename to test/e2e/fixtures/run-mode/example.test.ts diff --git a/test/config/fixtures/run-mode/vitest.config.ts b/test/e2e/fixtures/run-mode/vitest.config.ts similarity index 100% rename from test/config/fixtures/run-mode/vitest.config.ts rename to test/e2e/fixtures/run-mode/vitest.config.ts diff --git a/test/config/fixtures/sequence-concurrent/sequence-concurrent-false-concurrent.test.ts b/test/e2e/fixtures/sequence-concurrent/sequence-concurrent-false-concurrent.test.ts similarity index 100% rename from test/config/fixtures/sequence-concurrent/sequence-concurrent-false-concurrent.test.ts rename to test/e2e/fixtures/sequence-concurrent/sequence-concurrent-false-concurrent.test.ts diff --git a/test/config/fixtures/sequence-concurrent/sequence-concurrent-false-sequential.test.ts b/test/e2e/fixtures/sequence-concurrent/sequence-concurrent-false-sequential.test.ts similarity index 100% rename from test/config/fixtures/sequence-concurrent/sequence-concurrent-false-sequential.test.ts rename to test/e2e/fixtures/sequence-concurrent/sequence-concurrent-false-sequential.test.ts diff --git a/test/config/fixtures/sequence-concurrent/sequence-concurrent-true-concurrent-false.test.ts b/test/e2e/fixtures/sequence-concurrent/sequence-concurrent-true-concurrent-false.test.ts similarity index 100% rename from test/config/fixtures/sequence-concurrent/sequence-concurrent-true-concurrent-false.test.ts rename to test/e2e/fixtures/sequence-concurrent/sequence-concurrent-true-concurrent-false.test.ts diff --git a/test/config/fixtures/sequence-concurrent/sequence-concurrent-true-concurrent.test.ts b/test/e2e/fixtures/sequence-concurrent/sequence-concurrent-true-concurrent.test.ts similarity index 100% rename from test/config/fixtures/sequence-concurrent/sequence-concurrent-true-concurrent.test.ts rename to test/e2e/fixtures/sequence-concurrent/sequence-concurrent-true-concurrent.test.ts diff --git a/test/config/fixtures/shard-4-files/test/1.test.js b/test/e2e/fixtures/shard-4-files/test/1.test.js similarity index 100% rename from test/config/fixtures/shard-4-files/test/1.test.js rename to test/e2e/fixtures/shard-4-files/test/1.test.js diff --git a/test/config/fixtures/shard-4-files/test/2.test.js b/test/e2e/fixtures/shard-4-files/test/2.test.js similarity index 100% rename from test/config/fixtures/shard-4-files/test/2.test.js rename to test/e2e/fixtures/shard-4-files/test/2.test.js diff --git a/test/config/fixtures/shard-4-files/test/3.test.js b/test/e2e/fixtures/shard-4-files/test/3.test.js similarity index 100% rename from test/config/fixtures/shard-4-files/test/3.test.js rename to test/e2e/fixtures/shard-4-files/test/3.test.js diff --git a/test/config/fixtures/shard-4-files/test/4.test.js b/test/e2e/fixtures/shard-4-files/test/4.test.js similarity index 100% rename from test/config/fixtures/shard-4-files/test/4.test.js rename to test/e2e/fixtures/shard-4-files/test/4.test.js diff --git a/test/config/fixtures/shard-4-files/vitest.config.js b/test/e2e/fixtures/shard-4-files/vitest.config.js similarity index 100% rename from test/config/fixtures/shard-4-files/vitest.config.js rename to test/e2e/fixtures/shard-4-files/vitest.config.js diff --git a/test/config/fixtures/shard/test/1.test.js b/test/e2e/fixtures/shard/test/1.test.js similarity index 100% rename from test/config/fixtures/shard/test/1.test.js rename to test/e2e/fixtures/shard/test/1.test.js diff --git a/test/config/fixtures/shard/test/2.test.js b/test/e2e/fixtures/shard/test/2.test.js similarity index 100% rename from test/config/fixtures/shard/test/2.test.js rename to test/e2e/fixtures/shard/test/2.test.js diff --git a/test/config/fixtures/shard/test/3.test.js b/test/e2e/fixtures/shard/test/3.test.js similarity index 100% rename from test/config/fixtures/shard/test/3.test.js rename to test/e2e/fixtures/shard/test/3.test.js diff --git a/test/config/fixtures/shard/vitest.config.js b/test/e2e/fixtures/shard/vitest.config.js similarity index 100% rename from test/config/fixtures/shard/vitest.config.js rename to test/e2e/fixtures/shard/vitest.config.js diff --git a/test/config/fixtures/snapshot-path-context/__snapshots__/project1/basic.test.ts.snap b/test/e2e/fixtures/snapshot-path-context/__snapshots__/project1/basic.test.ts.snap similarity index 100% rename from test/config/fixtures/snapshot-path-context/__snapshots__/project1/basic.test.ts.snap rename to test/e2e/fixtures/snapshot-path-context/__snapshots__/project1/basic.test.ts.snap diff --git a/test/config/fixtures/snapshot-path-context/__snapshots__/project2/basic.test.ts.snap b/test/e2e/fixtures/snapshot-path-context/__snapshots__/project2/basic.test.ts.snap similarity index 100% rename from test/config/fixtures/snapshot-path-context/__snapshots__/project2/basic.test.ts.snap rename to test/e2e/fixtures/snapshot-path-context/__snapshots__/project2/basic.test.ts.snap diff --git a/test/config/fixtures/snapshot-path-context/basic.test.ts b/test/e2e/fixtures/snapshot-path-context/basic.test.ts similarity index 100% rename from test/config/fixtures/snapshot-path-context/basic.test.ts rename to test/e2e/fixtures/snapshot-path-context/basic.test.ts diff --git a/test/config/fixtures/snapshot-path-context/vitest.config.ts b/test/e2e/fixtures/snapshot-path-context/vitest.config.ts similarity index 100% rename from test/config/fixtures/snapshot-path-context/vitest.config.ts rename to test/e2e/fixtures/snapshot-path-context/vitest.config.ts diff --git a/test/config/fixtures/test/example.test.ts b/test/e2e/fixtures/test/example.test.ts similarity index 100% rename from test/config/fixtures/test/example.test.ts rename to test/e2e/fixtures/test/example.test.ts diff --git a/test/config/fixtures/test/fake-timers.test.ts b/test/e2e/fixtures/test/fake-timers.test.ts similarity index 100% rename from test/config/fixtures/test/fake-timers.test.ts rename to test/e2e/fixtures/test/fake-timers.test.ts diff --git a/test/config/fixtures/test/vitest.config.js b/test/e2e/fixtures/test/vitest.config.js similarity index 100% rename from test/config/fixtures/test/vitest.config.js rename to test/e2e/fixtures/test/vitest.config.js diff --git a/test/config/fixtures/workers-option/example.test.ts b/test/e2e/fixtures/workers-option/example.test.ts similarity index 100% rename from test/config/fixtures/workers-option/example.test.ts rename to test/e2e/fixtures/workers-option/example.test.ts diff --git a/test/config/fixtures/workers-option/vitest.config.js b/test/e2e/fixtures/workers-option/vitest.config.js similarity index 100% rename from test/config/fixtures/workers-option/vitest.config.js rename to test/e2e/fixtures/workers-option/vitest.config.js diff --git a/test/config/fixtures/workspace-flags/projects/cli-config.test.ts b/test/e2e/fixtures/workspace-flags/projects/cli-config.test.ts similarity index 100% rename from test/config/fixtures/workspace-flags/projects/cli-config.test.ts rename to test/e2e/fixtures/workspace-flags/projects/cli-config.test.ts diff --git a/test/config/fixtures/workspace-flags/projects/vitest.config.js b/test/e2e/fixtures/workspace-flags/projects/vitest.config.js similarity index 100% rename from test/config/fixtures/workspace-flags/projects/vitest.config.js rename to test/e2e/fixtures/workspace-flags/projects/vitest.config.js diff --git a/test/config/fixtures/workspace-flags/vitest.config.js b/test/e2e/fixtures/workspace-flags/vitest.config.js similarity index 100% rename from test/config/fixtures/workspace-flags/vitest.config.js rename to test/e2e/fixtures/workspace-flags/vitest.config.js diff --git a/test/e2e/package.json b/test/e2e/package.json index e80c5d7db..01d1c4b0d 100644 --- a/test/e2e/package.json +++ b/test/e2e/package.json @@ -15,24 +15,33 @@ "@opentelemetry/sdk-node": "^0.213.0", "@opentelemetry/sdk-trace-web": "^2.6.0", "@test/pkg-reporter": "link:./deps/pkg-reporter", + "@test/test-dep-config": "link:./deps/test-dep-config", "@test/test-dep-error": "file:./deps/error", "@test/test-dep-linked": "link:./deps/linked", "@test/test-dep-url": "link:./deps/dep-url", "@types/ws": "catalog:", "@vitejs/plugin-basic-ssl": "^2.1.4", + "@vitejs/test-dep-virtual": "file:./deps/test-dep-virtual", "@vitest/browser-playwright": "workspace:*", "@vitest/browser-preview": "workspace:*", "@vitest/browser-webdriverio": "workspace:*", "@vitest/mocker": "workspace:*", "@vitest/runner": "workspace:*", + "@vitest/test-dep-optimizer-external": "file:./deps/optimizer/external", + "@vitest/test-dep-optimizer-optimized": "file:./deps/optimizer/optimized", "@vitest/utils": "workspace:*", "ansivision": "catalog:", "flatted": "catalog:", + "inline-dep": "file:./deps/vite-ssr-resolve/inline-dep", "jest-image-snapshot": "^6.5.1", "obug": "^2.1.1", + "other-dep": "file:./deps/vite-ssr-resolve/other-dep", "playwright": "catalog:", + "ssr-no-external-dep": "file:./deps/vite-ssr-resolve/ssr-no-external-dep", + "test-dep-conditions": "file:./deps/test-dep-conditions", "test-dep-invalid": "link:./deps/dep-invalid", "test-dep-simple": "file:./deps/dep-simple", + "tinyexec": "^1.0.2", "tinyspy": "catalog:", "typescript": "catalog:", "unplugin-swc": "^1.5.9", diff --git a/test/config/test/__snapshots__/diff.test.ts.snap b/test/e2e/test/__snapshots__/diff.test.ts.snap similarity index 100% rename from test/config/test/__snapshots__/diff.test.ts.snap rename to test/e2e/test/__snapshots__/diff.test.ts.snap diff --git a/test/config/test/__snapshots__/hook-timeout.test.ts.snap b/test/e2e/test/__snapshots__/hook-timeout.test.ts.snap similarity index 100% rename from test/config/test/__snapshots__/hook-timeout.test.ts.snap rename to test/e2e/test/__snapshots__/hook-timeout.test.ts.snap diff --git a/test/config/test/browser-persistent-context.test.ts b/test/e2e/test/browser-persistent-context.test.ts similarity index 100% rename from test/config/test/browser-persistent-context.test.ts rename to test/e2e/test/browser-persistent-context.test.ts diff --git a/test/config/test/cache.test.ts b/test/e2e/test/cache.test.ts similarity index 100% rename from test/config/test/cache.test.ts rename to test/e2e/test/cache.test.ts diff --git a/test/config/test/cli-config.test.ts b/test/e2e/test/cli-config.test.ts similarity index 100% rename from test/config/test/cli-config.test.ts rename to test/e2e/test/cli-config.test.ts diff --git a/test/config/test/conditions-cli.test.ts b/test/e2e/test/conditions-cli.test.ts similarity index 100% rename from test/config/test/conditions-cli.test.ts rename to test/e2e/test/conditions-cli.test.ts diff --git a/test/config/test/config-types.test-d.ts b/test/e2e/test/config-types.test-d.ts similarity index 100% rename from test/config/test/config-types.test-d.ts rename to test/e2e/test/config-types.test-d.ts diff --git a/test/config/test/console-color.test.ts b/test/e2e/test/console-color.test.ts similarity index 100% rename from test/config/test/console-color.test.ts rename to test/e2e/test/console-color.test.ts diff --git a/test/config/test/console.test.ts b/test/e2e/test/console-config.test.ts similarity index 94% rename from test/config/test/console.test.ts rename to test/e2e/test/console-config.test.ts index 2127915e0..c1fadeed8 100644 --- a/test/config/test/console.test.ts +++ b/test/e2e/test/console-config.test.ts @@ -3,14 +3,14 @@ import { runVitest } from '../../test-utils' test('default intercept', async () => { const { stderr } = await runVitest({ - root: './fixtures/console', + root: './fixtures/console-config', }) expect(stderr).toBe('stderr | basic.test.ts > basic\n__test_console__\n\n') }) test.each(['threads', 'vmThreads'] as const)(`disable intercept pool=%s`, async (pool) => { const { stderr } = await runVitest({ - root: './fixtures/console', + root: './fixtures/console-config', disableConsoleIntercept: true, pool, }) diff --git a/test/config/test/css-configs.test.ts b/test/e2e/test/css-configs.test.ts similarity index 100% rename from test/config/test/css-configs.test.ts rename to test/e2e/test/css-configs.test.ts diff --git a/test/config/test/diff.test.ts b/test/e2e/test/diff.test.ts similarity index 100% rename from test/config/test/diff.test.ts rename to test/e2e/test/diff.test.ts diff --git a/test/config/test/exclude.test.ts b/test/e2e/test/exclude.test.ts similarity index 100% rename from test/config/test/exclude.test.ts rename to test/e2e/test/exclude.test.ts diff --git a/test/config/test/exec-args.test.ts b/test/e2e/test/exec-args.test.ts similarity index 100% rename from test/config/test/exec-args.test.ts rename to test/e2e/test/exec-args.test.ts diff --git a/test/config/test/external.test.ts b/test/e2e/test/external.test.ts similarity index 100% rename from test/config/test/external.test.ts rename to test/e2e/test/external.test.ts diff --git a/test/config/test/failures.test.ts b/test/e2e/test/failures.test.ts similarity index 100% rename from test/config/test/failures.test.ts rename to test/e2e/test/failures.test.ts diff --git a/test/config/test/fixture-no-async.test.ts b/test/e2e/test/fixture-no-async.test.ts similarity index 100% rename from test/config/test/fixture-no-async.test.ts rename to test/e2e/test/fixture-no-async.test.ts diff --git a/test/config/test/hook-timeout.test.ts b/test/e2e/test/hook-timeout.test.ts similarity index 100% rename from test/config/test/hook-timeout.test.ts rename to test/e2e/test/hook-timeout.test.ts diff --git a/test/config/test/inline-setup-file.test.ts b/test/e2e/test/inline-setup-file.test.ts similarity index 100% rename from test/config/test/inline-setup-file.test.ts rename to test/e2e/test/inline-setup-file.test.ts diff --git a/test/config/test/mixed-environments.test.ts b/test/e2e/test/mixed-environments.test.ts similarity index 100% rename from test/config/test/mixed-environments.test.ts rename to test/e2e/test/mixed-environments.test.ts diff --git a/test/config/test/mode.test.ts b/test/e2e/test/mode.test.ts similarity index 100% rename from test/config/test/mode.test.ts rename to test/e2e/test/mode.test.ts diff --git a/test/config/test/optimizer.test.ts b/test/e2e/test/optimizer.test.ts similarity index 100% rename from test/config/test/optimizer.test.ts rename to test/e2e/test/optimizer.test.ts diff --git a/test/config/test/override.test.ts b/test/e2e/test/override.test.ts similarity index 98% rename from test/config/test/override.test.ts rename to test/e2e/test/override.test.ts index 15848e1fe..db792ead4 100644 --- a/test/config/test/override.test.ts +++ b/test/e2e/test/override.test.ts @@ -7,7 +7,7 @@ import { createVitest, parseCLI } from 'vitest/node' type VitestOptions = Parameters[3] async function vitest(cliOptions: TestUserConfig, configValue: TestUserConfig = {}, viteConfig: ViteUserConfig = {}, vitestOptions: VitestOptions = {}) { - const vitest = await createVitest('test', { ...cliOptions, watch: false }, { ...viteConfig, test: configValue as any }, vitestOptions) + const vitest = await createVitest('test', { ...cliOptions, watch: false, config: false }, { ...viteConfig, test: configValue as any }, vitestOptions) onTestFinished(() => vitest.close()) return vitest } diff --git a/test/config/test/pass-empty-files.test.ts b/test/e2e/test/pass-empty-files.test.ts similarity index 100% rename from test/config/test/pass-empty-files.test.ts rename to test/e2e/test/pass-empty-files.test.ts diff --git a/test/config/test/pool.test.ts b/test/e2e/test/pool.test.ts similarity index 100% rename from test/config/test/pool.test.ts rename to test/e2e/test/pool.test.ts diff --git a/test/config/test/public.test.ts b/test/e2e/test/public.test.ts similarity index 95% rename from test/config/test/public.test.ts rename to test/e2e/test/public.test.ts index e18ed08ef..345a5de56 100644 --- a/test/config/test/public.test.ts +++ b/test/e2e/test/public.test.ts @@ -8,7 +8,9 @@ test('resolves the test config', async () => { const { viteConfig, vitestConfig } = await resolveConfig() expect(viteConfig.mode).toBe('test') expect(vitestConfig.mode).toBe('test') - expect(vitestConfig.reporters).toEqual([['verbose', {}]]) // inherits the root config + // inherits the root config + // TODO: test cwd loading behavior without relying on test/e2e/vitest.config.ts + expect(vitestConfig.reporters.slice(0, 1)).toEqual([['verbose', {}]]) expect(viteConfig.plugins.find(p => p.name === 'vitest')).toBeDefined() }) diff --git a/test/config/test/retry.test.ts b/test/e2e/test/retry.test.ts similarity index 100% rename from test/config/test/retry.test.ts rename to test/e2e/test/retry.test.ts diff --git a/test/config/test/sequence-concurrent.test.ts b/test/e2e/test/sequence-concurrent.test.ts similarity index 100% rename from test/config/test/sequence-concurrent.test.ts rename to test/e2e/test/sequence-concurrent.test.ts diff --git a/test/config/test/shard.test.ts b/test/e2e/test/shard.test.ts similarity index 100% rename from test/config/test/shard.test.ts rename to test/e2e/test/shard.test.ts diff --git a/test/config/test/snapshot.test.ts b/test/e2e/test/snapshot.test.ts similarity index 100% rename from test/config/test/snapshot.test.ts rename to test/e2e/test/snapshot.test.ts diff --git a/test/config/test/testname-pattern.test.ts b/test/e2e/test/testname-pattern.test.ts similarity index 84% rename from test/config/test/testname-pattern.test.ts rename to test/e2e/test/testname-pattern.test.ts index e004ac326..558809a85 100644 --- a/test/config/test/testname-pattern.test.ts +++ b/test/e2e/test/testname-pattern.test.ts @@ -1,7 +1,6 @@ import { join, resolve } from 'pathe' import { expect, test } from 'vitest' - -import { runVitest } from '../../test-utils' +import { runVitest, useFS } from '../../test-utils' test.each([ { filter: 'example' }, @@ -25,14 +24,19 @@ test('match by full test file name', async () => { }) test('match by pattern that also matches current working directory', async () => { - const filter = 'config' - expect(process.cwd()).toMatch(filter) - - const { stdout } = await runVitest({ root: './fixtures/filters' }, [filter]) - - expect(stdout).toMatch('✓ test/config.test.ts > this will pass') - expect(stdout).toMatch('Test Files 1 passed (1)') - expect(stdout).not.toMatch('test/example.test.ts') + const root = resolve(process.cwd(), `vitest-test-${crypto.randomUUID()}`, `root`) + useFS(root, { + 'basic.test.ts': `test("ok", () => {})`, + 'root.test.ts': `test("ok", () => {})`, + }) + const result = await runVitest({ root, globals: true }, ['root']) + expect(result.errorTree()).toMatchInlineSnapshot(` + { + "root.test.ts": { + "ok": "passed", + }, + } + `) }) test.each([ diff --git a/test/config/test/vite-ssr-resolve.test.ts b/test/e2e/test/vite-ssr-resolve.test.ts similarity index 100% rename from test/config/test/vite-ssr-resolve.test.ts rename to test/e2e/test/vite-ssr-resolve.test.ts diff --git a/test/e2e/vitest.config.ts b/test/e2e/vitest.config.ts index 6b4da452d..b17980e64 100644 --- a/test/e2e/vitest.config.ts +++ b/test/e2e/vitest.config.ts @@ -44,7 +44,10 @@ export default defineConfig({ }, typecheck: { enabled: true, - include: ['./test/reporters/configuration-options.test-d.ts'], + include: [ + './test/config-types.test-d.ts', + './test/reporters/configuration-options.test-d.ts', + ], }, sequence: { groupOrder: 0,