diff --git a/playwright/e2e/spaces/threads-activity-centre/index.ts b/playwright/e2e/spaces/threads-activity-centre/index.ts
index 30aa00375425..b30af58fca05 100644
--- a/playwright/e2e/spaces/threads-activity-centre/index.ts
+++ b/playwright/e2e/spaces/threads-activity-centre/index.ts
@@ -330,23 +330,27 @@ export class Helpers {
* @param room1
* @param room2
* @param msg - MessageBuilder
+ * @param hasMention - whether to include a mention in the first message
*/
async populateThreads(
room1: { name: string; roomId: string },
room2: { name: string; roomId: string },
msg: MessageBuilder,
+ hasMention = true,
) {
- await this.receiveMessages(room2, [
- "Msg1",
- msg.threadedOff("Msg1", {
- "body": "User",
- "format": "org.matrix.custom.html",
- "formatted_body": "User",
- "m.mentions": {
- user_ids: ["@user:localhost"],
- },
- }),
- ]);
+ if (hasMention) {
+ await this.receiveMessages(room2, [
+ "Msg1",
+ msg.threadedOff("Msg1", {
+ "body": "User",
+ "format": "org.matrix.custom.html",
+ "formatted_body": "User",
+ "m.mentions": {
+ user_ids: ["@user:localhost"],
+ },
+ }),
+ ]);
+ }
await this.receiveMessages(room2, ["Msg2", msg.threadedOff("Msg2", "Resp2")]);
await this.receiveMessages(room1, ["Msg3", msg.threadedOff("Msg3", "Resp3")]);
}
diff --git a/playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts b/playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts
index f86228def2e0..b199599e61b0 100644
--- a/playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts
+++ b/playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts
@@ -112,6 +112,16 @@ test.describe("Threads Activity Centre", () => {
await expect(util.getTacPanel()).toMatchScreenshot("tac-panel-notification-unread.png");
});
+ test("should order by recency after notification level", async ({ room1, room2, util, msg }) => {
+ await util.populateThreads(room1, room2, msg, false);
+
+ await util.openTac();
+ await util.assertRoomsInTac([
+ { room: room1.name, notificationLevel: "notification" },
+ { room: room2.name, notificationLevel: "notification" },
+ ]);
+ });
+
test("should block the Spotlight to open when the TAC is opened", async ({ util, page }) => {
const toggleSpotlight = () => page.keyboard.press(`${CommandOrControl}+k`);
@@ -126,8 +136,4 @@ test.describe("Threads Activity Centre", () => {
await toggleSpotlight();
await expect(page.locator(".mx_SpotlightDialog")).not.toBeVisible();
});
-
- // test("miaou", async ({ roomAlpha: room1, roomBeta: room2, roomAlphaName: room3, util, msg }) => {
- // await util.populateThreads(room1, room2, msg);
- // });
});