sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Go to welcome on logout (#33306)

Browse Source 
* Go to welcome on logout

Instead of login, for QR login project

* Update tests

* Add tests

* Delint

* Update comments
This commit is contained in:
Michael Telatynski
2026-04-28 10:24:47 +00:00
committed by GitHub
parent c363d2eb82
commit 5f770bfe4c
8 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/playwright/e2e/crypto/logout.spec.ts
+1 -1
View File
@@ -57,6 +57,6 @@ test.describe("Logout tests", () => {
await locator.getByRole("menuitem", { name: "Remove this device", exact: true }).click();
// Should have logged out directly
await expect(page.getByRole("heading", { name: "Sign in" })).toBeVisible();
await expect(page.getByRole("heading", { name: "Be in your element" })).toBeVisible();
});
});
apps/web/playwright/e2e/crypto/utils.ts
+3 -3
View File
@@ -245,7 +245,7 @@ export async function logIntoElementAndVerify(page: Page, credentials: Credentia
}
/**
* Click the "sign out" option in Element, and wait for the login page to load
* Click the "sign out" option in Element, and wait for the welcome page to load
*
* @param page - Playwright `Page` object.
* @param discardKeys - if true, expect a "You'll lose access to your encrypted messages" dialog, and dismiss it.
@@ -259,8 +259,8 @@ export async function logOutOfElement(page: Page, discardKeys: boolean = false)
await page.locator(".mx_Dialog .mx_QuestionDialog").getByRole("button", { name: "Remove this device" }).click();
}
// Wait for the login page to load
await page.getByRole("heading", { name: "Sign in" }).click();
// Wait for the welcome page to load
await expect(page.getByRole("heading", { name: "Be in your element" })).toBeVisible();
}
/**
apps/web/playwright/e2e/login/login-consent.spec.ts
+2 -2
View File
@@ -334,7 +334,7 @@ test.describe("Login", () => {
});
test.describe("logout", () => {
test("should go to login page on logout", async ({ page, user }) => {
test("should go to welcome page on logout", async ({ page, user }) => {
await page.getByRole("button", { name: "User menu" }).click();
await expect(page.getByText(user.displayName, { exact: true })).toBeVisible();
@@ -345,7 +345,7 @@ test.describe("Login", () => {
.locator(".mx_UserMenu_contextMenu")
.getByRole("menuitem", { name: "Remove this device" })
.click();
await expect(page).toHaveURL(/\/#\/login$/);
await expect(page).toHaveURL(/\/#\/welcome$/);
});
});
});
apps/web/playwright/e2e/oidc/oidc-native.spec.ts
+3 -3
View File
@@ -123,7 +123,7 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
// Allow the outstanding requests queue to settle before logging out
await page.waitForTimeout(2000);
await page.locator(".mx_UserMenu_contextMenu").getByRole("menuitem", { name: "Remove this device" }).click();
await expect(page).toHaveURL(/\/#\/login$/);
await expect(page).toHaveURL(/\/#\/welcome$/);
// Log in again
await page.goto("/#/login");
@@ -159,7 +159,7 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
.locator(".mx_UserMenu_contextMenu")
.getByRole("menuitem", { name: "Remove this device" })
.click();
await expect(page).toHaveURL(/\/#\/login$/);
await expect(page).toHaveURL(/\/#\/welcome$/);
// Log in again
await page.goto("/#/login");
@@ -209,7 +209,7 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
.locator(".mx_UserMenu_contextMenu")
.getByRole("menuitem", { name: "Remove this device" })
.click();
await expect(page).toHaveURL(/\/#\/login$/);
await expect(page).toHaveURL(/\/#\/welcome$/);
// Log in again
await page.goto("/#/login");