From f6ea850027c316e8692dbd3414058981ce67d1a8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2025 16:05:47 +0000
Subject: [PATCH 1/4] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 playwright/e2e/crypto/complete-security.spec.ts | 9 ---------
 playwright/e2e/register/email.spec.ts           | 2 +-
 playwright/e2e/register/register.spec.ts        | 9 +++++++++
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/playwright/e2e/crypto/complete-security.spec.ts b/playwright/e2e/crypto/complete-security.spec.ts
index 9d85f85356..0f60e17230 100644
--- a/playwright/e2e/crypto/complete-security.spec.ts
+++ b/playwright/e2e/crypto/complete-security.spec.ts
@@ -12,15 +12,6 @@ import { logIntoElement } from "./utils";
 test.describe("Complete security", () => {
     test.use({
         displayName: "Jeff",
-        config: {
-            // The only thing that we really *need* (otherwise Element refuses to load) is a default homeserver.
-            // We point that to a guaranteed-invalid domain.
-            default_server_config: {
-                "m.homeserver": {
-                    base_url: "https://server.invalid",
-                },
-            },
-        },
     });
 
     test("should go straight to the welcome screen if we have no signed device", async ({
diff --git a/playwright/e2e/register/email.spec.ts b/playwright/e2e/register/email.spec.ts
index 7a77924721..58e68c958e 100644
--- a/playwright/e2e/register/email.spec.ts
+++ b/playwright/e2e/register/email.spec.ts
@@ -33,7 +33,7 @@ test.describe("Email Registration", async () => {
             }),
     });
 
-    test.beforeEach(async ({ page }) => {
+    test.beforeEach(async ({ homeserver, page }) => {
         await page.goto("/#/register");
     });
 
diff --git a/playwright/e2e/register/register.spec.ts b/playwright/e2e/register/register.spec.ts
index c1b70de694..3aea1b2d5c 100644
--- a/playwright/e2e/register/register.spec.ts
+++ b/playwright/e2e/register/register.spec.ts
@@ -11,6 +11,15 @@ import { test, expect } from "../../element-web-test";
 test.describe("Registration", () => {
     test.use({
         startHomeserverOpts: "consent",
+        config: {
+            // The only thing that we really *need* (otherwise Element refuses to load) is a default homeserver.
+            // We point that to a guaranteed-invalid domain.
+            default_server_config: {
+                "m.homeserver": {
+                    base_url: "https://server.invalid",
+                },
+            },
+        },
     });
 
     test.beforeEach(async ({ page }) => {

From b2fb036f6288f2a8a39d6b6032a0f744684965ac Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2025 16:06:02 +0000
Subject: [PATCH 2/4] typo

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 playwright/e2e/crypto/complete-security.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playwright/e2e/crypto/complete-security.spec.ts b/playwright/e2e/crypto/complete-security.spec.ts
index 0f60e17230..da6974459c 100644
--- a/playwright/e2e/crypto/complete-security.spec.ts
+++ b/playwright/e2e/crypto/complete-security.spec.ts
@@ -23,5 +23,5 @@ test.describe("Complete security", () => {
         await expect(page.getByText("Welcome Jeff", { exact: true })).toBeVisible();
     });
 
-    // see also "Verify device during login with SAS" in `verifiction.spec.ts`.
+    // see also "Verify device during login with SAS" in `verification.spec.ts`.
 });

From 1368dc05642cd997b2a0e8c94009d8262f3c7f2b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2025 16:51:26 +0000
Subject: [PATCH 3/4] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 playwright/element-web-test.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/playwright/element-web-test.ts b/playwright/element-web-test.ts
index 39dc538861..e0d489f385 100644
--- a/playwright/element-web-test.ts
+++ b/playwright/element-web-test.ts
@@ -128,12 +128,13 @@ export const test = base.extend<Fixtures>({
         await context.route(`http://localhost:8080/config.json*`, async (route) => {
             const json = {
                 ...CONFIG_JSON,
+                ...config,
                 default_server_config: {
+                    ...config.default_server_config,
                     "m.homeserver": {
                         base_url: homeserver.baseUrl,
                     },
                 },
-                ...config,
             };
             json["features"] = {
                 ...json["features"],

From 27652d0620ff4c16443aef58297354698f720577 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2025 17:23:35 +0000
Subject: [PATCH 4/4] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 playwright/element-web-test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playwright/element-web-test.ts b/playwright/element-web-test.ts
index e0d489f385..be84fbe145 100644
--- a/playwright/element-web-test.ts
+++ b/playwright/element-web-test.ts
@@ -130,10 +130,10 @@ export const test = base.extend<Fixtures>({
                 ...CONFIG_JSON,
                 ...config,
                 default_server_config: {
-                    ...config.default_server_config,
                     "m.homeserver": {
                         base_url: homeserver.baseUrl,
                     },
+                    ...config.default_server_config,
                 },
             };
             json["features"] = {