From 43129441db9a98798ebf2331fd93e5d3c3c242ee Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Thu, 22 Feb 2024 16:54:46 +0100 Subject: [PATCH] test: rename another `logged_in_client` to `logged_in_client_with_server` --- .../tests/integration/encryption_sync_service.rs | 10 +++++----- crates/matrix-sdk-ui/tests/integration/main.rs | 2 +- .../tests/integration/notification_client.rs | 6 +++--- .../tests/integration/room_list_service.rs | 4 ++-- .../tests/integration/sync_service.rs | 4 ++-- .../tests/integration/timeline/echo.rs | 10 +++++----- .../tests/integration/timeline/edit.rs | 10 +++++----- .../tests/integration/timeline/mod.rs | 10 +++++----- .../tests/integration/timeline/pagination.rs | 16 ++++++++-------- .../tests/integration/timeline/profiles.rs | 4 ++-- .../tests/integration/timeline/queue.rs | 8 ++++---- .../tests/integration/timeline/read_receipts.rs | 14 +++++++------- .../tests/integration/timeline/replies.rs | 10 +++++----- .../tests/integration/timeline/sliding_sync.rs | 4 ++-- .../tests/integration/timeline/subscribe.rs | 10 +++++----- 15 files changed, 61 insertions(+), 61 deletions(-) diff --git a/crates/matrix-sdk-ui/tests/integration/encryption_sync_service.rs b/crates/matrix-sdk-ui/tests/integration/encryption_sync_service.rs index 75c80ff43..e0bf16c62 100644 --- a/crates/matrix-sdk-ui/tests/integration/encryption_sync_service.rs +++ b/crates/matrix-sdk-ui/tests/integration/encryption_sync_service.rs @@ -10,14 +10,14 @@ use tokio::sync::Mutex as AsyncMutex; use wiremock::{Mock, MockGuard, MockServer, Request, ResponseTemplate}; use crate::{ - logged_in_client, + logged_in_client_with_server, sliding_sync::{check_requests, PartialSlidingSyncRequest, SlidingSyncMatcher}, sliding_sync_then_assert_request_and_fake_response, }; #[async_test] async fn test_smoke_encryption_sync_works() -> anyhow::Result<()> { - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_permit = Arc::new(AsyncMutex::new(EncryptionSyncPermit::new_for_testing())); let sync_permit_guard = sync_permit.clone().lock_owned().await; @@ -161,7 +161,7 @@ async fn setup_mocking_sliding_sync_server(server: &MockServer) -> MockGuard { #[async_test] async fn test_encryption_sync_one_fixed_iteration() -> anyhow::Result<()> { - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let _guard = setup_mocking_sliding_sync_server(&server).await; @@ -193,7 +193,7 @@ async fn test_encryption_sync_one_fixed_iteration() -> anyhow::Result<()> { #[async_test] async fn test_encryption_sync_two_fixed_iterations() -> anyhow::Result<()> { - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let _guard = setup_mocking_sliding_sync_server(&server).await; @@ -230,7 +230,7 @@ async fn test_encryption_sync_two_fixed_iterations() -> anyhow::Result<()> { #[async_test] async fn test_encryption_sync_always_reloads_todevice_token() -> anyhow::Result<()> { - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_permit = Arc::new(AsyncMutex::new(EncryptionSyncPermit::new_for_testing())); let sync_permit_guard = sync_permit.lock_owned().await; diff --git a/crates/matrix-sdk-ui/tests/integration/main.rs b/crates/matrix-sdk-ui/tests/integration/main.rs index c050b3153..6a0c5dfe1 100644 --- a/crates/matrix-sdk-ui/tests/integration/main.rs +++ b/crates/matrix-sdk-ui/tests/integration/main.rs @@ -29,7 +29,7 @@ mod timeline; matrix_sdk_test::init_tracing_for_tests!(); -async fn logged_in_client() -> (Client, MockServer) { +async fn logged_in_client_with_server() -> (Client, MockServer) { let server = MockServer::start().await; let client = test_utils::logged_in_client(Some(server.uri().to_string())).await; (client, server) diff --git a/crates/matrix-sdk-ui/tests/integration/notification_client.rs b/crates/matrix-sdk-ui/tests/integration/notification_client.rs index bf74992af..d141a3577 100644 --- a/crates/matrix-sdk-ui/tests/integration/notification_client.rs +++ b/crates/matrix-sdk-ui/tests/integration/notification_client.rs @@ -20,14 +20,14 @@ use wiremock::{ }; use crate::{ - logged_in_client, mock_encryption_state, mock_sync, + logged_in_client_with_server, mock_encryption_state, mock_sync, sliding_sync::{check_requests, PartialSlidingSyncRequest, SlidingSyncMatcher}, }; #[async_test] async fn test_notification_client_with_context() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); @@ -113,7 +113,7 @@ async fn test_notification_client_with_context() { #[async_test] async fn test_notification_client_sliding_sync() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let event_id = event_id!("$example_event_id"); let sender = user_id!("@user:example.org"); diff --git a/crates/matrix-sdk-ui/tests/integration/room_list_service.rs b/crates/matrix-sdk-ui/tests/integration/room_list_service.rs index 9a9967c4d..6d3512525 100644 --- a/crates/matrix-sdk-ui/tests/integration/room_list_service.rs +++ b/crates/matrix-sdk-ui/tests/integration/room_list_service.rs @@ -32,12 +32,12 @@ use tokio::{spawn, sync::mpsc::channel, task::yield_now}; use wiremock::MockServer; use crate::{ - logged_in_client, + logged_in_client_with_server, timeline::sliding_sync::{assert_timeline_stream, timeline_event}, }; async fn new_room_list_service() -> Result<(Client, MockServer, RoomListService), Error> { - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let room_list = RoomListService::new(client.clone()).await?; Ok((client, server, room_list)) diff --git a/crates/matrix-sdk-ui/tests/integration/sync_service.rs b/crates/matrix-sdk-ui/tests/integration/sync_service.rs index b901edb2f..6e5ac3e7d 100644 --- a/crates/matrix-sdk-ui/tests/integration/sync_service.rs +++ b/crates/matrix-sdk-ui/tests/integration/sync_service.rs @@ -24,7 +24,7 @@ use stream_assert::{assert_next_matches, assert_pending}; use wiremock::{Match as _, Mock, MockGuard, MockServer, Request, ResponseTemplate}; use crate::{ - logged_in_client, + logged_in_client_with_server, sliding_sync::{PartialSlidingSyncRequest, SlidingSyncMatcher}, }; @@ -61,7 +61,7 @@ async fn setup_mocking_sliding_sync_server( #[async_test] async fn test_sync_service_state() -> anyhow::Result<()> { - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let encryption_pos = Arc::new(Mutex::new(0)); let room_pos = Arc::new(Mutex::new(0)); diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/echo.rs b/crates/matrix-sdk-ui/tests/integration/timeline/echo.rs index 06cd9842d..8ce355579 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/echo.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/echo.rs @@ -35,12 +35,12 @@ use wiremock::{ Mock, ResponseTemplate, }; -use crate::{logged_in_client, mock_encryption_state, mock_sync}; +use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync}; #[async_test] async fn test_echo() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -130,7 +130,7 @@ async fn test_echo() { #[async_test] async fn test_retry_failed() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -186,7 +186,7 @@ async fn test_retry_failed() { #[async_test] async fn test_dedup_by_event_id_late() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -255,7 +255,7 @@ async fn test_dedup_by_event_id_late() { #[async_test] async fn test_cancel_failed() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/edit.rs b/crates/matrix-sdk-ui/tests/integration/timeline/edit.rs index 2611ec688..34be807a6 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/edit.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/edit.rs @@ -46,12 +46,12 @@ use wiremock::{ Mock, ResponseTemplate, }; -use crate::{logged_in_client, mock_encryption_state, mock_sync}; +use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync}; #[async_test] async fn test_edit() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); @@ -156,7 +156,7 @@ async fn test_edit() { #[async_test] async fn test_send_edit() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); @@ -227,7 +227,7 @@ async fn test_send_edit() { #[async_test] async fn test_send_reply_edit() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); @@ -314,7 +314,7 @@ async fn test_send_reply_edit() { #[async_test] async fn test_send_edit_poll() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/mod.rs b/crates/matrix-sdk-ui/tests/integration/timeline/mod.rs index 231bf0cb6..7ab40f35e 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/mod.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/mod.rs @@ -26,7 +26,7 @@ use matrix_sdk_test::{ use matrix_sdk_ui::timeline::{RoomExt, TimelineItemContent, VirtualTimelineItem}; use ruma::{room_id, user_id}; -use crate::{logged_in_client, mock_sync}; +use crate::{logged_in_client_with_server, mock_sync}; mod echo; mod edit; @@ -42,7 +42,7 @@ pub(crate) mod sliding_sync; #[async_test] async fn test_reaction() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -151,7 +151,7 @@ async fn test_reaction() { #[async_test] async fn test_redacted_message() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -209,7 +209,7 @@ async fn test_redacted_message() { #[async_test] async fn test_read_marker() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -284,7 +284,7 @@ async fn test_read_marker() { #[async_test] async fn test_sync_highlighted() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/pagination.rs b/crates/matrix-sdk-ui/tests/integration/timeline/pagination.rs index 425e74708..6681a335b 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/pagination.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/pagination.rs @@ -42,12 +42,12 @@ use wiremock::{ Mock, ResponseTemplate, }; -use crate::{logged_in_client, mock_sync}; +use crate::{logged_in_client_with_server, mock_sync}; #[async_test] async fn test_back_pagination() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -138,7 +138,7 @@ async fn test_back_pagination() { #[async_test] async fn test_back_pagination_highlighted() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -225,7 +225,7 @@ async fn test_back_pagination_highlighted() { #[async_test] async fn test_wait_for_token() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let event_builder = EventBuilder::new(); @@ -286,7 +286,7 @@ async fn test_wait_for_token() { #[async_test] async fn test_dedup() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let event_builder = EventBuilder::new(); @@ -342,7 +342,7 @@ async fn test_dedup() { #[async_test] async fn test_timeline_reset_while_paginating() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let event_builder = EventBuilder::new(); @@ -519,7 +519,7 @@ pub static ROOM_MESSAGES_BATCH_2: Lazy = Lazy::new(|| { #[async_test] async fn test_empty_chunk() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -609,7 +609,7 @@ async fn test_empty_chunk() { #[async_test] async fn test_until_num_items_with_empty_chunk() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/profiles.rs b/crates/matrix-sdk-ui/tests/integration/timeline/profiles.rs index 769348ced..1552cba9a 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/profiles.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/profiles.rs @@ -31,11 +31,11 @@ use wiremock::{ Mock, ResponseTemplate, }; -use crate::{logged_in_client, mock_sync}; +use crate::{logged_in_client_with_server, mock_sync}; #[async_test] async fn test_update_sender_profiles() { - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let event_builder = EventBuilder::new(); diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/queue.rs b/crates/matrix-sdk-ui/tests/integration/timeline/queue.rs index c547fb3f0..96c8ec1e0 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/queue.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/queue.rs @@ -30,12 +30,12 @@ use wiremock::{ Mock, ResponseTemplate, }; -use crate::{logged_in_client, mock_encryption_state, mock_sync}; +use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync}; #[async_test] async fn test_message_order() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -107,7 +107,7 @@ async fn test_message_order() { #[async_test] async fn test_retry_order() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -213,7 +213,7 @@ async fn test_retry_order() { #[async_test] async fn test_clear_with_echoes() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let event_builder = EventBuilder::new(); diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/read_receipts.rs b/crates/matrix-sdk-ui/tests/integration/timeline/read_receipts.rs index 015842844..b4045cb50 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/read_receipts.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/read_receipts.rs @@ -40,7 +40,7 @@ use wiremock::{ Mock, ResponseTemplate, }; -use crate::{logged_in_client, mock_sync}; +use crate::{logged_in_client_with_server, mock_sync}; fn filter_notice(ev: &AnySyncTimelineEvent, _room_version: &RoomVersionId) -> bool { match ev { @@ -54,7 +54,7 @@ fn filter_notice(ev: &AnySyncTimelineEvent, _room_version: &RoomVersionId) -> bo #[async_test] async fn test_read_receipts_updates() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let own_user_id = client.user_id().unwrap(); @@ -283,7 +283,7 @@ async fn test_read_receipts_updates() { #[async_test] async fn test_read_receipts_updates_on_filtered_events() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let own_user_id = client.user_id().unwrap(); @@ -495,7 +495,7 @@ async fn test_read_receipts_updates_on_filtered_events() { #[async_test] async fn test_send_single_receipt() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let own_user_id = client.user_id().unwrap(); @@ -842,7 +842,7 @@ async fn test_send_single_receipt() { #[async_test] async fn test_mark_as_read() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let own_user_id = client.user_id().unwrap(); @@ -945,7 +945,7 @@ async fn test_mark_as_read() { #[async_test] async fn test_send_multiple_receipts() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let own_user_id = client.user_id().unwrap(); @@ -1153,7 +1153,7 @@ async fn test_send_multiple_receipts() { #[async_test] async fn test_latest_user_read_receipt() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let own_user_id = client.user_id().unwrap(); diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/replies.rs b/crates/matrix-sdk-ui/tests/integration/timeline/replies.rs index c9f90c073..f75e03f86 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/replies.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/replies.rs @@ -31,12 +31,12 @@ use wiremock::{ Mock, ResponseTemplate, }; -use crate::{logged_in_client, mock_encryption_state, mock_sync}; +use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync}; #[async_test] async fn in_reply_to_details() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); @@ -173,7 +173,7 @@ async fn in_reply_to_details() { #[async_test] async fn transfer_in_reply_to_details_to_re_received_item() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); @@ -255,7 +255,7 @@ async fn transfer_in_reply_to_details_to_re_received_item() { #[async_test] async fn send_reply() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); @@ -346,7 +346,7 @@ async fn send_reply() { #[async_test] async fn send_reply_to_threaded() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let event_builder = EventBuilder::new(); let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs b/crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs index 07f18aabb..a94356369 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs @@ -31,7 +31,7 @@ use ruma::{room_id, user_id, RoomId}; use serde_json::json; use wiremock::{http::Method, Match, Mock, MockServer, Request, ResponseTemplate}; -use crate::logged_in_client; +use crate::logged_in_client_with_server; macro_rules! receive_response { ( @@ -201,7 +201,7 @@ macro_rules! assert_timeline_stream { pub(crate) use assert_timeline_stream; async fn new_sliding_sync(lists: Vec) -> Result<(MockServer, SlidingSync)> { - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let mut sliding_sync_builder = client.sliding_sync("integration-test")?; diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/subscribe.rs b/crates/matrix-sdk-ui/tests/integration/timeline/subscribe.rs index a06f099b8..b9a06c586 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/subscribe.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/subscribe.rs @@ -35,12 +35,12 @@ use ruma::{ use serde_json::json; use stream_assert::{assert_next_matches, assert_pending}; -use crate::{logged_in_client, mock_sync}; +use crate::{logged_in_client_with_server, mock_sync}; #[async_test] async fn test_batched() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let event_builder = EventBuilder::new(); @@ -89,7 +89,7 @@ async fn test_batched() { #[async_test] async fn test_event_filter() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -195,7 +195,7 @@ async fn test_event_filter() { #[async_test] async fn test_timeline_is_reset_when_a_user_is_ignored_or_unignored() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new(); @@ -339,7 +339,7 @@ async fn test_timeline_is_reset_when_a_user_is_ignored_or_unignored() { #[async_test] async fn test_profile_updates() { let room_id = room_id!("!a98sd12bjh:example.org"); - let (client, server) = logged_in_client().await; + let (client, server) = logged_in_client_with_server().await; let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000)); let mut ev_builder = SyncResponseBuilder::new();