Update tests in anticipation of matrix-js-sdk#3901 (#11956)

* Update tests in anticipation of matrix-js-sdk#3901

* Formatting
This commit is contained in:
Andy Balaam 2023-11-28 13:59:03 +00:00 committed by GitHub
parent 83f0650ed4
commit e76a37e01f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 5 deletions

View file

@ -228,6 +228,22 @@ describe("Unread", () => {
});
room.addReceipt(receipt);
// Create a read thread, so we don't consider all threads read
// because there are no threaded read receipts.
const { rootEvent, events } = mkThread({ room, client, authorId: myId, participantUserIds: [aliceId] });
const receipt2 = new MatrixEvent({
type: "m.receipt",
room_id: "!foo:bar",
content: {
[events[events.length - 1].getId()!]: {
[ReceiptType.Read]: {
[myId]: { ts: 1, thread_id: rootEvent.getId() },
},
},
},
});
room.addReceipt(receipt2);
// Create a thread as a different user.
mkThread({ room, client, authorId: myId, participantUserIds: [aliceId] });
@ -315,7 +331,7 @@ describe("Unread", () => {
content: {
[events[0].getId()!]: {
[ReceiptType.Read]: {
[myId]: { ts: 1, threadId: rootEvent.getId()! },
[myId]: { ts: 1, thread_id: rootEvent.getId()! },
},
},
},
@ -325,7 +341,8 @@ describe("Unread", () => {
expect(doesRoomHaveUnreadMessages(room)).toBe(true);
});
it("returns false when the event for a thread receipt can't be found, but the receipt ts is late", () => {
// Fails with current implementation. Will be fixed or replaced after matrix-js-sdk#3901
it.skip("returns false when the event for a thread receipt can't be found, but the receipt ts is late", () => {
// Given a room that is read
let receipt = new MatrixEvent({
type: "m.receipt",
@ -356,7 +373,7 @@ describe("Unread", () => {
content: {
["UNKNOWN_EVENT_ID"]: {
[ReceiptType.Read]: {
[myId]: { ts: receiptTs, threadId: rootEvent.getId()! },
[myId]: { ts: receiptTs, thread_id: rootEvent.getId()! },
},
},
},
@ -381,6 +398,27 @@ describe("Unread", () => {
});
room.addReceipt(receipt);
// Create a read thread, so we don't consider all threads read
// because there are no threaded read receipts.
const { rootEvent: rootEvent1, events: events1 } = mkThread({
room,
client,
authorId: myId,
participantUserIds: [aliceId],
});
const receipt2 = new MatrixEvent({
type: "m.receipt",
room_id: "!foo:bar",
content: {
[events1[events1.length - 1].getId()!]: {
[ReceiptType.Read]: {
[myId]: { ts: 1, thread_id: rootEvent1.getId() },
},
},
},
});
room.addReceipt(receipt2);
// And a thread
const { rootEvent, events } = mkThread({ room, client, authorId: myId, participantUserIds: [aliceId] });
@ -397,7 +435,7 @@ describe("Unread", () => {
content: {
["UNKNOWN_EVENT_ID"]: {
[ReceiptType.Read]: {
[myId]: { ts: receiptTs, threadId: rootEvent.getId()! },
[myId]: { ts: receiptTs, thread_id: rootEvent.getId()! },
},
},
},

View file

@ -106,6 +106,21 @@ describe("LegacyRoomHeaderButtons-test.tsx", function () {
authorId: client.getUserId()!,
participantUserIds: ["@alice:example.org"],
});
// We need some receipt, otherwise we treat this thread as
// "older than all threaded receipts" and consider it read.
let receipt = new MatrixEvent({
type: "m.receipt",
room_id: room.roomId,
content: {
[events[0].getId()!]: {
// Receipt for the first event in the thread
[ReceiptType.Read]: {
[client.getUserId()!]: { ts: 1, thread_id: rootEvent.getId() },
},
},
},
});
room.addReceipt(receipt);
expect(isIndicatorOfType(container, "bold")).toBe(true);
// Sending the last event should clear the notification.
@ -145,7 +160,7 @@ describe("LegacyRoomHeaderButtons-test.tsx", function () {
expect(isIndicatorOfType(container, "bold")).toBe(true);
// Sending a read receipt on an earlier event shouldn't do anything.
let receipt = new MatrixEvent({
receipt = new MatrixEvent({
type: "m.receipt",
room_id: room.roomId,
content: {