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

3
test/components/views/settings/JoinRuleSettings-test.tsx
View file

@ -27,6 +27,7 @@ import {
RoomMember,
MatrixError,
Visibility,
KnownMembership,
} from "matrix-js-sdk/src/matrix";
import { defer, IDeferred } from "matrix-js-sdk/src/utils";
@ -177,7 +178,7 @@ describe("<JoinRuleSettings />", () => {
const memberBob = new RoomMember(roomId, "@bob:server.org");
const memberCharlie = new RoomMember(roomId, "@charlie:server.org");
jest.spyOn(room, "getMembersWithMembership").mockImplementation((membership) =>
membership === Membership.Join ? [memberAlice, memberBob] : [memberCharlie],
membership === KnownMembership.Join ? [memberAlice, memberBob] : [memberCharlie],
);
const upgradedRoom = new Room(newRoomId, client, userId);
setRoomStateEvents(upgradedRoom, preferredRoomVersion);

7
test/components/views/settings/tabs/room/PeopleRoomSettingsTab-test.tsx
View file

@ -18,6 +18,7 @@ import { act, fireEvent, render, screen, within } from "@testing-library/react";
import {
EventTimeline,
EventType,
KnownMembership,
MatrixError,
MatrixEvent,
Room,
@ -91,7 +92,7 @@ describe("PeopleRoomSettingsTab", () => {
content: {
avatar_url: "mxc://example.org/albert-einstein.png",
displayname: "Albert Einstein",
membership: Membership.Knock,
membership: KnownMembership.Knock,
reason,
},
origin_server_ts: -464140800000,
@ -110,7 +111,7 @@ describe("PeopleRoomSettingsTab", () => {
new MatrixEvent({
content: {
displayname: "albert.einstein",
membership: Membership.Knock,
membership: KnownMembership.Knock,
},
type: EventType.RoomMember,
}),
@ -138,7 +139,7 @@ describe("PeopleRoomSettingsTab", () => {
new MatrixEvent({
content: {
displayname: "albert.einstein",
membership: Membership.Knock,
membership: KnownMembership.Knock,
reason,
},
type: EventType.RoomMember,

14
test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx
View file

@ -16,7 +16,15 @@ limitations under the License.
import React from "react";
import { fireEvent, render, RenderResult, screen, waitFor } from "@testing-library/react";
import { MatrixClient, EventType, MatrixEvent, Room, RoomMember, ISendEventResponse } from "matrix-js-sdk/src/matrix";
import {
MatrixClient,
EventType,
MatrixEvent,
Room,
RoomMember,
ISendEventResponse,
KnownMembership,
} from "matrix-js-sdk/src/matrix";
import { mocked } from "jest-mock";
import { defer } from "matrix-js-sdk/src/utils";
@ -197,7 +205,7 @@ describe("RolesRoomSettingsTab", () => {
new MatrixEvent({
type: EventType.RoomMember,
content: {
membership: Membership.Ban,
membership: KnownMembership.Ban,
reason: "just testing",
},
sender: userId,
@ -218,7 +226,7 @@ describe("RolesRoomSettingsTab", () => {
new MatrixEvent({
type: EventType.RoomMember,
content: {
membership: Membership.Ban,
membership: KnownMembership.Ban,
reason: "just testing",
},
sender: userId,