From 35057f34779fbc8e05e0b3e758a1550041753545 Mon Sep 17 00:00:00 2001 From: R Midhun Suresh Date: Fri, 3 Nov 2023 14:53:33 +0530 Subject: [PATCH 1/2] Fix broken test --- test/components/structures/TimelinePanel-test.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/components/structures/TimelinePanel-test.tsx b/test/components/structures/TimelinePanel-test.tsx index 2c43fe432b8..f7b204684d1 100644 --- a/test/components/structures/TimelinePanel-test.tsx +++ b/test/components/structures/TimelinePanel-test.tsx @@ -540,13 +540,13 @@ describe("TimelinePanel", () => { type: "m.call.invite", room_id: virtualRoom.roomId, event_id: `virtualCallEvent1`, - origin_server_ts: 0, + origin_server_ts: 2, }); const virtualCallMetaEvent = new MatrixEvent({ type: "org.matrix.call.sdp_stream_metadata_changed", room_id: virtualRoom.roomId, event_id: `virtualCallEvent2`, - origin_server_ts: 0, + origin_server_ts: 2, }); const virtualEvents = [virtualCallInvite, ...mockEvents(virtualRoom), virtualCallMetaEvent]; const { timelineSet: overlayTimelineSet } = getProps(virtualRoom, virtualEvents); From 6e827034c8f63459b01805d1428217d5eb02d1df Mon Sep 17 00:00:00 2001 From: R Midhun Suresh Date: Fri, 3 Nov 2023 18:33:27 +0530 Subject: [PATCH 2/2] Set localTimeStamp for each event --- .../structures/TimelinePanel-test.tsx | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/test/components/structures/TimelinePanel-test.tsx b/test/components/structures/TimelinePanel-test.tsx index f7b204684d1..856cd93ee40 100644 --- a/test/components/structures/TimelinePanel-test.tsx +++ b/test/components/structures/TimelinePanel-test.tsx @@ -89,16 +89,16 @@ const getProps = (room: Room, events: MatrixEvent[]): TimelinePanel["props"] => const mockEvents = (room: Room, count = 2): MatrixEvent[] => { const events: MatrixEvent[] = []; for (let index = 0; index < count; index++) { - events.push( - new MatrixEvent({ - room_id: room.roomId, - event_id: `${room.roomId}_event_${index}`, - type: EventType.RoomMessage, - sender: "userId", - content: createMessageEventContent("`Event${index}`"), - origin_server_ts: index, - }), - ); + const event = new MatrixEvent({ + room_id: room.roomId, + event_id: `${room.roomId}_event_${index}`, + type: EventType.RoomMessage, + sender: "userId", + content: createMessageEventContent("`Event${index}`"), + origin_server_ts: index, + }); + event.localTimestamp = index; + events.push(event); } return events; @@ -540,14 +540,16 @@ describe("TimelinePanel", () => { type: "m.call.invite", room_id: virtualRoom.roomId, event_id: `virtualCallEvent1`, - origin_server_ts: 2, + origin_server_ts: 0, }); + virtualCallInvite.localTimestamp = 2; const virtualCallMetaEvent = new MatrixEvent({ type: "org.matrix.call.sdp_stream_metadata_changed", room_id: virtualRoom.roomId, event_id: `virtualCallEvent2`, - origin_server_ts: 2, + origin_server_ts: 0, }); + virtualCallMetaEvent.localTimestamp = 2; const virtualEvents = [virtualCallInvite, ...mockEvents(virtualRoom), virtualCallMetaEvent]; const { timelineSet: overlayTimelineSet } = getProps(virtualRoom, virtualEvents); @@ -558,7 +560,6 @@ describe("TimelinePanel", () => { overlayTimelineSetFilter={isCallEvent} />, ); - await waitFor(() => expectEvents(container, [ // main timeline events are included