From fa78ad5ecd4179e5fa16ee385a6bc6a135d41b14 Mon Sep 17 00:00:00 2001
From: Michael Weimann <michaelw@matrix.org>
Date: Tue, 18 Apr 2023 10:01:21 +0200
Subject: [PATCH] Extend tests

---
 test/components/views/rooms/RoomTile-test.tsx | 66 ++++++++++++++-----
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/test/components/views/rooms/RoomTile-test.tsx b/test/components/views/rooms/RoomTile-test.tsx
index 25f53af9d74..8317c6f6305 100644
--- a/test/components/views/rooms/RoomTile-test.tsx
+++ b/test/components/views/rooms/RoomTile-test.tsx
@@ -94,6 +94,37 @@ describe("RoomTile", () => {
         "Room !1:example.org does not have an m.room.create event",
     );
 
+    const addMessageToRoom = (ts: number) => {
+        const message = mkMessage({
+            event: true,
+            room: room.roomId,
+            msg: "test message",
+            user: client.getSafeUserId(),
+            ts,
+        });
+
+        room.timeline.push(message);
+    };
+
+    const addThreadMessageToRoom = (ts: number) => {
+        const message = mkMessage({
+            event: true,
+            room: room.roomId,
+            msg: "test thread reply",
+            user: client.getSafeUserId(),
+            ts,
+        });
+
+        // Mock thread reply for tests.
+        jest.spyOn(room, "getThreads").mockReturnValue([
+            // @ts-ignore
+            {
+                lastReply: () => message,
+                timeline: [],
+            } as Thread,
+        ]);
+    };
+
     beforeEach(() => {
         sdkContext = new TestSdkContext();
 
@@ -262,14 +293,7 @@ describe("RoomTile", () => {
 
         describe("and there is a message in the room", () => {
             beforeEach(() => {
-                const message = mkMessage({
-                    event: true,
-                    room: room.roomId,
-                    msg: "test message",
-                    user: client.getSafeUserId(),
-                });
-
-                room.timeline.push(message);
+                addMessageToRoom(23);
             });
 
             it("should render as expected", async () => {
@@ -281,27 +305,33 @@ describe("RoomTile", () => {
 
         describe("and there is a message in a thread", () => {
             beforeEach(() => {
-                const message = mkMessage({
-                    event: true,
-                    room: room.roomId,
-                    msg: "test thread reply",
-                    user: client.getSafeUserId(),
-                });
+                addThreadMessageToRoom(23);
+            });
+
+            it("should render as expected", async () => {
+                renderRoomTile();
+                expect(await screen.findByText("test thread reply")).toBeInTheDocument();
+                expect(renderResult.asFragment()).toMatchSnapshot();
+            });
+        });
+
+        describe("and there is a mesage and a thread without a reply", () => {
+            beforeEach(() => {
+                addMessageToRoom(23);
 
                 // Mock thread reply for tests.
                 jest.spyOn(room, "getThreads").mockReturnValue([
                     // @ts-ignore
                     {
-                        lastReply: () => message,
+                        lastReply: () => null,
                         timeline: [],
                     } as Thread,
                 ]);
             });
 
-            it("should render as expected", async () => {
+            it("should render the message preview", async () => {
                 renderRoomTile();
-                expect(await screen.findByText("test thread reply")).toBeInTheDocument();
-                expect(renderResult.asFragment()).toMatchSnapshot();
+                expect(await screen.findByText("test message")).toBeInTheDocument();
             });
         });
     });