Prepare for switch to testcontainers in playwright (#28880)

* Remove access to homeserver.config.baseUrl field in favour of homeserver.baseUrl Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Use sane default_server_config and specify server.invalid in the specific tests which demand it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * break cycle Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * typo Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-01-07 09:21:07 +00:00
parent 1e758cacae
commit a73faffe37
22 changed files with 102 additions and 88 deletions
@@ -19,9 +19,9 @@ test.describe("Complete security", () => {
        homeserver,
        credentials,
    }) => {
-        await logIntoElement(page, homeserver, credentials);
+        await logIntoElement(page, credentials);
        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`.
 });
@@ -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");
@@ -17,11 +17,9 @@ const test = base.extend<Fixtures>({
    startHomeserverOpts: async ({}, use) => {
        await use("dehydration");
    },
-    config: async ({ homeserver, context }, use) => {
+    config: async ({ config, context }, use) => {
        const wellKnown = {
-            "m.homeserver": {
-                base_url: homeserver.config.baseUrl,
-            },
+            ...config.default_server_config,
            "org.matrix.msc3814": true,
        };

@@ -29,9 +27,7 @@ const test = base.extend<Fixtures>({
            await route.fulfill({ json: wellKnown });
        });

-        await use({
-            default_server_config: wellKnown,
-        });
+        await use(config);
    },
 });

@@ -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");
@@ -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);
@@ -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 }) => {
@@ -138,22 +138,9 @@ export async function checkDeviceIsConnectedKeyBackup(
 *
 * If a `securityKey` is given, verifies the new device using the key.
 */
-export async function logIntoElement(
-    page: Page,
-    homeserver: HomeserverInstance,
-    credentials: Credentials,
-    securityKey?: string,
-) {
+export async function logIntoElement(page: Page, 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.config.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();