Skip to content

Commit 7ea23d7

Browse files
committed
test(sdk): Port sliding-sync tests to MockMatrixServer and MockClientBuilder
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
1 parent b57746f commit 7ea23d7

File tree

1 file changed

+9
-21
lines changed

1 file changed

+9
-21
lines changed

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

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -290,16 +290,12 @@ mod tests {
290290
use matrix_sdk_test::async_test;
291291
use ruma::{assign, events::AnySyncTimelineEvent, room_id, serde::Raw};
292292
use serde_json::json;
293-
use wiremock::{
294-
matchers::{method, path},
295-
Mock, ResponseTemplate,
296-
};
297293

298294
use super::{get_supported_versions, Version, VersionBuilder};
299295
use crate::{
300296
error::Result,
301297
sliding_sync::{client::SlidingSyncResponseProcessor, http, VersionBuilderError},
302-
test_utils::{logged_in_client, logged_in_client_with_server},
298+
test_utils::{client::MockClientBuilder, mocks::MatrixMockServer},
303299
SlidingSyncList, SlidingSyncMode,
304300
};
305301

@@ -342,7 +338,7 @@ mod tests {
342338

343339
#[async_test]
344340
async fn test_available_sliding_sync_versions_none() {
345-
let (client, _server) = logged_in_client_with_server().await;
341+
let client = MockClientBuilder::new(None).build().await;
346342
let available_versions = client.available_sliding_sync_versions().await;
347343

348344
// `.well-known` and `/versions` aren't available. It's impossible to find any
@@ -352,18 +348,10 @@ mod tests {
352348

353349
#[async_test]
354350
async fn test_available_sliding_sync_versions_native() {
355-
let (client, server) = logged_in_client_with_server().await;
356-
357-
Mock::given(method("GET"))
358-
.and(path("/_matrix/client/versions"))
359-
.respond_with(ResponseTemplate::new(200).set_body_json(json!({
360-
"versions": [],
361-
"unstable_features": {
362-
"org.matrix.simplified_msc3575": true,
363-
},
364-
})))
365-
.mount(&server)
366-
.await;
351+
let server = MatrixMockServer::new().await;
352+
let client = server.client_builder().no_server_versions().build().await;
353+
354+
server.mock_versions().ok_with_unstable_features().mock_once().mount().await;
367355

368356
let available_versions = client.available_sliding_sync_versions().await;
369357

@@ -374,7 +362,7 @@ mod tests {
374362

375363
#[async_test]
376364
async fn test_cache_user_defined_notification_mode() -> Result<()> {
377-
let (client, _server) = logged_in_client_with_server().await;
365+
let client = MockClientBuilder::new(None).build().await;
378366
let room_id = room_id!("!r0:matrix.org");
379367

380368
let sliding_sync = client
@@ -500,8 +488,8 @@ mod tests {
500488
async fn test_read_receipt_can_trigger_a_notable_update_reason() {
501489
use ruma::api::client::sync::sync_events::v5 as http;
502490

503-
// Given a logged-in client
504-
let client = logged_in_client(None).await;
491+
// Given a logged-in client.
492+
let client = MockClientBuilder::new(None).build().await;
505493
client.event_cache().subscribe().unwrap();
506494

507495
let mut room_info_notable_update_stream = client.room_info_notable_update_receiver();

0 commit comments

Comments
 (0)