PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix read receipt tests with incorrect read counts (#11465)

Browse source 
These counts were transiently correct if the client was slow enough, so
the tests usually passed, but actually they were wrong.
This commit is contained in:
Andy Balaam 2023-08-25 10:20:43 +01:00 committed by GitHub
parent 23897dff4f
commit 5b290196cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cypress/e2e/read-receipts/high-level.spec.ts
View file

@ -452,7 +452,7 @@ describe("Read receipts", () => {
// Given a thread exists // Given a thread exists
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]); receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]);
assertUnread(room2, 1); assertUnread(room2, 2);
goTo(room2); goTo(room2);
openThread("Msg1"); openThread("Msg1");
@ -462,7 +462,7 @@ describe("Read receipts", () => {
// Given a thread exists // Given a thread exists
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1"), threadedOff("Msg1", "Resp2")]); receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1"), threadedOff("Msg1", "Resp2")]);
assertUnread(room2, 2); // (Sanity) assertUnread(room2, 3); // (Sanity)
// When I read the main timeline // When I read the main timeline
goTo(room2); goTo(room2);
@ -481,7 +481,7 @@ describe("Read receipts", () => {
receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1"), "Msg2", threadedOff("Msg2", "Resp2")]); receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1"), "Msg2", threadedOff("Msg2", "Resp2")]);
assertUnread(room2, 4); assertUnread(room2, 4);
goTo(room2); goTo(room2);
assertUnread(room2, 4); assertUnread(room2, 2);
openThread("Msg1"); openThread("Msg1");
assertUnread(room2, 1); assertUnread(room2, 1);
@ -562,7 +562,7 @@ describe("Read receipts", () => {
// Given a thread exists // Given a thread exists
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1"), threadedOff("Msg1", "Resp2")]); receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1"), threadedOff("Msg1", "Resp2")]);
assertUnread(room2, 2); // (Sanity) assertUnread(room2, 3); // (Sanity)
// When I read the main timeline // When I read the main timeline
goTo(room2); goTo(room2);
@ -609,7 +609,7 @@ describe("Read receipts", () => {
goTo(room2); goTo(room2);
// Then room does appear unread // Then room does appear unread
assertUnread(room2, 2); assertUnread(room2, 1);
assertUnreadThread("Msg1"); assertUnreadThread("Msg1");
}); });
it.skip("Reading a thread root within the thread view marks it as read in the main timeline", () => {}); it.skip("Reading a thread root within the thread view marks it as read in the main timeline", () => {});
@ -701,7 +701,7 @@ describe("Read receipts", () => {
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", replyTo("Msg1", "Reply1")]); receiveMessages(room2, ["Msg1", replyTo("Msg1", "Reply1")]);
assertUnread(room2, 1); assertUnread(room2, 2);
goTo(room2); goTo(room2);
assertRead(room2); assertRead(room2);
@ -718,7 +718,7 @@ describe("Read receipts", () => {
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", replyTo("Msg1", "Reply1")]); receiveMessages(room2, ["Msg1", replyTo("Msg1", "Reply1")]);
assertUnread(room2, 1); assertUnread(room2, 2);
markAsRead(room2); markAsRead(room2);
// When an edit appears in the room // When an edit appears in the room
@ -769,7 +769,7 @@ describe("Read receipts", () => {
it("An edit of a threaded message makes the room unread", () => { it("An edit of a threaded message makes the room unread", () => {
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]); receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]);
assertUnread(room2, 1); assertUnread(room2, 2);
goTo(room2); goTo(room2);
openThread("Msg1"); openThread("Msg1");
@ -782,7 +782,7 @@ describe("Read receipts", () => {
it("Reading an edit of a threaded message makes the room read", () => { it("Reading an edit of a threaded message makes the room read", () => {
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]); receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]);
assertUnread(room2, 1); assertUnread(room2, 2);
goTo(room2); goTo(room2);
openThread("Msg1"); openThread("Msg1");
@ -799,7 +799,7 @@ describe("Read receipts", () => {
it("Marking a room as read after an edit in a thread makes it read", () => { it("Marking a room as read after an edit in a thread makes it read", () => {
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1"), editOf("Resp1", "Edit1")]); receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1"), editOf("Resp1", "Edit1")]);
assertUnread(room2, 2); assertUnread(room2, 3); // TODO: the edit counts as a message!
markAsRead(room2); markAsRead(room2);
assertRead(room2); assertRead(room2);
@ -807,13 +807,13 @@ describe("Read receipts", () => {
it.skip("Editing a thread message after marking as read makes the room unread", () => { it.skip("Editing a thread message after marking as read makes the room unread", () => {
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]); receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]);
assertUnread(room2, 1); assertUnread(room2, 2);
markAsRead(room2); markAsRead(room2);
assertRead(room2); assertRead(room2);
receiveMessages(room2, [editOf("Resp1", "Edit1")]); receiveMessages(room2, [editOf("Resp1", "Edit1")]);
assertUnread(room2, 1); assertUnread(room2, 1); // TODO: should this edit make us unread?
}); });
it("A room with an edited threaded message is still unread after restart", () => { it("A room with an edited threaded message is still unread after restart", () => {
goTo(room1); goTo(room1);
@ -840,7 +840,7 @@ describe("Read receipts", () => {
it("An edit of a thread root makes the room unread", () => { it("An edit of a thread root makes the room unread", () => {
goTo(room1); goTo(room1);
receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]); receiveMessages(room2, ["Msg1", threadedOff("Msg1", "Resp1")]);
assertUnread(room2, 1); assertUnread(room2, 2);
goTo(room2); goTo(room2);
openThread("Msg1"); openThread("Msg1");
@ -983,7 +983,7 @@ describe("Read receipts", () => {
goTo(room1); goTo(room1);
assertRead(room2); assertRead(room2);
receiveMessages(room2, ["Msg1", "Msg2"]); receiveMessages(room2, ["Msg1", "Msg2"]);
assertUnread(room2, 1); assertUnread(room2, 2);
// When I read the main timeline // When I read the main timeline
goTo(room2); goTo(room2);