diff --git a/playwright/e2e/crypto/complete-security.spec.ts b/playwright/e2e/crypto/complete-security.spec.ts index 9d85f85356..da6974459c 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 ({ @@ -32,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`. }); diff --git a/playwright/e2e/register/email.spec.ts b/playwright/e2e/register/email.spec.ts index 01c8f03487..3ed17b69d0 100644 --- a/playwright/e2e/register/email.spec.ts +++ b/playwright/e2e/register/email.spec.ts @@ -26,7 +26,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 58c6c27dd9..7756fe53c5 100644 --- a/playwright/e2e/register/register.spec.ts +++ b/playwright/e2e/register/register.spec.ts @@ -11,6 +11,17 @@ import { consentHomeserver } from "../../plugins/homeserver/synapse/consentHomes test.describe("Registration", () => { test.use(consentHomeserver); + 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.beforeEach(async ({ page }) => { await page.goto("/#/register"); diff --git a/playwright/element-web-test.ts b/playwright/element-web-test.ts index a56114b96e..f2f2afd3b9 100644 --- a/playwright/element-web-test.ts +++ b/playwright/element-web-test.ts @@ -115,12 +115,13 @@ export const test = base.extend({ await context.route(`http://localhost:8080/config.json*`, async (route) => { const json = { ...CONFIG_JSON, + ...config, default_server_config: { "m.homeserver": { base_url: homeserver.baseUrl, }, + ...config.default_server_config, }, - ...config, }; json["features"] = { ...json["features"],