Skip to content

Commit 6d141c0

Browse files
committed
refactor(test): use the event factory in the notable reason read receipt update test
Turns out, the `m.read` event was invalid, because it should've been part of the ephemeral events in the sync response (and not part of the room's timeline response), so the event was dismissed. The test already passed while behaving this way, so let's make it reflect what it did indeed.
1 parent 608091f commit 6d141c0

1 file changed

Lines changed: 6 additions & 20 deletions

File tree

crates/matrix-sdk/src/sliding_sync/client.rs

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,10 @@ mod tests {
391391
RequestedRequiredStates, RoomInfoNotableUpdate, RoomInfoNotableUpdateReasons, RoomState,
392392
notification_settings::RoomNotificationMode,
393393
};
394-
use matrix_sdk_test::async_test;
394+
use matrix_sdk_test::{async_test, event_factory::EventFactory};
395395
use ruma::{
396-
api::client::discovery::get_supported_versions, assign, events::AnySyncTimelineEvent,
397-
room_id, serde::Raw,
396+
api::client::discovery::get_supported_versions, assign, event_id, room_id, serde::Raw,
397+
user_id,
398398
};
399399
use serde_json::json;
400400
use tokio::task::yield_now;
@@ -738,10 +738,10 @@ mod tests {
738738
// When I send sliding sync response containing a couple of events with no read
739739
// receipt.
740740
let room_id = room_id!("!r:e.uk");
741+
let f = EventFactory::new().room(room_id).sender(user_id!("@u:h.uk"));
741742
let events = vec![
742-
make_raw_event("m.room.message", "$3"),
743-
make_raw_event("m.room.message", "$4"),
744-
make_raw_event("m.read", "$5"),
743+
f.text_msg("hi").event_id(event_id!("$3")).into_raw_sync(),
744+
f.text_msg("hi").event_id(event_id!("$4")).into_raw_sync(),
745745
];
746746
let room = assign!(http::response::Room::new(), {
747747
timeline: events,
@@ -800,18 +800,4 @@ mod tests {
800800
// Then the stream gets quiet.
801801
assert!(room_info_notable_update_stream.is_empty());
802802
}
803-
804-
fn make_raw_event(event_type: &str, id: &str) -> Raw<AnySyncTimelineEvent> {
805-
Raw::from_json_string(
806-
json!({
807-
"type": event_type,
808-
"event_id": id,
809-
"content": { "msgtype": "m.text", "body": "my msg" },
810-
"sender": "@u:h.uk",
811-
"origin_server_ts": 12344445,
812-
})
813-
.to_string(),
814-
)
815-
.unwrap()
816-
}
817803
}

0 commit comments

Comments
 (0)