mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-19 06:04:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

test: rename one logged_in_client to logged_in_client_with_server

Browse Source
This commit is contained in:
Benjamin Bouvier
2024-02-22 16:47:05 +01:00
parent 193f3331e8
commit 5ae2d83457
14 changed files with 93 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
crates/matrix-sdk/tests/integration/client.rs
View File

@@ -45,11 +45,11 @@ use wiremock::{
Mock, Request, ResponseTemplate,
};
use crate::{logged_in_client, mock_sync, no_retry_test_client_with_server};
use crate::{logged_in_client_with_server, mock_sync, no_retry_test_client_with_server};
#[async_test]
async fn sync() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::SYNC, None).await;
@@ -62,7 +62,7 @@ async fn sync() {
#[async_test]
async fn devices() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("GET"))
.and(path("/_matrix/client/r0/devices"))
@@ -155,7 +155,7 @@ async fn resolve_room_alias() {
#[async_test]
async fn join_leave_room() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::SYNC, None).await;
@@ -178,7 +178,7 @@ async fn join_leave_room() {
#[async_test]
async fn join_room_by_id() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/join"))
@@ -197,7 +197,7 @@ async fn join_room_by_id() {
#[async_test]
async fn join_room_by_id_or_alias() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/join/"))
@@ -238,7 +238,7 @@ async fn room_search_all() {
#[async_test]
async fn room_search_filtered() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path("/_matrix/client/r0/publicRooms"))
@@ -258,7 +258,7 @@ async fn room_search_filtered() {
#[async_test]
async fn invited_rooms() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::INVITE_SYNC, None).await;
@@ -274,7 +274,7 @@ async fn invited_rooms() {
#[async_test]
async fn left_rooms() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::LEAVE_SYNC, None).await;
@@ -290,7 +290,7 @@ async fn left_rooms() {
#[async_test]
async fn get_media_content() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let media = client.media();
@@ -358,7 +358,7 @@ async fn get_media_content() {
#[async_test]
async fn get_media_file() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let event_content = ImageMessageEventContent::plain(
"filename.jpg".into(),
@@ -403,7 +403,7 @@ async fn get_media_file() {
#[async_test]
async fn whoami() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("GET"))
.and(path("/_matrix/client/r0/account/whoami"))
@@ -419,7 +419,7 @@ async fn whoami() {
#[async_test]
async fn test_room_update_channel() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let mut rx = client.subscribe_to_room_updates(&DEFAULT_TEST_ROOM_ID);
@@ -444,7 +444,7 @@ async fn test_room_update_channel() {
#[async_test]
async fn test_subscribe_all_room_updates() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let mut rx = client.subscribe_to_all_room_updates();
@@ -504,7 +504,7 @@ async fn test_subscribe_all_room_updates() {
#[cfg(all(feature = "e2e-encryption", not(target_arch = "wasm32")))]
#[async_test]
async fn request_encryption_event_before_sending() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::SYNC, None).await;
client
@@ -555,7 +555,7 @@ async fn request_encryption_event_before_sending() {
// a DM.
#[async_test]
async fn marking_room_as_dm() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::SYNC, None).await;
client
@@ -626,7 +626,7 @@ async fn marking_room_as_dm() {
#[cfg(feature = "e2e-encryption")]
#[async_test]
async fn get_own_device() {
let (client, _) = logged_in_client().await;
let (client, _) = logged_in_client_with_server().await;
let device = client
.encryption()
@@ -649,7 +649,7 @@ async fn get_own_device() {
#[cfg(feature = "e2e-encryption")]
#[async_test]
async fn cross_signing_status() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path("/_matrix/client/unstable/keys/device_signing/upload"))
@@ -710,7 +710,7 @@ async fn test_encrypt_room_event() {
use ruma::events::room::encrypted::RoomEncryptedEventContent;
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let user_id = client.user_id().unwrap();
Mock::given(method("POST"))
@@ -844,7 +844,7 @@ async fn test_encrypt_room_event() {
#[cfg(not(feature = "e2e-encryption"))]
#[async_test]
async fn create_dm_non_encrypted() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let user_id = user_id!("@invitee:localhost");
Mock::given(method("POST"))
@@ -893,7 +893,7 @@ async fn create_dm_non_encrypted() {
#[cfg(feature = "e2e-encryption")]
#[async_test]
async fn create_dm_encrypted() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let user_id = user_id!("@invitee:localhost");
Mock::given(method("POST"))
@@ -955,7 +955,7 @@ async fn create_dm_encrypted() {
#[async_test]
async fn create_dm_error() {
let (client, _server) = logged_in_client().await;
let (client, _server) = logged_in_client_with_server().await;
let user_id = user_id!("@invitee:localhost");
// The endpoint is not mocked so we encounter a 404.
@@ -967,7 +967,7 @@ async fn create_dm_error() {
#[async_test]
async fn test_ambiguity_changes() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let example_id = user_id!("@example:localhost");
let example_2_id = user_id!("@example2:localhost");

4
crates/matrix-sdk/tests/integration/encryption/recovery.rs
View File

@@ -37,7 +37,7 @@ use wiremock::{
};
use crate::{
encryption::mock_secret_store_with_backup_key, logged_in_client,
encryption::mock_secret_store_with_backup_key, logged_in_client_with_server,
no_retry_test_client_with_server, test_client_builder_with_server,
};
@@ -157,7 +157,7 @@ async fn mock_put_new_default_secret_storage_key(user_id: &UserId, server: &wire
#[async_test]
async fn recovery_status_server_unavailable() {
let (client, _) = logged_in_client().await;
let (client, _) = logged_in_client_with_server().await;
client.encryption().wait_for_e2ee_initialization_tasks().await;
assert_eq!(client.encryption().recovery().state(), RecoveryState::Unknown);
}

12
crates/matrix-sdk/tests/integration/encryption/secret_storage.rs
View File

@@ -23,7 +23,7 @@ use wiremock::{
Mock, MockServer, ResponseTemplate,
};
use crate::{logged_in_client, no_retry_test_client_with_server};
use crate::{logged_in_client_with_server, no_retry_test_client_with_server};
const SECRET_STORE_KEY: &str = "EsTj 3yST y93F SLpB jJsz eAXc 2XzA ygD3 w69H fGaN TKBj jXEd";
@@ -65,7 +65,7 @@ async fn mock_secret_store_key(
#[async_test]
async fn secret_store_create_default_key() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let user_id = client.user_id().expect("We should know our user ID by now");
@@ -140,7 +140,7 @@ async fn secret_store_create_default_key() {
#[async_test]
async fn secret_store_missing_key_info() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let user_id = client.user_id().expect("We should know our user ID by now");
let key_id = "bmur2d9ypPUH1msSwCxQOJkuKRmJI55e";
@@ -190,7 +190,7 @@ async fn secret_store_missing_key_info() {
#[async_test]
async fn secret_store_not_setup() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let user_id = client.user_id().expect("We should know our user ID by now");
@@ -221,7 +221,7 @@ async fn secret_store_not_setup() {
#[async_test]
async fn secret_store_opening() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_secret_store_key(
&server,
@@ -269,7 +269,7 @@ async fn secret_store_opening() {
#[async_test]
async fn set_in_secret_store() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_secret_store_key(
&server,

8
crates/matrix-sdk/tests/integration/main.rs
View File

@@ -3,7 +3,7 @@
use matrix_sdk::{
config::SyncSettings,
test_utils::{self, no_retry_test_client, test_client_builder},
test_utils::{logged_in_client, no_retry_test_client, test_client_builder},
Client, ClientBuilder,
};
use matrix_sdk_test::test_json;
@@ -37,14 +37,14 @@ async fn no_retry_test_client_with_server() -> (Client, MockServer) {
(client, server)
}
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;
let client = logged_in_client(Some(server.uri().to_string())).await;
(client, server)
}
async fn synced_client() -> (Client, MockServer) {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::SYNC, None).await;
let sync_settings = SyncSettings::new();

6
crates/matrix-sdk/tests/integration/matrix_auth.rs
View File

@@ -31,11 +31,13 @@ use wiremock::{
Mock, MockServer, Request, ResponseTemplate,
};
use crate::{logged_in_client, no_retry_test_client_with_server, test_client_builder_with_server};
use crate::{
logged_in_client_with_server, no_retry_test_client_with_server, test_client_builder_with_server,
};
#[async_test]
async fn test_restore_session() {
let (client, _) = logged_in_client().await;
let (client, _) = logged_in_client_with_server().await;
let auth = client.matrix_auth();
assert!(auth.logged_in(), "Client should be logged in with the MatrixAuth API");

6
crates/matrix-sdk/tests/integration/notification.rs
View File

@@ -15,11 +15,11 @@ use stream_assert::{assert_pending, assert_ready};
use tokio::sync::mpsc;
use tokio_stream::wrappers::ReceiverStream;
use crate::{logged_in_client, mock_sync};
use crate::{logged_in_client_with_server, mock_sync};
#[async_test]
async fn notifications_joined() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let room_id = room_id!("!joined_room:localhost");
let user_id = client.user_id().unwrap();
@@ -103,7 +103,7 @@ async fn notifications_joined() {
#[async_test]
async fn notifications_invite() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let room_id = room_id!("!invited_room:localhost");
let user_id = client.user_id().unwrap();

6
crates/matrix-sdk/tests/integration/refresh_token.rs
View File

@@ -28,7 +28,9 @@ use wiremock::{
Mock, ResponseTemplate,
};
use crate::{logged_in_client, no_retry_test_client_with_server, test_client_builder_with_server};
use crate::{
logged_in_client_with_server, no_retry_test_client_with_server, test_client_builder_with_server,
};
fn session() -> MatrixSession {
MatrixSession {
@@ -147,7 +149,7 @@ async fn register_refresh_token() {
#[async_test]
async fn no_refresh_token() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
// Refresh token doesn't change.
Mock::given(method("POST"))

18
crates/matrix-sdk/tests/integration/room/common.rs
View File

@@ -20,11 +20,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 user_presence() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::SYNC, None).await;
@@ -48,7 +48,7 @@ async fn user_presence() {
#[async_test]
async fn calculate_room_names_from_summary() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::DEFAULT_SYNC_SUMMARY, None).await;
@@ -61,7 +61,7 @@ async fn calculate_room_names_from_summary() {
#[async_test]
async fn room_names() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::SYNC, None).await;
@@ -89,7 +89,7 @@ async fn room_names() {
#[async_test]
async fn test_state_event_getting() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let sync = json!({
"next_batch": "1234",
@@ -177,7 +177,7 @@ async fn test_state_event_getting() {
#[async_test]
async fn room_route() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let mut ev_builder = SyncResponseBuilder::new();
let room_id = &*DEFAULT_TEST_ROOM_ID;
@@ -349,7 +349,7 @@ async fn room_route() {
#[async_test]
async fn room_permalink() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let mut ev_builder = SyncResponseBuilder::new();
let room_id = room_id!("!test_room:127.0.0.1");
@@ -438,7 +438,7 @@ async fn room_permalink() {
#[async_test]
async fn room_event_permalink() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let mut ev_builder = SyncResponseBuilder::new();
let room_id = room_id!("!test_room:127.0.0.1");
let event_id = event_id!("$15139375512JaHAW");
@@ -503,7 +503,7 @@ async fn room_event_permalink() {
async fn event() {
let event_id = event_id!("$foun39djjod0f");
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();

38
crates/matrix-sdk/tests/integration/room/joined.rs
View File

@@ -29,11 +29,11 @@ use wiremock::{
Mock, ResponseTemplate,
};
use crate::{logged_in_client, mock_encryption_state, mock_sync, synced_client};
use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync, synced_client};
#[async_test]
async fn invite_user_by_id() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/invite$"))
@@ -56,7 +56,7 @@ async fn invite_user_by_id() {
#[async_test]
async fn invite_user_by_3pid() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/invite$"))
@@ -88,7 +88,7 @@ async fn invite_user_by_3pid() {
#[async_test]
async fn leave_room() -> Result<(), anyhow::Error> {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/leave$"))
@@ -114,7 +114,7 @@ async fn leave_room() -> Result<(), anyhow::Error> {
#[async_test]
async fn ban_user() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/ban$"))
@@ -137,7 +137,7 @@ async fn ban_user() {
#[async_test]
async fn unban_user() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/unban$"))
@@ -160,7 +160,7 @@ async fn unban_user() {
#[async_test]
async fn test_mark_as_unread() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("PUT"))
.and(path_regex(
@@ -186,7 +186,7 @@ async fn test_mark_as_unread() {
#[async_test]
async fn kick_user() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/kick$"))
@@ -209,7 +209,7 @@ async fn kick_user() {
#[async_test]
async fn send_single_receipt() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/receipt"))
@@ -232,7 +232,7 @@ async fn send_single_receipt() {
#[async_test]
async fn send_multiple_receipts() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/read_markers$"))
@@ -256,7 +256,7 @@ async fn send_multiple_receipts() {
#[async_test]
async fn typing_notice() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("PUT"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/typing"))
@@ -280,7 +280,7 @@ async fn typing_notice() {
async fn room_state_event_send() {
use ruma::events::room::member::{MembershipState, RoomMemberEventContent};
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("PUT"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/state/.*"))
@@ -308,7 +308,7 @@ async fn room_state_event_send() {
#[async_test]
async fn room_message_send() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("PUT"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/send/.*"))
@@ -335,7 +335,7 @@ async fn room_message_send() {
#[async_test]
async fn room_attachment_send() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("PUT"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/send/.*"))
@@ -383,7 +383,7 @@ async fn room_attachment_send() {
#[async_test]
async fn room_attachment_send_info() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("PUT"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/send/.*"))
@@ -435,7 +435,7 @@ async fn room_attachment_send_info() {
#[async_test]
async fn room_attachment_send_wrong_info() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("PUT"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/send/.*"))
@@ -486,7 +486,7 @@ async fn room_attachment_send_wrong_info() {
#[async_test]
async fn room_attachment_send_info_thumbnail() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("PUT"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/send/.*"))
@@ -644,7 +644,7 @@ async fn set_name() {
#[async_test]
async fn report_content() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let reason = "I am offended";
let score = int!(-80);
@@ -677,7 +677,7 @@ async fn report_content() {
#[async_test]
async fn subscribe_to_typing_notifications() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let typing_sequences: Arc<Mutex<Vec<Vec<OwnedUserId>>>> = Arc::new(Mutex::new(Vec::new()));
// The expected typing sequences that we will receive, note that the current
// user_id is filtered out.

6
crates/matrix-sdk/tests/integration/room/left.rs
View File

@@ -9,11 +9,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 forget_room() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/forget$"))
@@ -35,7 +35,7 @@ async fn forget_room() {
#[async_test]
async fn rejoin_room() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
Mock::given(method("POST"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/join"))

4
crates/matrix-sdk/tests/integration/room/notification_mode.rs
View File

@@ -14,13 +14,13 @@ use wiremock::{
Mock, ResponseTemplate,
};
use crate::{logged_in_client, mock_sync};
use crate::{logged_in_client_with_server, mock_sync};
#[async_test]
async fn get_notification_mode() {
let room_no_rules_id = room_id!("!jEsUZKDJdhlrceRyVU:localhost");
let room_not_joined_id = room_id!("!aBfUOMDJhmtucfVzGa:localhost");
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));

20
crates/matrix-sdk/tests/integration/room/spaces.rs
View File

@@ -12,7 +12,7 @@ use wiremock::{
Mock, ResponseTemplate,
};
use crate::{logged_in_client, mock_sync, MockServer};
use crate::{logged_in_client_with_server, mock_sync, MockServer};
pub static DEFAULT_TEST_SPACE_ID: Lazy<&RoomId> =
Lazy::new(|| room_id!("!hIMjEx205EXNyjVPCV:localhost"));
@@ -153,7 +153,7 @@ async fn sync_space(
#[async_test]
async fn no_parent_space() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_sync(&server, &*test_json::SYNC, None).await;
@@ -170,7 +170,7 @@ async fn no_parent_space() {
#[async_test]
async fn parent_space_undeserializable() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let mut sync = PARENT_SPACE_SYNC.clone();
sync["rooms"]["join"][DEFAULT_TEST_ROOM_ID.as_str()]["timeline"]["events"][0]["content"]
@@ -186,7 +186,7 @@ async fn parent_space_undeserializable() {
#[async_test]
async fn parent_space_redacted() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let mut sync = PARENT_SPACE_SYNC.clone();
let timeline = &mut sync["rooms"]["join"][DEFAULT_TEST_ROOM_ID.as_str()]["timeline"]["events"];
@@ -215,7 +215,7 @@ async fn parent_space_redacted() {
#[async_test]
async fn parent_space_unverifiable() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
initial_sync_with_m_space_parent(&client, &server, &PARENT_SPACE_SYNC).await;
@@ -230,7 +230,7 @@ async fn parent_space_unverifiable() {
#[async_test]
async fn parent_space_illegitimate() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_members(&server).await;
@@ -249,7 +249,7 @@ async fn parent_space_illegitimate() {
#[async_test]
async fn parent_space_reciprocal() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let sync_token = initial_sync_with_m_space_parent(&client, &server, &PARENT_SPACE_SYNC).await;
@@ -286,7 +286,7 @@ async fn parent_space_reciprocal() {
#[async_test]
async fn parent_space_redacted_reciprocal() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
mock_members(&server).await;
@@ -374,7 +374,7 @@ async fn setup_parent_member(
#[async_test]
async fn parent_space_powerlevel() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let sync_token = initial_sync_with_m_space_parent(&client, &server, &PARENT_SPACE_SYNC).await;
@@ -391,7 +391,7 @@ async fn parent_space_powerlevel() {
#[async_test]
async fn parent_space_powerlevel_too_low() {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
let sync_token = initial_sync_with_m_space_parent(&client, &server, &PARENT_SPACE_SYNC).await;

4
crates/matrix-sdk/tests/integration/room/tags.rs
View File

@@ -14,7 +14,7 @@ use wiremock::{
Mock, MockServer, ResponseTemplate,
};
use crate::{logged_in_client, mock_sync};
use crate::{logged_in_client_with_server, mock_sync};
enum TagOperation {
Set,
@@ -70,7 +70,7 @@ async fn synced_client_with_room(
ev_builder: &mut SyncResponseBuilder,
room_id: &RoomId,
) -> (Client, Room, MockServer) {
let (client, server) = logged_in_client().await;
let (client, server) = logged_in_client_with_server().await;
ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
mock_sync(&server, ev_builder.build_json_sync_response(), None).await;

4
crates/matrix-sdk/tests/integration/widget.rs
View File

@@ -48,7 +48,7 @@ use wiremock::{
Mock, MockServer, ResponseTemplate,
};
use crate::{logged_in_client, mock_encryption_state, mock_sync};
use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync};
/// Create a JSON string from a [`json!`][serde_json::json] "literal".
#[macro_export]
@@ -70,7 +70,7 @@ async fn run_test_driver(init_on_content_load: bool) -> (Client, MockServer, Wid
}
}
let (client, mock_server) = logged_in_client().await;
let (client, mock_server) = logged_in_client_with_server().await;
let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
let mut sync_builder = SyncResponseBuilder::new();