From 5cd7743fcb2f966af56bc4286259462fc2085794 Mon Sep 17 00:00:00 2001 From: Andy Balaam Date: Mon, 18 Mar 2024 16:32:36 +0000 Subject: [PATCH] Remove use of KnownMembership from playwright tests --- playwright/e2e/crypto/crypto.spec.ts | 4 +--- playwright/e2e/crypto/verification.spec.ts | 3 +-- playwright/e2e/knock/knock-into-room.spec.ts | 11 +++++------ playwright/e2e/knock/manage-knocks.spec.ts | 6 ++---- playwright/pages/bot.ts | 3 +-- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/playwright/e2e/crypto/crypto.spec.ts b/playwright/e2e/crypto/crypto.spec.ts index 515cddbc1b..d917a40839 100644 --- a/playwright/e2e/crypto/crypto.spec.ts +++ b/playwright/e2e/crypto/crypto.spec.ts @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { KnownMembership } from "matrix-js-sdk/src/types"; - import type { Page } from "@playwright/test"; import { test, expect } from "../../element-web-test"; import { @@ -89,7 +87,7 @@ const bobJoin = async (page: Page, bob: Bot) => { async function autoJoin(client: Client) { await client.evaluate((cli) => { cli.on(window.matrixcs.RoomMemberEvent.Membership, (event, member) => { - if (member.membership === KnownMembership.Invite && member.userId === cli.getUserId()) { + if (member.membership === "invite" && member.userId === cli.getUserId()) { cli.joinRoom(member.roomId); } }); diff --git a/playwright/e2e/crypto/verification.spec.ts b/playwright/e2e/crypto/verification.spec.ts index 0c8047f4a1..6819606b64 100644 --- a/playwright/e2e/crypto/verification.spec.ts +++ b/playwright/e2e/crypto/verification.spec.ts @@ -16,7 +16,6 @@ limitations under the License. import jsQR from "jsqr"; import { type Preset, type Visibility } from "matrix-js-sdk/src/matrix"; -import { KnownMembership } from "matrix-js-sdk/src/types"; import type { JSHandle, Locator, Page } from "@playwright/test"; import type { VerificationRequest, Verifier } from "matrix-js-sdk/src/crypto-api"; @@ -263,7 +262,7 @@ test.describe("User verification", () => { const bobVerificationRequest = await bob.evaluateHandle( async (client, { dmRoomId, aliceCredentials }) => { const room = client.getRoom(dmRoomId); - while (room.getMember(aliceCredentials.userId)?.membership !== KnownMembership.Join) { + while (room.getMember(aliceCredentials.userId)?.membership !== "join") { await new Promise((resolve) => { room.once(window.matrixcs.RoomStateEvent.Members, resolve); }); diff --git a/playwright/e2e/knock/knock-into-room.spec.ts b/playwright/e2e/knock/knock-into-room.spec.ts index ac552ede2f..5ee366fcf2 100644 --- a/playwright/e2e/knock/knock-into-room.spec.ts +++ b/playwright/e2e/knock/knock-into-room.spec.ts @@ -17,7 +17,6 @@ limitations under the License. */ import { type Visibility } from "matrix-js-sdk/src/matrix"; -import { KnownMembership } from "matrix-js-sdk/src/types"; import { test, expect } from "../../element-web-test"; import { waitForRoom } from "../utils"; @@ -75,7 +74,7 @@ test.describe("Knock Into Room", () => { return events.some( (e) => e.getType() === "m.room.member" && - e.getContent()?.membership === KnownMembership.Knock && + e.getContent()?.membership === "knock" && e.getContent()?.displayname === "Alice", ); }); @@ -110,7 +109,7 @@ test.describe("Knock Into Room", () => { return events.some( (e) => e.getType() === "m.room.member" && - e.getContent()?.membership === KnownMembership.Knock && + e.getContent()?.membership === "knock" && e.getContent()?.displayname === "Alice", ); }); @@ -152,7 +151,7 @@ test.describe("Knock Into Room", () => { return events.some( (e) => e.getType() === "m.room.member" && - e.getContent()?.membership === KnownMembership.Knock && + e.getContent()?.membership === "knock" && e.getContent()?.displayname === "Alice", ); }); @@ -194,7 +193,7 @@ test.describe("Knock Into Room", () => { return events.some( (e) => e.getType() === "m.room.member" && - e.getContent()?.membership === KnownMembership.Knock && + e.getContent()?.membership === "knock" && e.getContent()?.displayname === "Alice", ); }); @@ -260,7 +259,7 @@ test.describe("Knock Into Room", () => { return events.some( (e) => e.getType() === "m.room.member" && - e.getContent()?.membership === KnownMembership.Knock && + e.getContent()?.membership === "knock" && e.getContent()?.displayname === "Alice", ); }); diff --git a/playwright/e2e/knock/manage-knocks.spec.ts b/playwright/e2e/knock/manage-knocks.spec.ts index d1bf7ee92b..3fb5c68551 100644 --- a/playwright/e2e/knock/manage-knocks.spec.ts +++ b/playwright/e2e/knock/manage-knocks.spec.ts @@ -16,8 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { KnownMembership } from "matrix-js-sdk/src/types"; - import { test, expect } from "../../element-web-test"; import { waitForRoom } from "../utils"; @@ -75,7 +73,7 @@ test.describe("Manage Knocks", () => { return events.some( (e) => e.getType() === "m.room.member" && - e.getContent()?.membership === KnownMembership.Leave && + e.getContent()?.membership === "leave" && e.getContent()?.displayname === "Bob", ); }); @@ -112,7 +110,7 @@ test.describe("Manage Knocks", () => { return events.some( (e) => e.getType() === "m.room.member" && - e.getContent()?.membership === KnownMembership.Leave && + e.getContent()?.membership === "leave" && e.getContent()?.displayname === "Bob", ); }); diff --git a/playwright/pages/bot.ts b/playwright/pages/bot.ts index d9fbc717bb..333d895dfe 100644 --- a/playwright/pages/bot.ts +++ b/playwright/pages/bot.ts @@ -17,7 +17,6 @@ limitations under the License. import { JSHandle, Page } from "@playwright/test"; import { uniqueId } from "lodash"; import { type MatrixClient } from "matrix-js-sdk/src/matrix"; -import { KnownMembership } from "matrix-js-sdk/src/types"; import type { Logger } from "matrix-js-sdk/src/logger"; import type { SecretStorageKeyDescription } from "matrix-js-sdk/src/secret-storage"; @@ -179,7 +178,7 @@ export class Bot extends Client { if (opts.autoAcceptInvites) { cli.on(window.matrixcs.RoomMemberEvent.Membership, (event, member) => { - if (member.membership === KnownMembership.Invite && member.userId === cli.getUserId()) { + if (member.membership === "invite" && member.userId === cli.getUserId()) { cli.joinRoom(member.roomId); } });