diff --git a/cypress/e2e/user-menu/user-menu.spec.ts b/cypress/e2e/user-menu/user-menu.spec.ts deleted file mode 100644 index 52bb67c0b7..0000000000 --- a/cypress/e2e/user-menu/user-menu.spec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2022 The Matrix.org Foundation C.I.C. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -/// - -import { HomeserverInstance } from "../../plugins/utils/homeserver"; -import type { UserCredentials } from "../../support/login"; - -describe("User Menu", () => { - let homeserver: HomeserverInstance; - let user: UserCredentials; - - const USER_NAME = "Jeff"; - - beforeEach(() => { - cy.startHomeserver("default").then((data) => { - homeserver = data; - - cy.initTestUser(homeserver, USER_NAME).then((credentials) => { - user = credentials; - }); - }); - }); - - afterEach(() => { - cy.stopHomeserver(homeserver); - }); - - it("should contain our name & userId", () => { - cy.findByRole("button", { name: "User menu" }).click(); - - cy.get(".mx_UserMenu_contextMenu").within(() => { - cy.get(".mx_UserMenu_contextMenu_displayName").within(() => { - cy.findByText(USER_NAME).should("exist"); - }); - - cy.get(".mx_UserMenu_contextMenu_userId").within(() => { - cy.findByText(user.userId).should("exist"); - }); - }); - }); -}); diff --git a/playwright/e2e/user-menu/user-menu.spec.ts b/playwright/e2e/user-menu/user-menu.spec.ts new file mode 100644 index 0000000000..d727ae7b12 --- /dev/null +++ b/playwright/e2e/user-menu/user-menu.spec.ts @@ -0,0 +1,29 @@ +/* +Copyright 2022 The Matrix.org Foundation C.I.C. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import { test, expect } from "../../element-web-test"; + +test.describe("User Menu", () => { + test.use({ displayName: "Jeff" }); + + test("should contain our name & userId", async ({ page, user }) => { + await page.getByRole("button", { name: "User menu", exact: true }).click(); + const menu = page.getByRole("menu"); + + await expect(menu.locator(".mx_UserMenu_contextMenu_displayName", { hasText: user.displayName })).toBeVisible(); + await expect(menu.locator(".mx_UserMenu_contextMenu_userId", { hasText: user.userId })).toBeVisible(); + }); +});