From 68d0a442e4c71fcc181804511fb7cec08344b62c Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Wed, 20 Mar 2024 10:52:21 -0400 Subject: [PATCH] fixes --- playwright.bail.config.ts | 10 ---------- playwright.config.ts | 17 ----------------- test/_community/config.ts | 5 ++++- test/runE2E.ts | 1 - tsconfig.json | 2 +- 5 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 playwright.bail.config.ts delete mode 100644 playwright.config.ts diff --git a/playwright.bail.config.ts b/playwright.bail.config.ts deleted file mode 100644 index e74a4d684..000000000 --- a/playwright.bail.config.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type { PlaywrightTestConfig } from '@playwright/test' - -import baseConfig from './playwright.config.js' - -const config: PlaywrightTestConfig = { - ...baseConfig, - maxFailures: 1, -} - -export default config diff --git a/playwright.config.ts b/playwright.config.ts deleted file mode 100644 index b95f45d80..000000000 --- a/playwright.config.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { defineConfig } from '@playwright/test' - -export default defineConfig({ - // Look for test files in the "test" directory, relative to this configuration file - testDir: 'test', - testMatch: '*e2e.spec.ts', - timeout: 180000, // 3 minutes - use: { - screenshot: 'only-on-failure', - trace: 'retain-on-failure', - video: 'retain-on-failure', - }, - expect: { - timeout: 45000, - }, - workers: 16, -}) diff --git a/test/_community/config.ts b/test/_community/config.ts index cec8837f5..5f1e814f8 100644 --- a/test/_community/config.ts +++ b/test/_community/config.ts @@ -1,11 +1,14 @@ import path from 'path' import { getFileByPath } from 'payload/uploads' +import { fileURLToPath } from 'url' import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js' import { devUser } from '../credentials.js' import { MediaCollection } from './collections/Media/index.js' import { PostsCollection, postsSlug } from './collections/Posts/index.js' import { MenuGlobal } from './globals/Menu/index.js' +const filename = fileURLToPath(import.meta.url) +const dirname = path.dirname(filename) export default buildConfigWithDefaults({ // ...extend config here @@ -31,7 +34,7 @@ export default buildConfigWithDefaults({ }) // Create image - const imageFilePath = path.resolve(process.cwd(), './test/uploads/image.png') + const imageFilePath = path.resolve(dirname, '../uploads/image.png') const imageFile = await getFileByPath(imageFilePath) await payload.create({ diff --git a/test/runE2E.ts b/test/runE2E.ts index 3d269c0c2..af5faf8b8 100644 --- a/test/runE2E.ts +++ b/test/runE2E.ts @@ -69,7 +69,6 @@ function executePlaywright(suitePath: string, bail = false) { console.log(`Executing ${suitePath}...`) const playwrightCfg = path.resolve( dirname, - '..', `${bail ? 'playwright.bail.config.ts' : 'playwright.config.ts'}`, ) diff --git a/tsconfig.json b/tsconfig.json index 6ea0e2c75..6e11abba6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -154,4 +154,4 @@ ".next/types/**/*.ts", "scripts/**/*.ts" ] -} +} \ No newline at end of file