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

Change all toast rejection code to use the rejectToast utility (#33025)

Browse Source
This commit is contained in:
Andy Balaam
2026-05-18 16:31:52 +00:00
committed by GitHub
parent d40fe81616
commit 5be0b778db
29 changed files with 150 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/playwright/e2e/room/create-room.spec.ts
+8 -7
View File
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
*/
import { type Page } from "@playwright/test";
import { rejectToast } from "@element-hq/element-web-playwright-common";
import { SettingLevel } from "../../../src/settings/SettingLevel";
import { UIFeature } from "../../../src/settings/UIFeature";
@@ -22,7 +23,7 @@ test.describe("Create Room", () => {
"should create a public room with name, topic & address set",
{ tag: "@screenshot" },
async ({ page, user, app, axe }) => {
await app.closeVerifyToast();
await rejectToast(page, "Verify this device");
const dialog = await app.openCreateRoomDialog();
// Fill name & topic
await dialog.getByRole("textbox", { name: "Name" }).fill(name);
@@ -51,7 +52,7 @@ test.describe("Create Room", () => {
);
test("should allow us to start a chat and show encryption state", async ({ page, user, app }) => {
await app.closeVerifyToast();
await rejectToast(page, "Verify this device");
await page.getByRole("button", { name: "New conversation", exact: true }).click();
await page.getByRole("menuitem", { name: "Start chat" }).click();
@@ -72,7 +73,7 @@ test.describe("Create Room", () => {
test("should create a video room", { tag: "@screenshot" }, async ({ page, user, app }) => {
await app.settings.setValue("feature_video_rooms", null, SettingLevel.DEVICE, true);
await app.closeVerifyToast();
await rejectToast(page, "Verify this device");
const dialog = await app.openCreateRoomDialog("New video room");
// Fill name & topic
@@ -107,7 +108,7 @@ test.describe("Create Room", () => {
});
test("should disallow creating public rooms", { tag: "@screenshot" }, async ({ page, user, app, axe }) => {
await app.closeVerifyToast();
await rejectToast(page, "Verify this device");
const dialog = await app.openCreateRoomDialog();
// Fill name & topic
await dialog.getByRole("textbox", { name: "Name" }).fill(name);
@@ -134,7 +135,7 @@ test.describe("Create Room", () => {
test.use({ labsFlags: [] });
test("creates a room without encrypted state", { tag: "@screenshot" }, async ({ page, user: _user, app }) => {
await app.closeVerifyToast();
await rejectToast(page, "Verify this device");
// When we start to create a room
await page.getByRole("button", { name: "New conversation", exact: true }).click();
@@ -165,7 +166,7 @@ test.describe("Create Room", () => {
"creates a room with encrypted state if we check the box",
{ tag: "@screenshot" },
async ({ page, user: _user, app }) => {
await app.closeVerifyToast();
await rejectToast(page, "Verify this device");
// Given we check the Encrypted State checkbox
await page.getByRole("button", { name: "New conversation", exact: true }).click();
@@ -194,7 +195,7 @@ test.describe("Create Room", () => {
"creates a room without encrypted state if we don't check the box",
{ tag: "@screenshot" },
async ({ page, user: _user, app }) => {
await app.closeVerifyToast();
await rejectToast(page, "Verify this device");
// Given we did not check the Encrypted State checkbox
await page.getByRole("button", { name: "New conversation", exact: true }).click();
apps/web/playwright/e2e/room/room-status-bar.spec.ts
+5 -5
View File
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
import { getToast } from "@element-hq/element-web-playwright-common";
import { getToast, rejectToast } from "@element-hq/element-web-playwright-common";
import { test, expect } from "../../element-web-test";
@@ -17,12 +17,12 @@ test.describe("Room Status Bar", () => {
await page.setViewportSize({ width: 1400, height: 768 });
await use(page);
},
room: async ({ app, user }, use) => {
room: async ({ app, user, page }, use) => {
const roomId = await app.client.createRoom({
name: "A room",
});
await app.closeVerifyToast();
await app.closeNotificationToast();
await rejectToast(page, "Verify this device");
await rejectToast(page, "Notifications");
await app.viewRoomById(roomId);
await use({ roomId });
},
@@ -142,7 +142,7 @@ test.describe("Room Status Bar", () => {
"should show an error when creating a local room fails",
{ tag: "@screenshot" },
async ({ page, app, user, bot }) => {
await app.closeVerifyToast();
await rejectToast(page, "Verify this device");
await page
.getByRole("navigation", { name: "Room list" })
.getByRole("button", { name: "New conversation" })