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

Fix rejoin of knock rooms (#11980)

Browse source 
Signed-off-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
Co-authored-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
This commit is contained in:
maheichyk 2023-12-04 13:20:24 +03:00 • committed by GitHub
parent e2bc437774
commit 74ea0d134e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 160 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

120
cypress/e2e/knock/knock-into-room.spec.ts
View file

@ -63,7 +63,7 @@ describe("Knock Into Room", () => {
cy.stopHomeserver(homeserver);
});
it("should knock into the room then knock is approved and user joins the room", () => {
it("should knock into the room then knock is approved and user joins the room then user is kicked and joins again", () => {
cy.viewRoomById(roomId);
cy.get(".mx_RoomPreviewBar").within(() => {
@ -104,6 +104,124 @@ describe("Knock Into Room", () => {
cy.findByRole("group", { name: "Rooms" }).findByRole("treeitem", { name: "Cybersecurity" });
cy.findByText("Alice joined the room").should("exist");
cy.window().then(async (win) => {
// bot kicks Alice
await bot.kick(roomId, user.userId);
});
cy.get(".mx_RoomPreviewBar").within(() => {
cy.findByRole("button", { name: "Re-join" }).click();
cy.findByRole("heading", { name: "Ask to join Cybersecurity?" });
cy.findByRole("button", { name: "Request access" }).click();
});
cy.window().then(async (win) => {
// bot waits for knock request from Alice
await waitForRoom(win, bot, roomId, (room) => {
const events = room.getLiveTimeline().getEvents();
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === "knock" &&
e.getContent()?.displayname === "Alice",
);
});
// bot invites Alice
await bot.invite(roomId, user.userId);
});
// Alice have to accept invitation in order to join the room.
// It will be not needed when homeserver implements auto accept knock requests.
cy.get(".mx_RoomView").findByRole("button", { name: "Accept" }).click();
cy.findByText("Alice was invited, joined, was removed, was invited, and joined").should("exist");
});
it("should knock into the room then knock is approved and user joins the room then user is banned/unbanned and joins again", () => {
cy.viewRoomById(roomId);
cy.get(".mx_RoomPreviewBar").within(() => {
cy.findByRole("button", { name: "Join the discussion" }).click();
cy.findByRole("heading", { name: "Ask to join?" });
cy.findByRole("textbox");
cy.findByRole("button", { name: "Request access" }).click();
cy.findByRole("heading", { name: "Request to join sent" });
});
// Knocked room should appear in Rooms
cy.findByRole("group", { name: "Rooms" }).findByRole("treeitem", { name: "Cybersecurity" });
cy.window().then(async (win) => {
// bot waits for knock request from Alice
await waitForRoom(win, bot, roomId, (room) => {
const events = room.getLiveTimeline().getEvents();
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === "knock" &&
e.getContent()?.displayname === "Alice",
);
});
// bot invites Alice
await bot.invite(roomId, user.userId);
});
cy.findByRole("group", { name: "Invites" }).findByRole("treeitem", { name: "Cybersecurity" });
// Alice have to accept invitation in order to join the room.
// It will be not needed when homeserver implements auto accept knock requests.
cy.get(".mx_RoomView").findByRole("button", { name: "Accept" }).click();
cy.findByRole("group", { name: "Rooms" }).findByRole("treeitem", { name: "Cybersecurity" });
cy.findByText("Alice joined the room").should("exist");
cy.window().then(async (win) => {
// bot bans Alice
await bot.ban(roomId, user.userId);
});
cy.get(".mx_RoomPreviewBar").findByText("You were banned from Cybersecurity by Bob").should("exist");
cy.window().then(async (win) => {
// bot unbans Alice
await bot.unban(roomId, user.userId);
});
cy.get(".mx_RoomPreviewBar").within(() => {
cy.findByRole("button", { name: "Re-join" }).click();
cy.findByRole("heading", { name: "Ask to join Cybersecurity?" });
cy.findByRole("button", { name: "Request access" }).click();
});
cy.window().then(async (win) => {
// bot waits for knock request from Alice
await waitForRoom(win, bot, roomId, (room) => {
const events = room.getLiveTimeline().getEvents();
return events.some(
(e) =>
e.getType() === "m.room.member" &&
e.getContent()?.membership === "knock" &&
e.getContent()?.displayname === "Alice",
);
});
// bot invites Alice
await bot.invite(roomId, user.userId);
});
// Alice have to accept invitation in order to join the room.
// It will be not needed when homeserver implements auto accept knock requests.
cy.get(".mx_RoomView").findByRole("button", { name: "Accept" }).click();
cy.findByText("Alice was invited, joined, was banned, was unbanned, was invited, and joined").should("exist");
});
it("should knock into the room and knock is cancelled by user himself", () => {