imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt Membership usage for the change to an enum KnownMembership

Browse source
This commit is contained in:
Andy Balaam 2024-03-12 14:52:54 +00:00
parent da99bad7b9
commit 34559d2a89
115 changed files with 764 additions and 593 deletions
Download patch file Download diff file Expand all files Collapse all files

4
playwright/e2e/crypto/crypto.spec.ts
View file

@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { KnownMembership } from "matrix-js-sdk/src/matrix";
import type { Page } from "@playwright/test";
import { test, expect } from "../../element-web-test";
import {
@ -87,7 +89,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 === Membership.Invite && member.userId === cli.getUserId()) {
if (member.membership === KnownMembership.Invite && member.userId === cli.getUserId()) {
cli.joinRoom(member.roomId);
}
});

4
playwright/e2e/crypto/verification.spec.ts
View file

@ -15,9 +15,9 @@ limitations under the License.
*/
import jsQR from "jsqr";
import { KnownMembership, type Preset, type Visibility } from "matrix-js-sdk/src/matrix";
import type { JSHandle, Locator, Page } from "@playwright/test";
import type { Preset, Visibility } from "matrix-js-sdk/src/matrix";
import type { VerificationRequest, Verifier } from "matrix-js-sdk/src/crypto-api";
import { test, expect } from "../../element-web-test";
import {
@ -262,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 !== Membership.Join) {
while (room.getMember(aliceCredentials.userId)?.membership !== KnownMembership.Join) {
await new Promise((resolve) => {
room.once(window.matrixcs.RoomStateEvent.Members, resolve);
});

13
playwright/e2e/knock/knock-into-room.spec.ts
View file

@ -16,7 +16,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import type { Visibility } from "matrix-js-sdk/src/matrix";
import { KnownMembership, type Visibility } from "matrix-js-sdk/src/matrix";
import { test, expect } from "../../element-web-test";
import { waitForRoom } from "../utils";
import { Filter } from "../../pages/Spotlight";
@ -73,7 +74,7 @@ test.describe("Knock Into Room", () => {
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === Membership.Knock &&
e.getContent()?.membership === KnownMembership.Knock &&
e.getContent()?.displayname === "Alice",
);
});
@ -108,7 +109,7 @@ test.describe("Knock Into Room", () => {
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === Membership.Knock &&
e.getContent()?.membership === KnownMembership.Knock &&
e.getContent()?.displayname === "Alice",
);
});
@ -150,7 +151,7 @@ test.describe("Knock Into Room", () => {
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === Membership.Knock &&
e.getContent()?.membership === KnownMembership.Knock &&
e.getContent()?.displayname === "Alice",
);
});
@ -192,7 +193,7 @@ test.describe("Knock Into Room", () => {
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === Membership.Knock &&
e.getContent()?.membership === KnownMembership.Knock &&
e.getContent()?.displayname === "Alice",
);
});
@ -258,7 +259,7 @@ test.describe("Knock Into Room", () => {
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === Membership.Knock &&
e.getContent()?.membership === KnownMembership.Knock &&
e.getContent()?.displayname === "Alice",
);
});

6
playwright/e2e/knock/manage-knocks.spec.ts
View file

@ -16,6 +16,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { KnownMembership } from "matrix-js-sdk/src/matrix";
import { test, expect } from "../../element-web-test";
import { waitForRoom } from "../utils";
@ -73,7 +75,7 @@ test.describe("Manage Knocks", () => {
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === Membership.Leave &&
e.getContent()?.membership === KnownMembership.Leave &&
e.getContent()?.displayname === "Bob",
);
});
@ -110,7 +112,7 @@ test.describe("Manage Knocks", () => {
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === Membership.Leave &&
e.getContent()?.membership === KnownMembership.Leave &&
e.getContent()?.displayname === "Bob",
);
});