chore: merge e2e configs

akhenry · Sep 10, 2024 · 8064b0d · 8064b0d
1 parent 29df4e2
commit 8064b0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/tests/e2e/playwright-performance-prod.config.js b/tests/e2e/playwright-performance-prod.config.js
@@ -4,11 +4,12 @@
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
     retries: 0, //Only for debugging purposes for trace: 'on-first-retry'
-    testDir: 'yamcs',
-    testMatch: '**/*.perf.spec.js',
+    testDir: '.',
+    testMatch: /.*\.e2e\.perf\.spec\.(mjs|js)$/,
     timeout: 60 * 1000,
     workers: 1, //Only run in serial with 1 worker
     webServer: {
+        cwd: '../',
         command: 'npm run start:prod', //Production mode
         url: 'http://localhost:9000/#',
         timeout: 200 * 1000,
@@ -25,7 +26,7 @@ const config = {
     projects: [
         {
             name: 'chrome-memory',
-            testMatch: '*.memory.perf.spec.js', //Only run memory tests
+            testMatch: /.*\.memory\.perf\.spec\.(mjs|js)$/, //Only run memory tests
             use: {
                 browserName: 'chromium',
                 launchOptions: {
@@ -43,7 +44,7 @@ const config = {
         },
         {
             name: 'chrome',
-            testIgnore: '*.memory.perf.spec.js', //Do not run memory tests without proper flags
+            testIgnore: /.*\.memory\.perf\.spec\.(mjs|js)$/, //Do not run memory tests without proper flags
             use: {
                 browserName: 'chromium'
             }

diff --git a/tests/e2e/playwright-quickstart.config.js b/tests/e2e/playwright-quickstart.config.js
@@ -3,13 +3,13 @@
 
 /** @type {import('@playwright/test').PlaywrightTestConfig<{ failOnConsoleError: boolean, myItemsFolderName: string }>} */
 const config = {
-    retries: 0,
+    retries: 1,
     testDir: '.',
     testMatch: /.*\.e2e\.spec\.(mjs|js)$/,
-    testIgnore: '**/*.perf.spec.js',
+    testIgnore: /.*\.perf\.spec\.(mjs|js)$/,
     timeout: 30 * 1000,
     use: {
-        headless: true,
+        headless: false,
         video: 'off',
         screenshot: 'on',
         trace: 'on',