Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/fix/24963

Author: t3chguy

.github/workflows/element-web.yaml

@@ -4,7 +4,7 @@
 name: Element Web - Build
 on:
     schedule:
-        - cron: "17 4 * * *" # every day at 04:17 UTC
+        - cron: "17 4 * * 1-5" # every weekday at 04:17 UTC
     pull_request: {}
     push:
         branches: [develop, master]

cypress/e2e/composer/composer.spec.ts

@@ -42,39 +42,39 @@ describe("Composer", () => {
 
         it("sends a message when you click send or press Enter", () => {
             // Type a message
-            cy.get("div[contenteditable=true]").type("my message 0");
+            cy.findTextbox("Send a message…").type("my message 0");
             // It has not been sent yet
             cy.contains(".mx_EventTile_body", "my message 0").should("not.exist");
 
             // Click send
-            cy.get('div[aria-label="Send message"]').click();
+            cy.findButton("Send message").click();
             // It has been sent
             cy.contains(".mx_EventTile_body", "my message 0");
 
             // Type another and press Enter afterwards
-            cy.get("div[contenteditable=true]").type("my message 1{enter}");
+            cy.findTextbox("Send a message…").type("my message 1{enter}");
             // It was sent
             cy.contains(".mx_EventTile_body", "my message 1");
         });
 
         it("can write formatted text", () => {
-            cy.get("div[contenteditable=true]").type("my bold{ctrl+b} message");
-            cy.get('div[aria-label="Send message"]').click();
+            cy.findTextbox("Send a message…").type("my bold{ctrl+b} message");
+            cy.findButton("Send message").click();
             // Note: both "bold" and "message" are bold, which is probably surprising
             cy.contains(".mx_EventTile_body strong", "bold message");
         });
 
         it("should allow user to input emoji via graphical picker", () => {
             cy.getComposer(false).within(() => {
-                cy.get('[aria-label="Emoji"]').click();
+                cy.findButton("Emoji").click();
             });
 
             cy.get('[data-testid="mx_EmojiPicker"]').within(() => {
                 cy.contains(".mx_EmojiPicker_item", "😇").click();
             });
 
             cy.get(".mx_ContextualMenu_background").click(); // Close emoji picker
-            cy.get("div[contenteditable=true]").type("{enter}"); // Send message
+            cy.findTextbox("Send a message…").type("{enter}"); // Send message
 
             cy.contains(".mx_EventTile_body", "😇");
         });
@@ -86,12 +86,12 @@ describe("Composer", () => {
 
             it("only sends when you press Ctrl+Enter", () => {
                 // Type a message and press Enter
-                cy.get("div[contenteditable=true]").type("my message 3{enter}");
+                cy.findTextbox("Send a message…").type("my message 3{enter}");
                 // It has not been sent yet
                 cy.contains(".mx_EventTile_body", "my message 3").should("not.exist");
 
                 // Press Ctrl+Enter
-                cy.get("div[contenteditable=true]").type("{ctrl+enter}");
+                cy.findTextbox("Send a message…").type("{ctrl+enter}");
                 // It was sent
                 cy.contains(".mx_EventTile_body", "my message 3");
             });
@@ -114,7 +114,7 @@ describe("Composer", () => {
             cy.contains(".mx_EventTile_body", "my message 0").should("not.exist");
 
             // Click send
-            cy.get('div[aria-label="Send message"]').click();
+            cy.findButton("Send message").click();
             // It has been sent
             cy.contains(".mx_EventTile_body", "my message 0");
 
@@ -143,7 +143,7 @@ describe("Composer", () => {
 
         it("can write formatted text", () => {
             cy.get("div[contenteditable=true]").type("my {ctrl+b}bold{ctrl+b} message");
-            cy.get('div[aria-label="Send message"]').click();
+            cy.findButton("Send message").click();
             cy.contains(".mx_EventTile_body strong", "bold");
         });
 
@@ -172,13 +172,13 @@ describe("Composer", () => {
                 cy.get("div[contenteditable=true]").type("my message 0{selectAll}");
 
                 // Open link modal
-                cy.get('button[aria-label="Link"]').click();
+                cy.findButton("Link").click();
                 // Fill the link field
-                cy.get('input[label="Link"]').type("https://matrix.org/");
+                cy.findTextbox("Link").type("https://matrix.org/");
                 // Click on save
-                cy.get('button[type="submit"]').click();
+                cy.findButton("Save").click();
                 // Send the message
-                cy.get('div[aria-label="Send message"]').click();
+                cy.findButton("Send message").click();
 
                 // It was sent
                 cy.contains(".mx_EventTile_body a", "my message 0");

cypress/e2e/right-panel/file-panel.spec.ts

@@ -210,6 +210,22 @@ describe("FilePanel", () => {
                 });
             });
         });
+
+        it("should not add inline padding to a tile when it is selected with right click", () => {
+            // Upload a file
+            uploadFile("cypress/fixtures/1sec.ogg");
+
+            cy.get(".mx_FilePanel .mx_RoomView_MessageList").within(() => {
+                // Wait until the spinner of the audio player vanishes
+                cy.get(".mx_InlineSpinner").should("not.exist");
+
+                // Right click the uploaded file to select the tile
+                cy.get(".mx_EventTile").rightclick();
+
+                // Assert that inline padding is not applied
+                cy.get(".mx_EventTile_selected .mx_EventTile_line").should("have.css", "padding-inline", "0px");
+            });
+        });
     });
 
     describe("download", () => {

cypress/e2e/settings/set-integration-manager.spec.ts

@@ -0,0 +1,60 @@
+/*
+Copyright 2023 Suguru Hirahara
+
+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.
+*/
+
+/// <reference types="cypress" />
+
+import { HomeserverInstance } from "../../plugins/utils/homeserver";
+
+const USER_NAME = "Alice";
+
+describe("Set integration manager", () => {
+    let homeserver: HomeserverInstance;
+
+    beforeEach(() => {
+        cy.startHomeserver("default").then((data) => {
+            homeserver = data;
+            cy.initTestUser(homeserver, USER_NAME);
+        });
+    });
+
+    afterEach(() => {
+        cy.stopHomeserver(homeserver);
+    });
+
+    it("should be correctly rendered", () => {
+        cy.openUserSettings("General");
+
+        cy.get(".mx_SetIntegrationManager").within(() => {
+            // Assert the toggle switch is enabled by default
+            cy.get(".mx_ToggleSwitch_enabled").should("exist");
+
+            // Assert space between "Manage integrations" and the integration server address is set to 4px;
+            cy.get(".mx_SetIntegrationManager_heading_manager").should("have.css", "column-gap", "4px");
+
+            cy.get(".mx_SetIntegrationManager_heading_manager").within(() => {
+                cy.get(".mx_SettingsTab_heading").should("have.text", "Manage integrations");
+
+                // Assert the headings' inline end margin values are set to zero in favor of the column-gap declaration
+                cy.get(".mx_SettingsTab_heading").should("have.css", "margin-inline-end", "0px");
+                cy.get(".mx_SettingsTab_subheading").should("have.css", "margin-inline-end", "0px");
+            });
+        });
+
+        cy.get(".mx_SetIntegrationManager").percySnapshotElement("'Manage integrations' on General settings tab", {
+            widths: [692], // actual width of mx_SetIntegrationManager
+        });
+    });
+});

cypress/e2e/sliding-sync/sliding-sync.ts

@@ -202,7 +202,7 @@ describe("Sliding Sync", () => {
 
         // disable notifs in this room (TODO: CS API call?)
         cy.contains(".mx_RoomTile", "Test Room").find(".mx_RoomTile_notificationsButton").click({ force: true });
-        cy.contains("Off").click();
+        cy.contains("Mute room").click();
 
         // create a new room so we know when the message has been received as it'll re-shuffle the room list
         cy.createRoom({