diff --git a/docker-compose-playwright.yml b/docker-compose-playwright.yml index d517a4a93..39671ff9f 100644 --- a/docker-compose-playwright.yml +++ b/docker-compose-playwright.yml @@ -13,7 +13,7 @@ services: - ./backend/playwright_homeserver-othersite.yaml:/data/cfg/homeserver.yaml:Z element-web: # Pin to a SHA so that upstream cannot break our tests. Renovate handles regular updates. - image: ghcr.io/element-hq/element-web:develop@sha256:365eca844f0782676f2406e5107e2f74fae2ecdb1725cc42060a91681aeee4c4 + image: ghcr.io/element-hq/element-web:develop@sha256:d1841828a390d96da2ee64232949db641f11766fb506ec561374819d10533b9a element-web-1: # Pin to a SHA so that upstream cannot break our tests. Renovate handles regular updates. - image: ghcr.io/element-hq/element-web:develop@sha256:365eca844f0782676f2406e5107e2f74fae2ecdb1725cc42060a91681aeee4c4 + image: ghcr.io/element-hq/element-web:develop@sha256:d1841828a390d96da2ee64232949db641f11766fb506ec561374819d10533b9a diff --git a/playwright/widget/test-helpers.ts b/playwright/widget/test-helpers.ts index 3f0bbeed4..299faf578 100644 --- a/playwright/widget/test-helpers.ts +++ b/playwright/widget/test-helpers.ts @@ -73,9 +73,6 @@ export class TestHelpers { audioOnly: boolean = false, isDM: boolean = false, ): Promise { - // XXX This using the notification toast to join the room. - // Not the button in the header - await page.waitForTimeout(3000); const label = isDM ? audioOnly @@ -85,7 +82,9 @@ export class TestHelpers { await expect(page.getByText(label)).toBeVisible({ timeout: 10000, }); - await page.getByRole("button", { name: "Join" }).click({ + // XXX This using the notification toast to join the room. + // Not the buttons in the header or timeline + await page.getByRole("alert").getByRole("button", { name: "Join" }).click({ timeout: 5000, }); } diff --git a/playwright/widget/voice-call-dm.spec.ts b/playwright/widget/voice-call-dm.spec.ts index a17f380fc..d2f20ac2d 100644 --- a/playwright/widget/voice-call-dm.spec.ts +++ b/playwright/widget/voice-call-dm.spec.ts @@ -39,7 +39,10 @@ widgetTest( ).toBeVisible(); await expect(whistler.page.getByText("Incoming voice call")).toBeVisible(); - await whistler.page.getByRole("button", { name: "Join" }).click(); + await whistler.page + .getByRole("alert") + .getByRole("button", { name: "Join" }) + .click(); await expect( whistler.page.locator('iframe[title="Element Call"]'), @@ -129,7 +132,10 @@ widgetTest( ).toBeVisible(); await expect(whistler.page.getByText("Incoming video call")).toBeVisible(); - await whistler.page.getByRole("button", { name: "Join" }).click(); + await whistler.page + .getByRole("alert") + .getByRole("button", { name: "Join" }) + .click(); await expect( whistler.page.locator('iframe[title="Element Call"]'),