diff --git a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs index fca77ae4..fe433443 100644 --- a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs +++ b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs @@ -274,9 +274,9 @@ pub(in crate::handlers::sonarr_handlers) mod utils { pub fn indexer_settings() -> IndexerSettings { IndexerSettings { - id: 1, - minimum_age: 1, - retention: 1, + id: 7, + minimum_age: 13, + retention: 21, maximum_size: 12345, rss_sync_interval: 60, } diff --git a/src/network/lidarr_network/indexers/lidarr_indexers_network_tests.rs b/src/network/lidarr_network/indexers/lidarr_indexers_network_tests.rs index 3ad41fd1..5c4ac26d 100644 --- a/src/network/lidarr_network/indexers/lidarr_indexers_network_tests.rs +++ b/src/network/lidarr_network/indexers/lidarr_indexers_network_tests.rs @@ -44,10 +44,10 @@ mod tests { #[tokio::test] async fn test_handle_edit_all_indexer_settings_event() { let indexer_settings_json = json!({ - "id": 1, - "minimumAge": 1, + "id": 5, + "minimumAge": 11, "maximumSize": 12345, - "retention": 1, + "retention": 29, "rssSyncInterval": 60 }); let (mock, app, _server) = MockServarrApi::put() diff --git a/src/network/lidarr_network/lidarr_network_test_utils.rs b/src/network/lidarr_network/lidarr_network_test_utils.rs index bd956a26..42e673eb 100644 --- a/src/network/lidarr_network/lidarr_network_test_utils.rs +++ b/src/network/lidarr_network/lidarr_network_test_utils.rs @@ -337,9 +337,9 @@ pub mod test_utils { pub fn indexer_settings() -> IndexerSettings { IndexerSettings { - id: 1, - minimum_age: 1, - retention: 1, + id: 5, + minimum_age: 11, + retention: 29, maximum_size: 12345, rss_sync_interval: 60, } diff --git a/src/network/radarr_network/indexers/radarr_indexers_network_tests.rs b/src/network/radarr_network/indexers/radarr_indexers_network_tests.rs index 7a8b4110..94a7386d 100644 --- a/src/network/radarr_network/indexers/radarr_indexers_network_tests.rs +++ b/src/network/radarr_network/indexers/radarr_indexers_network_tests.rs @@ -8,7 +8,7 @@ mod tests { use crate::network::network_tests::test_utils::{MockServarrApi, test_network}; use crate::network::radarr_network::RadarrEvent; use crate::network::radarr_network::radarr_network_test_utils::test_utils::{ - indexer, indexer_settings, + indexer, indexer_settings, stale_indexer_settings, }; use bimap::BiMap; use mockito::Matcher; @@ -36,15 +36,15 @@ mod tests { #[tokio::test] async fn test_handle_edit_all_radarr_indexer_settings_event() { let indexer_settings_json = json!({ - "minimumAge": 0, - "maximumSize": 0, - "retention": 0, + "minimumAge": 27, + "maximumSize": 18400, + "retention": 44, "rssSyncInterval": 60, "preferIndexerFlags": false, - "availabilityDelay": 0, + "availabilityDelay": 19, "allowHardcodedSubs": true, - "whitelistedHardcodedSubs": "", - "id": 1 + "whitelistedHardcodedSubs": "eng", + "id": 3 }); let (async_server, app, _server) = MockServarrApi::put() .with_request_body(indexer_settings_json) @@ -641,15 +641,15 @@ mod tests { #[tokio::test] async fn test_handle_get_all_indexer_settings_event() { let indexer_settings_response_json = json!({ - "minimumAge": 0, - "maximumSize": 0, - "retention": 0, + "minimumAge": 27, + "maximumSize": 18400, + "retention": 44, "rssSyncInterval": 60, "preferIndexerFlags": false, - "availabilityDelay": 0, + "availabilityDelay": 19, "allowHardcodedSubs": true, - "whitelistedHardcodedSubs": "", - "id": 1 + "whitelistedHardcodedSubs": "eng", + "id": 3 }); let response: IndexerSettings = serde_json::from_value(indexer_settings_response_json.clone()).unwrap(); @@ -677,21 +677,21 @@ mod tests { #[tokio::test] async fn test_handle_get_all_indexer_settings_event_no_op_if_already_present() { let indexer_settings_response_json = json!({ - "minimumAge": 0, - "maximumSize": 0, - "retention": 0, + "minimumAge": 27, + "maximumSize": 18400, + "retention": 44, "rssSyncInterval": 60, "preferIndexerFlags": false, - "availabilityDelay": 0, + "availabilityDelay": 19, "allowHardcodedSubs": true, - "whitelistedHardcodedSubs": "", - "id": 1 + "whitelistedHardcodedSubs": "eng", + "id": 3 }); let (async_server, app, _server) = MockServarrApi::get() .returns(indexer_settings_response_json) .build_for(RadarrEvent::GetAllIndexerSettings) .await; - app.lock().await.data.radarr_data.indexer_settings = Some(IndexerSettings::default()); + app.lock().await.data.radarr_data.indexer_settings = Some(stale_indexer_settings()); let mut network = test_network(&app); assert!( @@ -704,7 +704,7 @@ mod tests { async_server.assert_async().await; assert_eq!( app.lock().await.data.radarr_data.indexer_settings, - Some(IndexerSettings::default()) + Some(stale_indexer_settings()) ); } diff --git a/src/network/radarr_network/radarr_network_test_utils.rs b/src/network/radarr_network/radarr_network_test_utils.rs index 8888dbdb..81f11f23 100644 --- a/src/network/radarr_network/radarr_network_test_utils.rs +++ b/src/network/radarr_network/radarr_network_test_utils.rs @@ -421,10 +421,29 @@ pub mod test_utils { pub fn indexer_settings() -> IndexerSettings { IndexerSettings { - rss_sync_interval: 60, allow_hardcoded_subs: true, - id: 1, - ..IndexerSettings::default() + availability_delay: 19, + id: 3, + maximum_size: 18400, + minimum_age: 27, + prefer_indexer_flags: false, + retention: 44, + rss_sync_interval: 60, + whitelisted_hardcoded_subs: "eng".into(), + } + } + + pub fn stale_indexer_settings() -> IndexerSettings { + IndexerSettings { + allow_hardcoded_subs: false, + availability_delay: 31, + id: 8, + maximum_size: 22750, + minimum_age: 52, + prefer_indexer_flags: true, + retention: 66, + rss_sync_interval: 90, + whitelisted_hardcoded_subs: "deu".into(), } } diff --git a/src/ui/lidarr_ui/indexers/snapshots/managarr__ui__lidarr_ui__indexers__indexer_settings_ui__indexer_settings_ui_tests__tests__snapshot_tests__indexer_settings_ui_renders_indexer_settings.snap b/src/ui/lidarr_ui/indexers/snapshots/managarr__ui__lidarr_ui__indexers__indexer_settings_ui__indexer_settings_ui_tests__tests__snapshot_tests__indexer_settings_ui_renders_indexer_settings.snap index 7f375933..f43387ba 100644 --- a/src/ui/lidarr_ui/indexers/snapshots/managarr__ui__lidarr_ui__indexers__indexer_settings_ui__indexer_settings_ui_tests__tests__snapshot_tests__indexer_settings_ui_renders_indexer_settings.snap +++ b/src/ui/lidarr_ui/indexers/snapshots/managarr__ui__lidarr_ui__indexers__indexer_settings_ui__indexer_settings_ui_tests__tests__snapshot_tests__indexer_settings_ui_renders_indexer_settings.snap @@ -21,10 +21,10 @@ expression: output │ │ │ │ │ ╭────────────────────────────────╮ │ - │ Minimum Age (minutes) ▴▾: │1 │ │ + │ Minimum Age (minutes) ▴▾: │11 │ │ │ ╰────────────────────────────────╯ │ │ ╭────────────────────────────────╮ │ - │ Retention (days) ▴▾: │1 │ │ + │ Retention (days) ▴▾: │29 │ │ │ ╰────────────────────────────────╯ │ │ ╭────────────────────────────────╮ │ │ Maximum Size (MB) ▴▾: │12345 │ │