From a861dbd7e834b797697c7333b42af171221f11ad Mon Sep 17 00:00:00 2001 From: Kevin Stubbs Date: Mon, 30 Dec 2024 20:54:27 +0200 Subject: [PATCH] Skip playwright tests for starter kits when only running command. --- .../{tests => playwright-tests}/basic-pages.spec.ts | 0 starters/nextjs-starter-approuter-ts/playwright.config.ts | 2 +- starters/nextjs-starter-approuter-ts/vite.config.js | 3 ++- .../{tests => playwright-tests}/basic-pages.spec.ts | 0 starters/nextjs-starter-ts/playwright.config.ts | 2 +- starters/nextjs-starter-ts/vite.config.js | 3 ++- .../{tests => playwright-tests}/basic-pages.spec.js | 0 starters/nextjs-starter/playwright.config.js | 2 +- starters/nextjs-starter/vite.config.js | 3 ++- 9 files changed, 9 insertions(+), 6 deletions(-) rename starters/nextjs-starter-approuter-ts/{tests => playwright-tests}/basic-pages.spec.ts (100%) rename starters/nextjs-starter-ts/{tests => playwright-tests}/basic-pages.spec.ts (100%) rename starters/nextjs-starter/{tests => playwright-tests}/basic-pages.spec.js (100%) diff --git a/starters/nextjs-starter-approuter-ts/tests/basic-pages.spec.ts b/starters/nextjs-starter-approuter-ts/playwright-tests/basic-pages.spec.ts similarity index 100% rename from starters/nextjs-starter-approuter-ts/tests/basic-pages.spec.ts rename to starters/nextjs-starter-approuter-ts/playwright-tests/basic-pages.spec.ts diff --git a/starters/nextjs-starter-approuter-ts/playwright.config.ts b/starters/nextjs-starter-approuter-ts/playwright.config.ts index a05d8b5a..56218cda 100644 --- a/starters/nextjs-starter-approuter-ts/playwright.config.ts +++ b/starters/nextjs-starter-approuter-ts/playwright.config.ts @@ -12,7 +12,7 @@ import { defineConfig, devices } from '@playwright/test'; * See https://playwright.dev/docs/test-configuration. */ export default defineConfig({ - testDir: './tests', + testDir: './playwright-tests', /* Run tests in files in parallel */ fullyParallel: true, /* Fail the build on CI if you accidentally left test.only in the source code. */ diff --git a/starters/nextjs-starter-approuter-ts/vite.config.js b/starters/nextjs-starter-approuter-ts/vite.config.js index 1de88e54..761ffe98 100644 --- a/starters/nextjs-starter-approuter-ts/vite.config.js +++ b/starters/nextjs-starter-approuter-ts/vite.config.js @@ -1,5 +1,5 @@ -import { defineConfig } from "vitest/config"; import react from "@vitejs/plugin-react"; +import { configDefaults, defineConfig } from "vitest/config"; export default defineConfig(({ mode }) => { return { @@ -9,6 +9,7 @@ export default defineConfig(({ mode }) => { reportsDirectory: `./coverage`, }, setupFiles: ["./setupVitest.js"], + exclude: [...configDefaults.exclude, "./playwright-tests/*"], }, plugins: [react()], }; diff --git a/starters/nextjs-starter-ts/tests/basic-pages.spec.ts b/starters/nextjs-starter-ts/playwright-tests/basic-pages.spec.ts similarity index 100% rename from starters/nextjs-starter-ts/tests/basic-pages.spec.ts rename to starters/nextjs-starter-ts/playwright-tests/basic-pages.spec.ts diff --git a/starters/nextjs-starter-ts/playwright.config.ts b/starters/nextjs-starter-ts/playwright.config.ts index a05d8b5a..56218cda 100644 --- a/starters/nextjs-starter-ts/playwright.config.ts +++ b/starters/nextjs-starter-ts/playwright.config.ts @@ -12,7 +12,7 @@ import { defineConfig, devices } from '@playwright/test'; * See https://playwright.dev/docs/test-configuration. */ export default defineConfig({ - testDir: './tests', + testDir: './playwright-tests', /* Run tests in files in parallel */ fullyParallel: true, /* Fail the build on CI if you accidentally left test.only in the source code. */ diff --git a/starters/nextjs-starter-ts/vite.config.js b/starters/nextjs-starter-ts/vite.config.js index 1de88e54..761ffe98 100644 --- a/starters/nextjs-starter-ts/vite.config.js +++ b/starters/nextjs-starter-ts/vite.config.js @@ -1,5 +1,5 @@ -import { defineConfig } from "vitest/config"; import react from "@vitejs/plugin-react"; +import { configDefaults, defineConfig } from "vitest/config"; export default defineConfig(({ mode }) => { return { @@ -9,6 +9,7 @@ export default defineConfig(({ mode }) => { reportsDirectory: `./coverage`, }, setupFiles: ["./setupVitest.js"], + exclude: [...configDefaults.exclude, "./playwright-tests/*"], }, plugins: [react()], }; diff --git a/starters/nextjs-starter/tests/basic-pages.spec.js b/starters/nextjs-starter/playwright-tests/basic-pages.spec.js similarity index 100% rename from starters/nextjs-starter/tests/basic-pages.spec.js rename to starters/nextjs-starter/playwright-tests/basic-pages.spec.js diff --git a/starters/nextjs-starter/playwright.config.js b/starters/nextjs-starter/playwright.config.js index 1615efb5..26605466 100644 --- a/starters/nextjs-starter/playwright.config.js +++ b/starters/nextjs-starter/playwright.config.js @@ -12,7 +12,7 @@ import { defineConfig, devices } from "@playwright/test"; * See https://playwright.dev/docs/test-configuration. */ export default defineConfig({ - testDir: "./tests", + testDir: "./playwright-tests", /* Run tests in files in parallel */ fullyParallel: true, /* Fail the build on CI if you accidentally left test.only in the source code. */ diff --git a/starters/nextjs-starter/vite.config.js b/starters/nextjs-starter/vite.config.js index 1de88e54..761ffe98 100644 --- a/starters/nextjs-starter/vite.config.js +++ b/starters/nextjs-starter/vite.config.js @@ -1,5 +1,5 @@ -import { defineConfig } from "vitest/config"; import react from "@vitejs/plugin-react"; +import { configDefaults, defineConfig } from "vitest/config"; export default defineConfig(({ mode }) => { return { @@ -9,6 +9,7 @@ export default defineConfig(({ mode }) => { reportsDirectory: `./coverage`, }, setupFiles: ["./setupVitest.js"], + exclude: [...configDefaults.exclude, "./playwright-tests/*"], }, plugins: [react()], };