You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-07-28 15:22:05 +03:00
Introduce Membership type
This commit is contained in:
Stanislav Demydiuk
committed by
Andy Balaam
Andy Balaam
parent
3c6fd58628
commit
da99bad7b9
@ -171,8 +171,8 @@ describe("MessagePanel", function () {
|
||||
user: "@user:id",
|
||||
target: bobMember,
|
||||
ts: ts0 + i * 1000,
|
||||
mship: "join",
|
||||
prevMship: "join",
|
||||
mship: Membership.Join,
|
||||
prevMship: Membership.Join,
|
||||
name: "A user",
|
||||
}),
|
||||
);
|
||||
@ -205,8 +205,8 @@ describe("MessagePanel", function () {
|
||||
user: "@user:id",
|
||||
target: bobMember,
|
||||
ts: ts0 + i * 1000,
|
||||
mship: "join",
|
||||
prevMship: "join",
|
||||
mship: Membership.Join,
|
||||
prevMship: Membership.Join,
|
||||
name: "A user",
|
||||
}),
|
||||
);
|
||||
@ -245,7 +245,7 @@ describe("MessagePanel", function () {
|
||||
user: alice,
|
||||
target: aliceMember,
|
||||
ts: ts0 + 1,
|
||||
mship: "join",
|
||||
mship: Membership.Join,
|
||||
name: "Alice",
|
||||
}),
|
||||
mkEvent({
|
||||
@ -285,7 +285,7 @@ describe("MessagePanel", function () {
|
||||
skey: "@bob:example.org",
|
||||
target: bobMember,
|
||||
ts: ts0 + 5,
|
||||
mship: "invite",
|
||||
mship: Membership.Invite,
|
||||
name: "Bob",
|
||||
}),
|
||||
];
|
||||
@ -542,8 +542,8 @@ describe("MessagePanel", function () {
|
||||
user: "@user:id",
|
||||
target: bobMember,
|
||||
ts: Date.now(),
|
||||
mship: "join",
|
||||
prevMship: "join",
|
||||
mship: Membership.Join,
|
||||
prevMship: Membership.Join,
|
||||
name: "A user",
|
||||
}),
|
||||
];
|
||||
@ -571,8 +571,8 @@ describe("MessagePanel", function () {
|
||||
user: "@user:id",
|
||||
target: bobMember,
|
||||
ts: Date.now(),
|
||||
mship: "join",
|
||||
prevMship: "join",
|
||||
mship: Membership.Join,
|
||||
prevMship: Membership.Join,
|
||||
name: "A user",
|
||||
}),
|
||||
...events,
|
||||
@ -695,8 +695,8 @@ describe("MessagePanel", function () {
|
||||
for (let i = 0; i < 100; i++) {
|
||||
events.push(
|
||||
TestUtilsMatrix.mkMembership({
|
||||
mship: "join",
|
||||
prevMship: "join",
|
||||
mship: Membership.Join,
|
||||
prevMship: Membership.Join,
|
||||
room: "!room:id",
|
||||
user: "@user:id",
|
||||
event: true,
|
||||
@ -716,8 +716,8 @@ describe("MessagePanel", function () {
|
||||
for (let i = 0; i < 100; i++) {
|
||||
events.push(
|
||||
TestUtilsMatrix.mkMembership({
|
||||
mship: "join",
|
||||
prevMship: "join",
|
||||
mship: Membership.Join,
|
||||
prevMship: Membership.Join,
|
||||
room: "!room:id",
|
||||
user: "@user:id",
|
||||
event: true,
|
||||
|
||||
@ -238,7 +238,7 @@ describe("RoomView", () => {
|
||||
});
|
||||
|
||||
it("updates url preview visibility on encryption state change", async () => {
|
||||
room.getMyMembership = jest.fn().mockReturnValue("join");
|
||||
room.getMyMembership = jest.fn().mockReturnValue(Membership.Join);
|
||||
// we should be starting unencrypted
|
||||
expect(cli.isCryptoEnabled()).toEqual(false);
|
||||
expect(cli.isRoomEncrypted(room.roomId)).toEqual(false);
|
||||
@ -583,7 +583,7 @@ describe("RoomView", () => {
|
||||
it("allows to cancel a join request", async () => {
|
||||
jest.spyOn(MatrixClientPeg, "safeGet").mockReturnValue(client);
|
||||
jest.spyOn(client, "leave").mockResolvedValue({});
|
||||
jest.spyOn(room, "getMyMembership").mockReturnValue("knock");
|
||||
jest.spyOn(room, "getMyMembership").mockReturnValue(Membership.Knock);
|
||||
|
||||
await mountRoomView();
|
||||
fireEvent.click(screen.getByRole("button", { name: "Cancel request" }));
|
||||
@ -594,7 +594,7 @@ describe("RoomView", () => {
|
||||
});
|
||||
|
||||
it("should close search results when edit is clicked", async () => {
|
||||
room.getMyMembership = jest.fn().mockReturnValue("join");
|
||||
room.getMyMembership = jest.fn().mockReturnValue(Membership.Join);
|
||||
|
||||
const eventMapper = (obj: Partial<IEvent>) => new MatrixEvent(obj);
|
||||
|
||||
@ -655,7 +655,7 @@ describe("RoomView", () => {
|
||||
const room2 = new Room(`!${roomCount++}:example.org`, cli, "@alice:example.org");
|
||||
rooms.set(room2.roomId, room2);
|
||||
|
||||
room.getMyMembership = jest.fn().mockReturnValue("join");
|
||||
room.getMyMembership = jest.fn().mockReturnValue(Membership.Join);
|
||||
|
||||
const eventMapper = (obj: Partial<IEvent>) => new MatrixEvent(obj);
|
||||
|
||||
|
||||
@ -181,7 +181,7 @@ describe("SpaceHierarchy", () => {
|
||||
mocked(client.getRoom).mockImplementation(
|
||||
(roomId) => client.getRooms().find((room) => room.roomId === roomId) ?? null,
|
||||
);
|
||||
[room1, room2, space1, room3].forEach((r) => mocked(r.getMyMembership).mockReturnValue("leave"));
|
||||
[room1, room2, space1, room3].forEach((r) => mocked(r.getMyMembership).mockReturnValue(Membership.Leave));
|
||||
|
||||
const hierarchyRoot: HierarchyRoom = {
|
||||
room_id: root.roomId,
|
||||
|
||||
@ -988,8 +988,8 @@ describe("TimelinePanel", () => {
|
||||
events.forEach((event) => timelineSet.getLiveTimeline().addEvent(event, { toStartOfTimeline: true }));
|
||||
|
||||
const roomMembership = mkMembership({
|
||||
mship: "join",
|
||||
prevMship: "join",
|
||||
mship: Membership.Join,
|
||||
prevMship: Membership.Join,
|
||||
user: authorId,
|
||||
room: room.roomId,
|
||||
event: true,
|
||||
@ -999,7 +999,7 @@ describe("TimelinePanel", () => {
|
||||
events.push(roomMembership);
|
||||
|
||||
const member = new RoomMember(room.roomId, authorId);
|
||||
member.membership = "join";
|
||||
member.membership = Membership.Join;
|
||||
|
||||
const roomState = new RoomState(room.roomId);
|
||||
jest.spyOn(roomState, "getMember").mockReturnValue(member);
|
||||
|
||||
Reference in New Issue
Block a user