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

Adapt Membership usage for the change to an enum KnownMembership

Browse Source
This commit is contained in:
Andy Balaam
2024-03-18 14:43:08 +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
test/components/views/right_panel/RoomSummaryCard-test.tsx
+2 -2
View File
@@ -16,7 +16,7 @@ limitations under the License.
import React from "react";
import { render, fireEvent, screen } from "@testing-library/react";
import { EventType, MatrixEvent, Room, MatrixClient, JoinRule } from "matrix-js-sdk/src/matrix";
import { EventType, MatrixEvent, Room, MatrixClient, JoinRule, KnownMembership } from "matrix-js-sdk/src/matrix";
import { mocked, MockedObject } from "jest-mock";
import { TooltipProvider } from "@vector-im/compound-web";
@@ -86,7 +86,7 @@ describe("<RoomSummaryCard />", () => {
state_key: "",
});
room.currentState.setStateEvents([roomCreateEvent]);
room.updateMyMembership(Membership.Join);
room.updateMyMembership(KnownMembership.Join);
jest.spyOn(Modal, "createDialog");
jest.spyOn(RightPanelStore.instance, "pushCard");
test/components/views/right_panel/UserInfo-test.tsx
+9 -8
View File
@@ -28,6 +28,7 @@ import {
CryptoApi,
DeviceVerificationStatus,
Device,
KnownMembership,
} from "matrix-js-sdk/src/matrix";
import {
Phase,
@@ -943,8 +944,8 @@ describe("<PowerLevelEditor />", () => {
describe("<RoomKickButton />", () => {
const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
const memberWithInviteMembership = { ...defaultMember, membership: Membership.Invite };
const memberWithJoinMembership = { ...defaultMember, membership: Membership.Join };
const memberWithInviteMembership = { ...defaultMember, membership: KnownMembership.Invite };
const memberWithJoinMembership = { ...defaultMember, membership: KnownMembership.Join };
let defaultProps: Parameters<typeof RoomKickButton>[0];
beforeEach(() => {
@@ -1031,7 +1032,7 @@ describe("<RoomKickButton />", () => {
// null vs their member followed by
// my member vs their member
const mockMyMember = { powerLevel: 1 };
const mockTheirMember = { membership: Membership.Invite, powerLevel: 0 };
const mockTheirMember = { membership: KnownMembership.Invite, powerLevel: 0 };
const mockRoom = {
getMember: jest
@@ -1052,7 +1053,7 @@ describe("<RoomKickButton />", () => {
describe("<BanToggleButton />", () => {
const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
const memberWithBanMembership = { ...defaultMember, membership: Membership.Ban };
const memberWithBanMembership = { ...defaultMember, membership: KnownMembership.Ban };
let defaultProps: Parameters<typeof BanToggleButton>[0];
beforeEach(() => {
defaultProps = {
@@ -1161,7 +1162,7 @@ describe("<BanToggleButton />", () => {
// null vs their member followed by
// my member vs their member
const mockMyMember = { powerLevel: 1 };
const mockTheirMember = { membership: Membership.Ban, powerLevel: 0 };
const mockTheirMember = { membership: KnownMembership.Ban, powerLevel: 0 };
const mockRoom = {
getMember: jest
@@ -1182,7 +1183,7 @@ describe("<BanToggleButton />", () => {
describe("<RoomAdminToolsContainer />", () => {
const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
defaultMember.membership = Membership.Invite;
defaultMember.membership = KnownMembership.Invite;
let defaultProps: Parameters<typeof RoomAdminToolsContainer>[0];
beforeEach(() => {
@@ -1248,7 +1249,7 @@ describe("<RoomAdminToolsContainer />", () => {
const defaultMemberWithPowerLevelAndJoinMembership = {
...defaultMember,
powerLevel: 0,
membership: Membership.Join,
membership: KnownMembership.Join,
};
renderComponent({
@@ -1270,7 +1271,7 @@ describe("<RoomAdminToolsContainer />", () => {
const defaultMemberWithPowerLevelAndJoinMembership = {
...defaultMember,
powerLevel: 0,
membership: Membership.Join,
membership: KnownMembership.Join,
};
renderComponent({