resolved merge conflict

Author: yaya-usman

cypress/global.d.ts

@@ -14,6 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../src/@types/global";
+import "../src/@types/svg";
+import "../src/@types/raw-loader";
 import "matrix-js-sdk/src/@types/global";
 import type {
     MatrixClient,

cypress/integration/10-user-view/user-view.spec.ts

@@ -27,7 +27,7 @@ describe("UserView", () => {
             synapse = data;
 
             cy.initTestUser(synapse, "Violet");
-            cy.getBot(synapse, "Usman").as("bot");
+            cy.getBot(synapse, { displayName: "Usman" }).as("bot");
         });
     });
 

cypress/integration/11-room-directory/room-directory.spec.ts

@@ -27,7 +27,7 @@ describe("Room Directory", () => {
             synapse = data;
 
             cy.initTestUser(synapse, "Ray");
-            cy.getBot(synapse, "Paul").as("bot");
+            cy.getBot(synapse, { displayName: "Paul" }).as("bot");
         });
     });
 

cypress/integration/12-spotlight/spotlight.spec.ts

@@ -125,15 +125,14 @@ describe("Spotlight", () => {
     let room2Id: string;
 
     beforeEach(() => {
-        cy.enableLabsFeature("feature_spotlight");
         cy.startSynapse("default").then(data => {
             synapse = data;
             cy.initTestUser(synapse, "Jim").then(() =>
-                cy.getBot(synapse, bot1Name).then(_bot1 => {
+                cy.getBot(synapse, { displayName: bot1Name }).then(_bot1 => {
                     bot1 = _bot1;
                 }),
             ).then(() =>
-                cy.getBot(synapse, bot2Name).then(_bot2 => {
+                cy.getBot(synapse, { displayName: bot2Name }).then(_bot2 => {
                     // eslint-disable-next-line @typescript-eslint/no-unused-vars
                     bot2 = _bot2;
                 }),
@@ -157,6 +156,7 @@ describe("Spotlight", () => {
     });
 
     afterEach(() => {
+        cy.visit("/#/home");
         cy.stopSynapse(synapse);
     });
 
@@ -265,6 +265,47 @@ describe("Spotlight", () => {
         });
     });
 
+    it("should find group DMs by usernames or user ids", () => {
+        // First we want to share a room with both bots to ensure we’ve got their usernames cached
+        cy.inviteUser(room1Id, bot2.getUserId());
+
+        // Starting a DM with ByteBot (will be turned into a group dm later)
+        cy.openSpotlightDialog().within(() => {
+            cy.spotlightFilter(Filter.People);
+            cy.spotlightSearch().clear().type(bot2Name);
+            cy.spotlightResults().should("have.length", 1);
+            cy.spotlightResults().eq(0).should("contain", bot2Name);
+            cy.spotlightResults().eq(0).click();
+        }).then(() => {
+            cy.roomHeaderName().should("contain", bot2Name);
+            cy.get(".mx_RoomSublist[aria-label=People]").should("contain", bot2Name);
+        });
+
+        // Invite BotBob into existing DM with ByteBot
+        cy.getDmRooms(bot2.getUserId()).then(dmRooms => dmRooms[0])
+            .then(groupDmId => cy.inviteUser(groupDmId, bot1.getUserId()))
+            .then(() => {
+                cy.roomHeaderName().should("contain", `${bot1Name} and ${bot2Name}`);
+                cy.get(".mx_RoomSublist[aria-label=People]").should("contain", `${bot1Name} and ${bot2Name}`);
+            });
+
+        // Search for BotBob by id, should return group DM and user
+        cy.openSpotlightDialog().within(() => {
+            cy.spotlightFilter(Filter.People);
+            cy.spotlightSearch().clear().type(bot1.getUserId());
+            cy.spotlightResults().should("have.length", 2);
+            cy.spotlightResults().eq(0).should("contain", `${bot1Name} and ${bot2Name}`);
+        });
+
+        // Search for ByteBot by id, should return group DM and user
+        cy.openSpotlightDialog().within(() => {
+            cy.spotlightFilter(Filter.People);
+            cy.spotlightSearch().clear().type(bot2.getUserId());
+            cy.spotlightResults().should("have.length", 2);
+            cy.spotlightResults().eq(0).should("contain", `${bot1Name} and ${bot2Name}`);
+        });
+    });
+
     it("should allow opening group chat dialog", () => {
         cy.openSpotlightDialog().within(() => {
             cy.spotlightFilter(Filter.People);

cypress/integration/13-regression-tests/pills-click-in-app.spec.ts

@@ -0,0 +1,75 @@
+/*
+Copyright 2022 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.
+*/
+
+/// <reference types="cypress" />
+
+import { SynapseInstance } from "../../plugins/synapsedocker";
+
+describe("Pills", () => {
+    let synapse: SynapseInstance;
+
+    beforeEach(() => {
+        cy.startSynapse("default").then(data => {
+            synapse = data;
+
+            cy.initTestUser(synapse, "Sally");
+        });
+    });
+
+    afterEach(() => {
+        cy.stopSynapse(synapse);
+    });
+
+    it('should navigate clicks internally to the app', () => {
+        const messageRoom = "Send Messages Here";
+        const targetLocalpart = "aliasssssssssssss";
+        cy.createRoom({
+            name: "Target",
+            room_alias_name: targetLocalpart,
+        }).as("targetRoomId");
+        cy.createRoom({
+            name: messageRoom,
+        }).as("messageRoomId");
+        cy.all([
+            cy.get<string>("@targetRoomId"),
+            cy.get<string>("@messageRoomId"),
+        ]).then(([targetRoomId, messageRoomId]) => { // discard the target room ID - we don't need it
+            cy.viewRoomByName(messageRoom);
+            cy.url().should("contain", `/#/room/${messageRoomId}`);
+
+            // send a message using the built-in room mention functionality (autocomplete)
+            cy.get(".mx_SendMessageComposer .mx_BasicMessageComposer_input")
+                .type(`Hello world! Join here: #${targetLocalpart.substring(0, 3)}`);
+            cy.get(".mx_Autocomplete_Completion_title").click();
+            cy.get(".mx_MessageComposer_sendMessage").click();
+
+            // find the pill in the timeline and click it
+            cy.get(".mx_EventTile_body .mx_Pill").click();
+
+            // verify we landed at a sane place
+            cy.url().should("contain", `/#/room/#${targetLocalpart}:`);
+
+            cy.wait(250); // let the room list settle
+
+            // go back to the message room and try to click on the pill text, as a user would
+            cy.viewRoomByName(messageRoom);
+            cy.get(".mx_EventTile_body .mx_Pill .mx_Pill_linkText")
+                .should("have.css", "pointer-events", "none")
+                .click({ force: true }); // force is to ensure we bypass pointer-events
+            cy.url().should("contain", `https://matrix.to/#/#${targetLocalpart}:`);
+        });
+    });
+});

cypress/integration/5-threads/threads.spec.ts

@@ -73,7 +73,7 @@ describe("Threads", () => {
 
     it("should be usable for a conversation", () => {
         let bot: MatrixClient;
-        cy.getBot(synapse, "BotBob").then(_bot => {
+        cy.getBot(synapse, { displayName: "BotBob" }).then(_bot => {
             bot = _bot;
         });
 

cypress/integration/6-spaces/spaces.spec.ts

@@ -167,7 +167,7 @@ describe("Spaces", () => {
 
     it("should allow user to invite another to a space", () => {
         let bot: MatrixClient;
-        cy.getBot(synapse, "BotBob").then(_bot => {
+        cy.getBot(synapse, { displayName: "BotBob" }).then(_bot => {
             bot = _bot;
         });
 
@@ -202,7 +202,7 @@ describe("Spaces", () => {
         });
         getSpacePanelButton("My Space").should("exist");
 
-        cy.getBot(synapse, "BotBob").then({ timeout: 10000 }, async bot => {
+        cy.getBot(synapse, { displayName: "BotBob" }).then({ timeout: 10000 }, async bot => {
             const { room_id: roomId } = await bot.createRoom(spaceCreateOptions("Space Space"));
             await bot.invite(roomId, user.userId);
         });