Use sane default_server_config and specify server.invalid in the specific tests which demand it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

playwright/e2e/app-loading/guest-registration.spec.ts

@@ -14,13 +14,6 @@ import { expect, test } from "../../element-web-test";
 
 test.use({
     startHomeserverOpts: "guest-enabled",
-    config: async ({ homeserver }, use) => {
-        await use({
-            default_server_config: {
-                "m.homeserver": { base_url: homeserver.baseUrl },
-            },
-        });
-    },
 });
 
 test("Shows the welcome page by default", async ({ page }) => {

playwright/e2e/crypto/complete-security.spec.ts

@@ -12,6 +12,15 @@ 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 ({
@@ -19,7 +28,7 @@ test.describe("Complete security", () => {
         homeserver,
         credentials,
     }) => {
-        await logIntoElement(page, homeserver, credentials);
+        await logIntoElement(page, credentials);
         await expect(page.getByText("Welcome Jeff", { exact: true })).toBeVisible();
     });
 

playwright/e2e/crypto/decryption-failure-messages.spec.ts

@@ -45,7 +45,7 @@ test.describe("Cryptography", function () {
             await logOutOfElement(page, true);
 
             // Log in again, and see how the message looks.
-            await logIntoElement(page, homeserver, credentials);
+            await logIntoElement(page, credentials);
             await app.viewRoomByName("Test room");
             const lastTile = page.locator(".mx_EventTile").last();
             await expect(lastTile).toContainText("Historical messages are not available on this device");
@@ -62,7 +62,7 @@ test.describe("Cryptography", function () {
 
             // Finally, log out again, and back in, skipping verification for now, and see what we see.
             await logOutOfElement(page);
-            await logIntoElement(page, homeserver, credentials);
+            await logIntoElement(page, credentials);
             await page.locator(".mx_AuthPage").getByRole("button", { name: "Skip verification for now" }).click();
             await page.locator(".mx_AuthPage").getByRole("button", { name: "I'll verify later" }).click();
             await app.viewRoomByName("Test room");

playwright/e2e/crypto/dehydration.spec.ts

@@ -17,11 +17,9 @@ const test = base.extend<Fixtures>({
     startHomeserverOpts: async ({}, use) => {
         await use("dehydration");
     },
-    config: async ({ homeserver, context }, use) => {
+    context: async ({ config, context }, use) => {
         const wellKnown = {
-            "m.homeserver": {
+            ...config.default_server_config,
-                base_url: homeserver.baseUrl,
-            },
             "org.matrix.msc3814": true,
         };
 
@@ -29,9 +27,7 @@ const test = base.extend<Fixtures>({
             await route.fulfill({ json: wellKnown });
         });
 
-        await use({
+        await use(context);
-            default_server_config: wellKnown,
-        });
     },
 });
 

playwright/e2e/crypto/device-verification.spec.ts

@@ -66,7 +66,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
     }
 
     test("Verify device with SAS during login", async ({ page, app, credentials, homeserver }) => {
-        await logIntoElement(page, homeserver, credentials);
+        await logIntoElement(page, credentials);
 
         // Launch the verification request between alice and the bot
         const verificationRequest = await initiateAliceVerificationRequest(page);
@@ -93,7 +93,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
 
     test("Verify device with QR code during login", async ({ page, app, credentials, homeserver }) => {
         // A mode 0x02 verification: "self-verifying in which the current device does not yet trust the master key"
-        await logIntoElement(page, homeserver, credentials);
+        await logIntoElement(page, credentials);
 
         // Launch the verification request between alice and the bot
         const verificationRequest = await initiateAliceVerificationRequest(page);
@@ -137,7 +137,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
     });
 
     test("Verify device with Security Phrase during login", async ({ page, app, credentials, homeserver }) => {
-        await logIntoElement(page, homeserver, credentials);
+        await logIntoElement(page, credentials);
 
         // Select the security phrase
         await page.locator(".mx_AuthPage").getByRole("button", { name: "Verify with Security Key or Phrase" }).click();
@@ -158,7 +158,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
     });
 
     test("Verify device with Security Key during login", async ({ page, app, credentials, homeserver }) => {
-        await logIntoElement(page, homeserver, credentials);
+        await logIntoElement(page, credentials);
 
         // Select the security phrase
         await page.locator(".mx_AuthPage").getByRole("button", { name: "Verify with Security Key or Phrase" }).click();
@@ -181,7 +181,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
     });
 
     test("Handle incoming verification request with SAS", async ({ page, credentials, homeserver, toasts }) => {
-        await logIntoElement(page, homeserver, credentials);
+        await logIntoElement(page, credentials);
 
         /* Dismiss "Verify this device" */
         const authPage = page.locator(".mx_AuthPage");

playwright/e2e/crypto/event-shields.spec.ts

@@ -207,7 +207,7 @@ test.describe("Cryptography", function () {
                 window.localStorage.clear();
             });
             await page.reload();
-            await logIntoElement(page, homeserver, aliceCredentials, securityKey);
+            await logIntoElement(page, aliceCredentials, securityKey);
 
             /* go back to the test room and find Bob's message again */
             await app.viewRoomById(testRoomId);

playwright/e2e/crypto/logout.spec.ts

@@ -11,7 +11,7 @@ import { createRoom, enableKeyBackup, logIntoElement, sendMessageInCurrentRoom }
 
 test.describe("Logout tests", () => {
     test.beforeEach(async ({ page, homeserver, credentials }) => {
-        await logIntoElement(page, homeserver, credentials);
+        await logIntoElement(page, credentials);
     });
 
     test("Ask to set up recovery on logout if not setup", async ({ page, app }) => {

playwright/e2e/crypto/utils.ts

@@ -138,22 +138,9 @@ export async function checkDeviceIsConnectedKeyBackup(
  *
  * If a `securityKey` is given, verifies the new device using the key.
  */
-export async function logIntoElement(
+export async function logIntoElement(page: Page, credentials: Credentials, securityKey?: string) {
-    page: Page,
-    homeserver: HomeserverInstance,
-    credentials: Credentials,
-    securityKey?: string,
-) {
     await page.goto("/#/login");
 
-    // select homeserver
-    await page.getByRole("button", { name: "Edit" }).click();
-    await page.getByRole("textbox", { name: "Other homeserver" }).fill(homeserver.baseUrl);
-    await page.getByRole("button", { name: "Continue", exact: true }).click();
-
-    // wait for the dialog to go away
-    await expect(page.locator(".mx_ServerPickerDialog")).not.toBeVisible();
-
     await page.getByRole("textbox", { name: "Username" }).fill(credentials.userId);
     await page.getByPlaceholder("Password").fill(credentials.password);
     await page.getByRole("button", { name: "Sign in" }).click();

playwright/e2e/forgot-password/forgot-password.spec.ts

@@ -16,6 +16,15 @@ const email = "user@nowhere.dummy";
 
 test.describe("Forgot Password", () => {
     test.use({
+        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",
+                },
+            },
+        },
         startHomeserverOpts: ({ mailhog }, use) =>
             use({
                 template: "email",

playwright/e2e/login/login.spec.ts

@@ -78,6 +78,18 @@ async function login(page: Page, homeserver: HomeserverInstance) {
 }
 
 test.describe("Login", () => {
+    test.use({
+        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.describe("Password login", () => {
         test.use({ startHomeserverOpts: "consent" });
 

playwright/e2e/login/overwrite_login.spec.ts

@@ -13,7 +13,7 @@ test.describe("Overwrite login action", () => {
     // This seems terminally flakey: https://github.com/element-hq/element-web/issues/27363
     // I tried verious things to try & deflake it, to no avail: https://github.com/matrix-org/matrix-react-sdk/pull/12506
     test.skip("Try replace existing login with new one", async ({ page, app, credentials, homeserver }) => {
-        await logIntoElement(page, homeserver, credentials);
+        await logIntoElement(page, credentials);
 
         const userMenu = await app.openUserMenu();
         await expect(userMenu.getByText(credentials.userId)).toBeVisible();

playwright/e2e/login/soft_logout.spec.ts

@@ -16,6 +16,15 @@ import { isDendrite } from "../../plugins/homeserver/dendrite";
 test.describe("Soft logout", () => {
     test.use({
         displayName: "Alice",
+        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",
+                },
+            },
+        },
         startHomeserverOpts: ({ oAuthServer }, use) =>
             use({
                 template: "default",

playwright/e2e/oidc/index.ts

@@ -40,12 +40,10 @@ export const test = base.extend<{
             },
         });
     },
-    config: async ({ homeserver, startHomeserverOpts, context }, use) => {
+    context: async ({ config, startHomeserverOpts, context }, use) => {
         const issuer = `http://localhost:${(startHomeserverOpts as StartHomeserverOpts).variables["MAS_PORT"]}/`;
         const wellKnown = {
-            "m.homeserver": {
+            ...config.default_server_config,
-                base_url: homeserver.baseUrl,
-            },
             "org.matrix.msc2965.authentication": {
                 issuer,
                 account: `${issuer}account`,
@@ -57,9 +55,7 @@ export const test = base.extend<{
             await route.fulfill({ json: wellKnown });
         });
 
-        await use({
+        await use(context);
-            default_server_config: wellKnown,
-        });
     },
 });
 

playwright/e2e/register/email.spec.ts

@@ -21,12 +21,11 @@ test.describe("Email Registration", async () => {
                     SMTP_PORT: mailhog.instance.smtpPort,
                 },
             }),
-        config: ({ homeserver }, use) =>
+        config: ({ config }, use) =>
             use({
+                ...config,
                 default_server_config: {
-                    "m.homeserver": {
+                    ...config.default_server_config,
-                        base_url: homeserver.baseUrl,
-                    },
                     "m.identity_server": {
                         base_url: "https://server.invalid",
                     },

playwright/element-web-test.ts

@@ -29,18 +29,8 @@ import { Webserver } from "./plugins/webserver";
 // See https://playwright.dev/docs/service-workers-experimental#how-to-enable
 process.env["PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS"] = "1";
 
+// This is deliberately quite a minimal config.json, so that we can test that the default settings actually work.
 const CONFIG_JSON: Partial<IConfigOptions> = {
-    // This is deliberately quite a minimal config.json, so that we can test that the default settings
-    // actually work.
-    //
-    // 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",
-        },
-    },
-
     // The default language is set here for test consistency
     setting_defaults: {
         language: "en-GB",
@@ -133,10 +123,18 @@ export const test = base.extend<Fixtures>({
         );
         await use(context);
     },
-    config: CONFIG_JSON,
+    config: {}, // We merge this atop the default CONFIG_JSON in the page fixture to make extending it easier
-    page: async ({ context, page, config, labsFlags }, use) => {
+    page: async ({ homeserver, context, page, config, labsFlags }, use) => {
         await context.route(`http://localhost:8080/config.json*`, async (route) => {
-            const json = { ...CONFIG_JSON, ...config };
+            const json = {
+                ...CONFIG_JSON,
+                default_server_config: {
+                    "m.homeserver": {
+                        base_url: homeserver.baseUrl,
+                    },
+                },
+                ...config,
+            };
             json["features"] = {
                 ...json["features"],
                 // Enable the lab features