From 7a06bdb6950f74167e697e795babc8e12e1a5aa3 Mon Sep 17 00:00:00 2001 From: bitfriend Date: Wed, 19 Feb 2025 21:29:51 +0800 Subject: [PATCH] Rename snapshots to reduce filename length (#4625) --- .../group_sessions/share_strategy.rs | 22 ++++++++++++++----- ...evice_of_verification_violation_user.snap} | 0 ...p => serialize_device_based_strategy.snap} | 0 ...re_with_unverified_dehydrated_device.snap} | 0 ...hare_with_verified_dehydrated_device.snap} | 0 ...erified_device_of_pin_violation_user.snap} | 0 6 files changed, 16 insertions(+), 6 deletions(-) rename crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/{matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__prepare_machine_with_dehydrated_device_of_verification_violation_user.snap => prepare_machine_with_dehydrated_device_of_verification_violation_user.snap} (100%) rename crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/{matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__serialize_device_based_strategy.snap => serialize_device_based_strategy.snap} (100%) rename crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/{matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__should_not_share_with_unverified_dehydrated_device.snap => should_not_share_with_unverified_dehydrated_device.snap} (100%) rename crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/{matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__should_share_with_verified_dehydrated_device.snap => should_share_with_verified_dehydrated_device.snap} (100%) rename crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/{matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__should_share_with_verified_device_of_pin_violation_user.snap => should_share_with_verified_device_of_pin_violation_user.snap} (100%) diff --git a/crates/matrix-sdk-crypto/src/session_manager/group_sessions/share_strategy.rs b/crates/matrix-sdk-crypto/src/session_manager/group_sessions/share_strategy.rs index 65dbd120e..b40c1d0b7 100644 --- a/crates/matrix-sdk-crypto/src/session_manager/group_sessions/share_strategy.rs +++ b/crates/matrix-sdk-crypto/src/session_manager/group_sessions/share_strategy.rs @@ -676,7 +676,7 @@ mod tests { use assert_matches::assert_matches; use assert_matches2::assert_let; - use insta::assert_snapshot; + use insta::{assert_snapshot, with_settings}; use matrix_sdk_common::deserialized_responses::WithheldCode; use matrix_sdk_test::{ async_test, test_json, @@ -746,7 +746,9 @@ mod tests { fn test_serialize_device_based_strategy() { let encryption_settings = all_devices_strategy_settings(); let serialized = serde_json::to_string(&encryption_settings).unwrap(); - assert_snapshot!(serialized); + with_settings!({prepend_module_to_snapshot => false}, { + assert_snapshot!(serialized) + }); } /// [`CollectStrategy::AllDevices`] used to be known as @@ -1340,7 +1342,9 @@ mod tests { .with_dehydrated_device(bob_dehydrated_device_id, true) .build_response(); allow_duplicates! { - with_settings!({sort_maps => true}, { assert_json_snapshot!(ruma_response_to_json(keys_query.clone())) }); + with_settings!({ sort_maps => true, prepend_module_to_snapshot => false }, { + assert_json_snapshot!(ruma_response_to_json(keys_query.clone())) + }); } machine.mark_request_as_sent(&TransactionId::new(), &keys_query).await.unwrap(); @@ -1394,7 +1398,9 @@ mod tests { .with_dehydrated_device(bob_dehydrated_device_id, false) .build_response(); allow_duplicates! { - with_settings!({sort_maps => true}, { assert_json_snapshot!(ruma_response_to_json(keys_query.clone())) }); + with_settings!({ sort_maps => true, prepend_module_to_snapshot => false }, { + assert_json_snapshot!(ruma_response_to_json(keys_query.clone())) + }); } machine.mark_request_as_sent(&TransactionId::new(), &keys_query).await.unwrap(); @@ -1460,7 +1466,9 @@ mod tests { .with_dehydrated_device(bob_dehydrated_device_id, true) .build_response(); allow_duplicates! { - with_settings!({sort_maps => true}, { assert_json_snapshot!(ruma_response_to_json(keys_query.clone())) }); + with_settings!({ sort_maps => true, prepend_module_to_snapshot => false }, { + assert_json_snapshot!(ruma_response_to_json(keys_query.clone())) + }); } machine.mark_request_as_sent(&TransactionId::new(), &keys_query).await.unwrap(); @@ -1589,7 +1597,9 @@ mod tests { .with_dehydrated_device(bob_dehydrated_device_id, true) .build_response(); allow_duplicates! { - with_settings!({sort_maps => true}, { assert_json_snapshot!(ruma_response_to_json(keys_query.clone())) }); + with_settings!({ sort_maps => true, prepend_module_to_snapshot => false }, { + assert_json_snapshot!(ruma_response_to_json(keys_query.clone())) + }); } machine.mark_request_as_sent(&TransactionId::new(), &keys_query).await.unwrap(); diff --git a/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__prepare_machine_with_dehydrated_device_of_verification_violation_user.snap b/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/prepare_machine_with_dehydrated_device_of_verification_violation_user.snap similarity index 100% rename from crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__prepare_machine_with_dehydrated_device_of_verification_violation_user.snap rename to crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/prepare_machine_with_dehydrated_device_of_verification_violation_user.snap diff --git a/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__serialize_device_based_strategy.snap b/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/serialize_device_based_strategy.snap similarity index 100% rename from crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__serialize_device_based_strategy.snap rename to crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/serialize_device_based_strategy.snap diff --git a/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__should_not_share_with_unverified_dehydrated_device.snap b/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/should_not_share_with_unverified_dehydrated_device.snap similarity index 100% rename from crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__should_not_share_with_unverified_dehydrated_device.snap rename to crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/should_not_share_with_unverified_dehydrated_device.snap diff --git a/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__should_share_with_verified_dehydrated_device.snap b/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/should_share_with_verified_dehydrated_device.snap similarity index 100% rename from crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__should_share_with_verified_dehydrated_device.snap rename to crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/should_share_with_verified_dehydrated_device.snap diff --git a/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__should_share_with_verified_device_of_pin_violation_user.snap b/crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/should_share_with_verified_device_of_pin_violation_user.snap similarity index 100% rename from crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/matrix_sdk_crypto__session_manager__group_sessions__share_strategy__tests__dehydrated_device__should_share_with_verified_device_of_pin_violation_user.snap rename to crates/matrix-sdk-crypto/src/session_manager/group_sessions/snapshots/should_share_with_verified_device_of_pin_violation_user.snap