Merge pull request #11652 from matrix-org/andybalaam/fix-flake-in-edi…

…ting-test Fix flaky tests around editing messages
matrix-org · Sep 25, 2023 · 5901920 · 5901920
2 parents 0f59298 + 25a462a
commit 5901920
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/cypress/e2e/read-receipts/editing-messages.spec.ts b/cypress/e2e/read-receipts/editing-messages.spec.ts
@@ -263,21 +263,17 @@ describe("Read receipts", () => {
                 assertRead(room2);
             });
             it("A room where all edits are read is still read after restart", () => {
-                // Given an edit made the room unread
-                goTo(room2);
-                receiveMessages(room2, ["Msg1"]);
-                assertRead(room2);
-                receiveMessages(room2, [editOf("Msg1", "Msg1 Edit1")]);
+                // Given a message was edited and read
+                goTo(room1);
+                receiveMessages(room2, ["Msg1", editOf("Msg1", "Msg1 Edit1")]);
                 assertUnread(room2, 1);
-
-                // When I mark it as read
-                markAsRead(room2);
-
-                // Then the room becomes read
+                goTo(room2);
                 assertRead(room2);
 
-                // And remains so after a reload
+                // When I reload
                 saveAndReload();
+
+                // Then the room is still read
                 assertRead(room2);
             });
         });
@@ -371,7 +367,7 @@ describe("Read receipts", () => {
             it("A room where all threaded edits are read is still read after restart", () => {
                 goTo(room2);
                 receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1"), editOf("Resp1", "Edit1")]);
-                assertUnread(room2, 2);
+                assertUnread(room2, 1);
                 openThread("Msg1");
                 assertRead(room2);
                 goTo(room1); // Make sure we are looking at room1 after reload