Merge branch 'develop' into andybalaam/stas-demydiuk-membership-type3

playwright/e2e/room/room-header.spec.ts

@@ -18,6 +18,7 @@ import { Page } from "@playwright/test";
 
 import { test, expect } from "../../element-web-test";
 import { ElementAppPage } from "../../pages/ElementAppPage";
+import type { Container } from "../../../src/stores/widgets/types";
 
 test.describe("Room Header", () => {
     test.use({
@@ -227,7 +228,7 @@ test.describe("Room Header", () => {
                         {
                             widgets: {
                                 [id]: {
-                                    container: "top",
+                                    container: "top" as Container,
                                     index: 1,
                                     width: 100,
                                     height: 0,

playwright/e2e/room_options/marked_unread.spec.ts

@@ -0,0 +1,61 @@
+/*
+Copyright 2024 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { test, expect } from "../../element-web-test";
+
+const TEST_ROOM_NAME = "The mark unread test room";
+
+test.describe("Mark as Unread", () => {
+    test.use({
+        displayName: "Tom",
+        botCreateOpts: {
+            displayName: "BotBob",
+            autoAcceptInvites: true,
+        },
+    });
+
+    test("should mark a room as unread", async ({ page, app, bot }) => {
+        const roomId = await app.client.createRoom({
+            name: TEST_ROOM_NAME,
+        });
+        const dummyRoomId = await app.client.createRoom({
+            name: "Room of no consequence",
+        });
+        await app.client.inviteUser(roomId, bot.credentials.userId);
+        await bot.joinRoom(roomId);
+        await bot.sendMessage(roomId, "I am a robot. Beep.");
+
+        // Regular notification on new message
+        await expect(page.getByLabel(TEST_ROOM_NAME + " 1 unread message.")).toBeVisible();
+        await expect(page).toHaveTitle("Element [1]");
+
+        await page.goto("/#/room/" + roomId);
+
+        // should now be read, since we viewed the room (we have to assert the page title:
+        // the room badge isn't visible since we're viewing the room)
+        await expect(page).toHaveTitle("Element | " + TEST_ROOM_NAME);
+
+        // navigate away from the room again
+        await page.goto("/#/room/" + dummyRoomId);
+
+        const roomTile = page.getByLabel(TEST_ROOM_NAME);
+        await roomTile.focus();
+        await roomTile.getByRole("button", { name: "Room options" }).click();
+        await page.getByRole("menuitem", { name: "Mark as unread" }).click();
+
+        expect(page.getByLabel(TEST_ROOM_NAME + " Unread messages.")).toBeVisible();
+    });
+});

playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts

@@ -0,0 +1,58 @@
+/*
+ *
+ * Copyright 2024 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * /
+ */
+
+import { Locator } from "@playwright/test";
+
+import { test, expect } from "../../element-web-test";
+
+test.describe("Roles & Permissions room settings tab", () => {
+    const roomName = "Test room";
+
+    test.use({
+        displayName: "Alice",
+    });
+
+    let settings: Locator;
+
+    test.beforeEach(async ({ user, app }) => {
+        await app.client.createRoom({ name: roomName });
+        await app.viewRoomByName(roomName);
+        settings = await app.settings.openRoomSettings("Roles & Permissions");
+    });
+
+    test("should be able to change the role of a user", async ({ page, app, user }) => {
+        const privilegedUserSection = settings.locator(".mx_SettingsFieldset").first();
+        const applyButton = privilegedUserSection.getByRole("button", { name: "Apply" });
+
+        // Alice is admin (100) and the Apply button should be disabled
+        await expect(applyButton).toBeDisabled();
+        let combobox = privilegedUserSection.getByRole("combobox", { name: user.userId });
+        await expect(combobox).toHaveValue("100");
+
+        // Change the role of Alice to Moderator (50)
+        await combobox.selectOption("Moderator");
+        await expect(combobox).toHaveValue("50");
+        await applyButton.click();
+
+        // Reload and check Alice is still Moderator (50)
+        await page.reload();
+        settings = await app.settings.openRoomSettings("Roles & Permissions");
+        combobox = privilegedUserSection.getByRole("combobox", { name: user.userId });
+        await expect(combobox).toHaveValue("50");
+    });
+});

playwright/global.d.ts

@@ -31,3 +31,10 @@ declare global {
         matrixcs: typeof Matrix;
     }
 }
+
+// Workaround for lack of strict mode not resolving complex types correctly
+declare module "matrix-js-sdk/src/http-api/index.ts" {
+    interface UploadResponse {
+        json(): Promise<object>;
+    }
+}

playwright/pages/client.ts

@@ -31,6 +31,7 @@ import type {
     Visibility,
     UploadOpts,
     Upload,
+    StateEvents,
 } from "matrix-js-sdk/src/matrix";
 import { Credentials } from "../plugins/homeserver";
 
@@ -407,7 +408,7 @@ export class Client {
         const client = await this.prepareClient();
         return client.evaluate(
             async (client, { roomId, eventType, content, stateKey }) => {
-                return client.sendStateEvent(roomId, eventType, content, stateKey);
+                return client.sendStateEvent(roomId, eventType as keyof StateEvents, content, stateKey);
             },
             { roomId, eventType, content, stateKey },
         );

playwright/tsconfig.json

@@ -10,6 +10,7 @@
     },
     "include": [
         "**/*.ts",
+        "../src/@types/matrix-js-sdk.d.ts",
         "../node_modules/matrix-js-sdk/src/@types/*.d.ts",
         "../node_modules/matrix-js-sdk/node_modules/@matrix-org/olm/index.d.ts"
     ]