diff --git a/.gitignore b/.gitignore index a4b9e26..70de59f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,6 @@ node_modules /styles/*css /test-results/ -/playwright-report/ +/playwright-report* /blob-report/ -/playwright/playwright/.cache/ +.cache* diff --git a/package.json b/package.json index 7ca78da..642d38f 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "test:watch": "jest --watchAll --maxWorkers=25%", "playwright": "playwright test --config=playwright/playwright.config.ts", "playwright:update": "npm run playwright -- -u", + "playwright:clear-cache": "rm -rf ./playwright/.cache", "playwright:docker": "./scripts/playwright-docker.sh 'npm run playwright'", "playwright:docker:update": "./scripts/playwright-docker.sh 'npm run playwright:update'", "playwright:docker:clear-cache": "./scripts/playwright-docker.sh clear-cache", diff --git a/playwright/README.md b/playwright/README.md index f968ca8..4f5031f 100644 --- a/playwright/README.md +++ b/playwright/README.md @@ -132,6 +132,7 @@ - `npm run playwright:install` - install playwright browsers and dependencies - `npm run playwright` - run tests - `npm run playwright:update` - update screenshots +- `npm run playwright:clear-cache` - clear cache vite - `npm run playwright:docker` - run tests using docker - `npm run playwright:docker:update` - update screenshots using docker -- `npm run playwright:docker:clear-cache` - clear node_modules cache for docker container +- `npm run playwright:docker:clear-cache` - clear node_modules cache for docker container and clear cache vite diff --git a/playwright/playwright.config.ts b/playwright/playwright.config.ts index a48a8a7..258c2b1 100644 --- a/playwright/playwright.config.ts +++ b/playwright/playwright.config.ts @@ -18,7 +18,10 @@ reporter.push( 'html', { open: process.env.CI ? 'never' : 'on-failure', - outputFolder: resolve(process.cwd(), 'playwright-report'), + outputFolder: resolve( + process.cwd(), + process.env.IS_DOCKER ? 'playwright-report-docker' : 'playwright-report', + ), }, ], ); @@ -54,6 +57,7 @@ const config: PlaywrightTestConfig = { /* Port to use for Playwright component endpoint. */ screenshot: 'only-on-failure', timezoneId: 'UTC', + ctCacheDir: process.env.IS_DOCKER ? '.cache-docker' : '.cache', ctViteConfig: { publicDir: pathFromRoot('.storybook/public'), json: { diff --git a/scripts/playwright-docker.sh b/scripts/playwright-docker.sh index e8ee741..891b6a5 100755 --- a/scripts/playwright-docker.sh +++ b/scripts/playwright-docker.sh @@ -15,6 +15,7 @@ run_command() { $CONTAINER_TOOL run --rm --network host -it -w /work \ -v $(pwd):/work \ -v "$NODE_MODULES_CACHE_DIR:/work/node_modules" \ + -e IS_DOCKER=1 \ "$IMAGE_NAME:$IMAGE_TAG" \ /bin/bash -c "$1" } @@ -30,6 +31,7 @@ fi if [[ "$1" = "clear-cache" ]]; then rm -rf "$NODE_MODULES_CACHE_DIR" + rm -rf "./playwright/.cache-docker" exit 0 fi