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

Merge pull request #12336 from matrix-org/andybalaam/stas-demydiuk-membership-type3

Browse source 
Introduce Membership type (take 2)
This commit is contained in:
David Baker 2024-03-22 15:36:39 +00:00 • committed by GitHub
commit 8f22550f19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
113 changed files with 711 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import {
MatrixError,
Visibility,
} from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { defer, IDeferred } from "matrix-js-sdk/src/utils";
import {
@ -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 === "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

@ -24,6 +24,7 @@ import {
RoomMember,
RoomStateEvent,
} from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import React from "react";
import ErrorDialog from "../../../../../../src/components/views/dialogs/ErrorDialog";
@ -91,7 +92,7 @@ describe("PeopleRoomSettingsTab", () => {
content: {
avatar_url: "mxc://example.org/albert-einstein.png",
displayname: "Albert Einstein",
membership: "knock",
membership: KnownMembership.Knock,
reason,
},
origin_server_ts: -464140800000,
@ -110,7 +111,7 @@ describe("PeopleRoomSettingsTab", () => {
new MatrixEvent({
content: {
displayname: "albert.einstein",
membership: "knock",
membership: KnownMembership.Knock,
},
type: EventType.RoomMember,
}),
@ -138,7 +139,7 @@ describe("PeopleRoomSettingsTab", () => {
new MatrixEvent({
content: {
displayname: "albert.einstein",
membership: "knock",
membership: KnownMembership.Knock,
reason,
},
type: EventType.RoomMember,

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

@ -17,6 +17,7 @@ limitations under the License.
import React from "react";
import { fireEvent, getByRole, render, RenderResult, screen, waitFor } from "@testing-library/react";
import { MatrixClient, EventType, MatrixEvent, Room, RoomMember, ISendEventResponse } from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { mocked } from "jest-mock";
import { defer } from "matrix-js-sdk/src/utils";
import userEvent from "@testing-library/user-event";
@ -198,7 +199,7 @@ describe("RolesRoomSettingsTab", () => {
new MatrixEvent({
type: EventType.RoomMember,
content: {
membership: "ban",
membership: KnownMembership.Ban,
reason: "just testing",
},
sender: userId,
@ -219,7 +220,7 @@ describe("RolesRoomSettingsTab", () => {
new MatrixEvent({
type: EventType.RoomMember,
content: {
membership: "ban",
membership: KnownMembership.Ban,
reason: "just testing",
},
sender: userId,