From 60b3731199f4c94e127e8510190069cfb0d904c0 Mon Sep 17 00:00:00 2001
From: Elena Baidakova <elena@ghost.org>
Date: Thu, 16 Mar 2023 18:34:11 +0400
Subject: [PATCH] Separated admin and portal tests to different projects

refs TryGhost/Team#2667
- Portal tests are much more stable when running in the separate DB from admin tests.
---
 ghost/core/package.json                              |  4 +++-
 ghost/core/playwright.config.js                      | 12 ++++++++++++
 .../{site-settings => admin}/private-site.spec.js    |  0
 3 files changed, 15 insertions(+), 1 deletion(-)
 rename ghost/core/test/e2e-browser/{site-settings => admin}/private-site.spec.js (100%)

diff --git a/ghost/core/package.json b/ghost/core/package.json
index 025f29b82f..ea268cbcb9 100644
--- a/ghost/core/package.json
+++ b/ghost/core/package.json
@@ -32,7 +32,9 @@
     "test:integration": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/integration' --timeout=10000",
     "test:e2e": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/e2e-api' './test/e2e-frontend' './test/e2e-server' './test/e2e-webhooks' --timeout=15000",
     "test:regression": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000",
-    "test:browser": "NODE_ENV=testing-browser playwright test test/e2e-browser",
+    "test:browser": "yarn test:browser:admin && yarn test:browser:portal",
+    "test:browser:admin": "NODE_ENV=testing-browser playwright test test/e2e-browser --project=admin",
+    "test:browser:portal": "NODE_ENV=testing-browser playwright test test/e2e-browser --project=portal",
     "test:browser:single": "NODE_ENV=testing-browser playwright test",
     "test:browser:setup": "npx playwright install",
     "test:browser:record": "NODE_ENV=testing-browser yarn start record-test",
diff --git a/ghost/core/playwright.config.js b/ghost/core/playwright.config.js
index 98905675d1..a09c83d308 100644
--- a/ghost/core/playwright.config.js
+++ b/ghost/core/playwright.config.js
@@ -15,6 +15,18 @@ const config = {
         // TODO: Where to put this
         storageState: 'playwright-state.json'
     },
+    // separated tests to projects for better logging to console
+    // portal tests are much more stable when running in the separate DB from admin tests
+    projects: [
+        {
+            name: 'admin',
+            testDir: 'test/e2e-browser/admin'
+        },
+        {
+            name: 'portal',
+            testDir: 'test/e2e-browser/portal'
+        }
+    ],
     globalSetup: './test/e2e-browser/utils/global-setup',
     globalTeardown: './test/e2e-browser/utils/global-teardown'
 };
diff --git a/ghost/core/test/e2e-browser/site-settings/private-site.spec.js b/ghost/core/test/e2e-browser/admin/private-site.spec.js
similarity index 100%
rename from ghost/core/test/e2e-browser/site-settings/private-site.spec.js
rename to ghost/core/test/e2e-browser/admin/private-site.spec.js