Dark-Alex-17/managarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: Removed unused imports after massive handler testing refactor

Browse Source
This commit is contained in:
Alex Clarke
2025-12-04 23:03:48 -07:00
parent 49fd086b92
commit f6c4c1623f
34 changed files with 484 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs
+3 -4
View File
@@ -7,12 +7,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::radarr_handlers::blocklist::{blocklist_sorting_options, BlocklistHandler};
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::blocklist::{BlocklistHandler, blocklist_sorting_options};
use crate::models::radarr_models::{BlocklistItem, BlocklistItemMovie};
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, BLOCKLIST_BLOCKS};
use crate::models::servarr_models::{Language, Quality, QualityWrapper};
@@ -204,13 +204,12 @@ mod tests {
}
mod test_handle_esc {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::handlers::radarr_handlers::downloads::DownloadsHandler;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use crate::assert_navigation_popped;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs
+31 -38
View File
@@ -4,12 +4,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_modal_absent;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::collections::collection_details_handler::CollectionDetailsHandler;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::CollectionMovie;
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS,
@@ -17,9 +17,9 @@ mod tests {
mod test_handle_submit {
use crate::assert_navigation_pushed;
use crate::models::BlockSelectionState;
use crate::models::radarr_models::Movie;
use crate::models::servarr_data::radarr::radarr_data::ADD_MOVIE_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use bimap::BiMap;
use pretty_assertions::assert_eq;
@@ -60,43 +60,37 @@ mod tests {
)
.into()
);
assert!(
!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.monitor_list
.items
.is_empty()
);
assert!(!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.monitor_list
.items
.is_empty());
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
ActiveRadarrBlock::AddMovieSelectRootFolder
);
assert!(
!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.minimum_availability_list
.items
.is_empty()
);
assert!(
!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.quality_profile_list
.items
.is_empty()
);
assert!(!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.minimum_availability_list
.items
.is_empty());
assert!(!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.quality_profile_list
.items
.is_empty());
assert_str_eq!(
app
.data
@@ -165,7 +159,6 @@ mod tests {
mod test_handle_esc {
use super::*;
use crate::assert_navigation_popped;
use pretty_assertions::assert_eq;
use rstest::rstest;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -220,7 +213,7 @@ mod tests {
use crate::models::radarr_models::{Collection, MinimumAvailability};
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::{
EDIT_COLLECTION_SELECTION_BLOCKS, RadarrData,
RadarrData, EDIT_COLLECTION_SELECTION_BLOCKS,
};
use crate::test_edit_collection_key;
src/handlers/radarr_handlers/collections/collections_handler_tests.rs
+7 -12
View File
@@ -7,18 +7,18 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_modal_absent;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::collections::{
CollectionsHandler, collections_sorting_options,
collections_sorting_options, CollectionsHandler,
};
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::{Collection, CollectionMovie};
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS, COLLECTIONS_BLOCKS, EDIT_COLLECTION_BLOCKS,
ActiveRadarrBlock, COLLECTIONS_BLOCKS, COLLECTION_DETAILS_BLOCKS, EDIT_COLLECTION_BLOCKS,
};
use crate::test_handler_delegation;
@@ -197,7 +197,6 @@ mod tests {
mod test_handle_esc {
use crate::assert_navigation_popped;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use pretty_assertions::assert_eq;
use super::*;
@@ -233,9 +232,7 @@ mod tests {
CollectionsHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::Collections, None).handle();
assert_navigation_popped!(app,
ActiveRadarrBlock::Collections.into()
);
assert_navigation_popped!(app, ActiveRadarrBlock::Collections.into());
assert!(app.error.text.is_empty());
}
}
@@ -248,7 +245,7 @@ mod tests {
use crate::models::radarr_models::MinimumAvailability;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::{
EDIT_COLLECTION_SELECTION_BLOCKS, RadarrData,
RadarrData, EDIT_COLLECTION_SELECTION_BLOCKS,
};
use crate::network::radarr_network::RadarrEvent;
use crate::{assert_navigation_popped, test_edit_collection_key};
@@ -354,9 +351,7 @@ mod tests {
)
.handle();
assert_navigation_pushed!(app,
ActiveRadarrBlock::Collections.into()
);
assert_navigation_pushed!(app, ActiveRadarrBlock::Collections.into());
assert!(app.should_refresh);
}
src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
+13 -16
View File
@@ -5,14 +5,14 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_modal_absent;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::collections::edit_collection_handler::EditCollectionHandler;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::collection;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::{Collection, EditCollectionParams, MinimumAvailability};
use crate::models::servarr_data::radarr::modals::EditCollectionModal;
use crate::models::servarr_data::radarr::radarr_data::{
@@ -24,9 +24,9 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::radarr::modals::EditCollectionModal;
use crate::models::servarr_data::radarr::radarr_data::EDIT_COLLECTION_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use super::*;
@@ -477,17 +477,15 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(
!app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.path
.text
.is_empty()
);
assert!(!app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.path
.text
.is_empty());
assert_navigation_popped!(app, ActiveRadarrBlock::EditCollectionPrompt.into());
}
@@ -792,7 +790,6 @@ mod tests {
mod test_handle_esc {
use crate::assert_navigation_popped;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use pretty_assertions::assert_eq;
use rstest::rstest;
use super::*;
@@ -868,10 +865,10 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState,
servarr_data::radarr::{
modals::EditCollectionModal, radarr_data::EDIT_COLLECTION_SELECTION_BLOCKS,
},
BlockSelectionState,
},
network::radarr_network::RadarrEvent,
};
src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs
+4 -5
View File
@@ -4,13 +4,13 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::downloads::DownloadsHandler;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::download_record;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::DownloadRecord;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DOWNLOADS_BLOCKS};
@@ -128,7 +128,7 @@ mod tests {
use crate::network::radarr_network::RadarrEvent;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use crate::assert_navigation_popped;
const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
@@ -193,11 +193,10 @@ mod tests {
}
mod test_handle_esc {
use pretty_assertions::assert_eq;
use rstest::rstest;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use crate::assert_navigation_popped;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs
+100 -122
View File
@@ -1,14 +1,14 @@
#[cfg(test)]
mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_modal_absent;
use crate::assert_modal_present;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::indexers::edit_indexer_handler::EditIndexerHandler;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::indexer;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_INDEXER_BLOCKS};
use crate::models::servarr_models::EditIndexerParams;
@@ -21,9 +21,9 @@ mod tests {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::servarr_data::radarr::radarr_data::EDIT_INDEXER_TORRENT_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use super::*;
@@ -422,11 +422,11 @@ mod tests {
use std::sync::atomic::Ordering;
use crate::app::App;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::servarr_data::radarr::radarr_data::{
EDIT_INDEXER_NZB_SELECTION_BLOCKS, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS,
};
use crate::models::BlockSelectionState;
use pretty_assertions::assert_eq;
use rstest::rstest;
@@ -856,7 +856,7 @@ mod tests {
use crate::assert_navigation_popped;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::{
BlockSelectionState, servarr_data::radarr::radarr_data::EDIT_INDEXER_TORRENT_SELECTION_BLOCKS,
servarr_data::radarr::radarr_data::EDIT_INDEXER_TORRENT_SELECTION_BLOCKS, BlockSelectionState,
};
use crate::network::radarr_network::RadarrEvent;
@@ -1054,16 +1054,14 @@ mod tests {
app.get_current_route(),
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(
app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_rss
.unwrap()
);
assert!(app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_rss
.unwrap());
EditIndexerHandler::new(
SUBMIT_KEY,
@@ -1077,16 +1075,14 @@ mod tests {
app.get_current_route(),
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(
!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_rss
.unwrap()
);
assert!(!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_rss
.unwrap());
}
#[test]
@@ -1111,16 +1107,14 @@ mod tests {
app.get_current_route(),
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(
app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_automatic_search
.unwrap()
);
assert!(app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_automatic_search
.unwrap());
EditIndexerHandler::new(
SUBMIT_KEY,
@@ -1134,16 +1128,14 @@ mod tests {
app.get_current_route(),
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(
!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_automatic_search
.unwrap()
);
assert!(!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_automatic_search
.unwrap());
}
#[test]
@@ -1168,16 +1160,14 @@ mod tests {
app.get_current_route(),
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(
app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_interactive_search
.unwrap()
);
assert!(app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_interactive_search
.unwrap());
EditIndexerHandler::new(
SUBMIT_KEY,
@@ -1191,16 +1181,14 @@ mod tests {
app.get_current_route(),
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(
!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_interactive_search
.unwrap()
);
assert!(!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_interactive_search
.unwrap());
}
#[test]
@@ -1224,17 +1212,15 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(
!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.name
.text
.is_empty()
);
assert!(!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.name
.text
.is_empty());
assert_navigation_popped!(app, ActiveRadarrBlock::EditIndexerPrompt.into());
}
@@ -1259,17 +1245,15 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(
!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.url
.text
.is_empty()
);
assert!(!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.url
.text
.is_empty());
assert_navigation_popped!(app, ActiveRadarrBlock::EditIndexerPrompt.into());
}
@@ -1294,17 +1278,15 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(
!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.api_key
.text
.is_empty()
);
assert!(!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.api_key
.text
.is_empty());
assert_navigation_popped!(app, ActiveRadarrBlock::EditIndexerPrompt.into());
}
@@ -1329,17 +1311,15 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(
!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.seed_ratio
.text
.is_empty()
);
assert!(!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.seed_ratio
.text
.is_empty());
assert_navigation_popped!(app, ActiveRadarrBlock::EditIndexerPrompt.into());
}
@@ -1364,17 +1344,15 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(
!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.tags
.text
.is_empty()
);
assert!(!app
.data
.radarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.tags
.text
.is_empty());
assert_navigation_popped!(app, ActiveRadarrBlock::EditIndexerPrompt.into());
}
}
@@ -1382,9 +1360,9 @@ mod tests {
mod test_handle_esc {
use super::*;
use crate::app::App;
use crate::assert_navigation_popped;
use crate::event::Key;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use pretty_assertions::assert_eq;
use rstest::rstest;
@@ -1444,9 +1422,9 @@ mod tests {
use super::*;
use crate::app::App;
use crate::assert_navigation_popped;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::servarr_data::radarr::radarr_data::EDIT_INDEXER_TORRENT_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use crate::network::radarr_network::RadarrEvent;
use pretty_assertions::{assert_eq, assert_str_eq};
src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
+18 -20
View File
@@ -4,14 +4,14 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_modal_absent;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::indexers::edit_indexer_settings_handler::IndexerSettingsHandler;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::indexer_settings;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::IndexerSettings;
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS,
@@ -21,9 +21,9 @@ mod tests {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::BlockSelectionState;
use crate::models::radarr_models::IndexerSettings;
use crate::models::servarr_data::radarr::radarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use super::*;
@@ -269,9 +269,9 @@ mod tests {
mod test_handle_left_right_action {
use std::sync::atomic::Ordering;
use crate::models::BlockSelectionState;
use crate::models::radarr_models::IndexerSettings;
use crate::models::servarr_data::radarr::radarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use pretty_assertions::assert_eq;
use rstest::rstest;
@@ -428,8 +428,8 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState, radarr_models::IndexerSettings,
servarr_data::radarr::radarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS,
radarr_models::IndexerSettings,
servarr_data::radarr::radarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS, BlockSelectionState,
},
network::radarr_network::RadarrEvent,
};
@@ -739,17 +739,15 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(
!app
.data
.radarr_data
.indexer_settings
.as_ref()
.unwrap()
.whitelisted_hardcoded_subs
.text
.is_empty()
);
assert!(!app
.data
.radarr_data
.indexer_settings
.as_ref()
.unwrap()
.whitelisted_hardcoded_subs
.text
.is_empty());
assert_navigation_popped!(app, ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
}
@@ -782,7 +780,7 @@ mod tests {
use crate::models::radarr_models::IndexerSettings;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use crate::assert_navigation_popped;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -866,8 +864,8 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState, radarr_models::IndexerSettings,
servarr_data::radarr::radarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS,
radarr_models::IndexerSettings,
servarr_data::radarr::radarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS, BlockSelectionState,
},
network::radarr_network::RadarrEvent,
};
src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs
+5 -5
View File
@@ -4,15 +4,15 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::indexers::IndexersHandler;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::indexer;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, EDIT_INDEXER_BLOCKS, INDEXER_SETTINGS_BLOCKS, INDEXERS_BLOCKS,
ActiveRadarrBlock, EDIT_INDEXER_BLOCKS, INDEXERS_BLOCKS, INDEXER_SETTINGS_BLOCKS,
};
use crate::models::servarr_models::Indexer;
use crate::test_handler_delegation;
@@ -125,7 +125,7 @@ mod tests {
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::indexer;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::servarr_data::radarr::radarr_data::{
EDIT_INDEXER_NZB_SELECTION_BLOCKS, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS, RadarrData,
RadarrData, EDIT_INDEXER_NZB_SELECTION_BLOCKS, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS,
};
use crate::models::servarr_models::{Indexer, IndexerField};
use crate::network::radarr_network::RadarrEvent;
@@ -283,7 +283,7 @@ mod tests {
use pretty_assertions::assert_eq;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use crate::assert_navigation_popped;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs
+2 -6
View File
@@ -1,11 +1,9 @@
#[cfg(test)]
mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_modal_absent;
use crate::assert_navigation_pushed;
use crate::handlers::KeyEventHandler;
use crate::app::App;
use crate::handlers::radarr_handlers::indexers::test_all_indexers_handler::TestAllIndexersHandler;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::modals::IndexerTestResultModalItem;
use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
use crate::models::stateful_table::StatefulTable;
@@ -14,10 +12,8 @@ mod tests {
mod test_handle_esc {
use super::*;
use crate::assert_navigation_pushed;
use crate::models::stateful_table::StatefulTable;
use crate::{assert_modal_absent, assert_navigation_popped};
use pretty_assertions::assert_eq;
use rstest::rstest;
#[rstest]
src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
+34 -41
View File
@@ -9,18 +9,18 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::library::add_movie_handler::AddMovieHandler;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::add_movie_body;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::collection_movie;
use crate::models::HorizontallyScrollableText;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::{AddMovieSearchResult, MinimumAvailability, MovieMonitor};
use crate::models::servarr_data::radarr::modals::AddMovieModal;
use crate::models::servarr_data::radarr::radarr_data::{ADD_MOVIE_BLOCKS, ActiveRadarrBlock};
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
use crate::models::servarr_models::RootFolder;
use crate::models::HorizontallyScrollableText;
use bimap::BiMap;
mod test_handle_scroll_up_and_down {
@@ -28,9 +28,9 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::radarr::modals::AddMovieModal;
use crate::models::servarr_data::radarr::radarr_data::ADD_MOVIE_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use crate::simple_stateful_iterable_vec;
use super::*;
@@ -768,11 +768,11 @@ mod tests {
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::{
add_movie_body, add_movie_search_result, collection_movie,
};
use crate::models::BlockSelectionState;
use crate::models::radarr_models::Movie;
use crate::models::servarr_data::radarr::modals::AddMovieModal;
use crate::models::servarr_data::radarr::radarr_data::ADD_MOVIE_SELECTION_BLOCKS;
use crate::models::stateful_table::StatefulTable;
use crate::models::BlockSelectionState;
use crate::network::radarr_network::RadarrEvent;
use bimap::BiMap;
use pretty_assertions::{assert_eq, assert_str_eq};
@@ -851,39 +851,33 @@ mod tests {
ActiveRadarrBlock::AddMovieSelectRootFolder
);
assert_modal_present!(app.data.radarr_data.add_movie_modal);
assert!(
!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.monitor_list
.items
.is_empty()
);
assert!(
!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.minimum_availability_list
.items
.is_empty()
);
assert!(
!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.quality_profile_list
.items
.is_empty()
);
assert!(!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.monitor_list
.items
.is_empty());
assert!(!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.minimum_availability_list
.items
.is_empty());
assert!(!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.quality_profile_list
.items
.is_empty());
assert_str_eq!(
app
.data
@@ -1147,7 +1141,6 @@ mod tests {
use crate::{assert_navigation_popped, simple_stateful_iterable_vec};
use super::*;
use crate::assert_navigation_pushed;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -1327,9 +1320,9 @@ mod tests {
add_movie_body, add_movie_search_result, collection_movie,
},
models::{
BlockSelectionState,
servarr_data::radarr::{modals::AddMovieModal, radarr_data::ADD_MOVIE_SELECTION_BLOCKS},
stateful_table::StatefulTable,
BlockSelectionState,
},
network::radarr_network::RadarrEvent,
};
src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs
+7 -9
View File
@@ -4,13 +4,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::app::App;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::library::delete_movie_handler::DeleteMovieHandler;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::movie;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::DeleteMovieParams;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
@@ -18,8 +17,8 @@ mod tests {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::radarr::radarr_data::DELETE_MOVIE_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use super::*;
@@ -84,12 +83,12 @@ mod tests {
mod test_handle_submit {
use pretty_assertions::assert_eq;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::radarr::radarr_data::DELETE_MOVIE_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use crate::network::radarr_network::RadarrEvent;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use crate::assert_navigation_popped;
const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
@@ -224,8 +223,7 @@ mod tests {
mod test_handle_esc {
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use pretty_assertions::assert_eq;
use crate::assert_navigation_popped;
use rstest::rstest;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -259,7 +257,7 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState, servarr_data::radarr::radarr_data::DELETE_MOVIE_SELECTION_BLOCKS,
servarr_data::radarr::radarr_data::DELETE_MOVIE_SELECTION_BLOCKS, BlockSelectionState,
},
network::radarr_network::RadarrEvent,
};
src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs
+22 -27
View File
@@ -5,14 +5,14 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_modal_absent;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::library::edit_movie_handler::EditMovieHandler;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::movie;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::{EditMovieParams, MinimumAvailability, Movie};
use crate::models::servarr_data::radarr::modals::EditMovieModal;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_MOVIE_BLOCKS};
@@ -22,9 +22,9 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::radarr::modals::EditMovieModal;
use crate::models::servarr_data::radarr::radarr_data::EDIT_MOVIE_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use super::*;
@@ -568,17 +568,15 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(
!app
.data
.radarr_data
.edit_movie_modal
.as_ref()
.unwrap()
.path
.text
.is_empty()
);
assert!(!app
.data
.radarr_data
.edit_movie_modal
.as_ref()
.unwrap()
.path
.text
.is_empty());
assert_navigation_popped!(app, ActiveRadarrBlock::EditMoviePrompt.into());
}
@@ -602,17 +600,15 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(
!app
.data
.radarr_data
.edit_movie_modal
.as_mut()
.unwrap()
.tags
.text
.is_empty()
);
assert!(!app
.data
.radarr_data
.edit_movie_modal
.as_mut()
.unwrap()
.tags
.text
.is_empty());
assert_navigation_popped!(app, ActiveRadarrBlock::EditMoviePrompt.into());
}
@@ -892,7 +888,6 @@ mod tests {
use crate::assert_navigation_popped;
use crate::models::servarr_data::radarr::modals::EditMovieModal;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use pretty_assertions::assert_eq;
use rstest::rstest;
use super::*;
@@ -959,8 +954,8 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState,
servarr_data::radarr::{modals::EditMovieModal, radarr_data::EDIT_MOVIE_SELECTION_BLOCKS},
BlockSelectionState,
},
network::radarr_network::RadarrEvent,
};
src/handlers/radarr_handlers/library/library_handler_tests.rs
+6 -7
View File
@@ -5,18 +5,18 @@ mod tests {
use std::cmp::Ordering;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_modal_absent;
use crate::assert_modal_present;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::library::{LibraryHandler, movies_sorting_options};
use crate::handlers::radarr_handlers::library::{movies_sorting_options, LibraryHandler};
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::movie;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::Movie;
use crate::models::servarr_data::radarr::radarr_data::{
ADD_MOVIE_BLOCKS, ActiveRadarrBlock, DELETE_MOVIE_BLOCKS, EDIT_MOVIE_BLOCKS, LIBRARY_BLOCKS,
ActiveRadarrBlock, ADD_MOVIE_BLOCKS, DELETE_MOVIE_BLOCKS, EDIT_MOVIE_BLOCKS, LIBRARY_BLOCKS,
MOVIE_DETAILS_BLOCKS,
};
use crate::models::servarr_models::Language;
@@ -240,14 +240,13 @@ mod tests {
}
mod test_handle_esc {
use pretty_assertions::assert_eq;
use ratatui::widgets::TableState;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::stateful_table::StatefulTable;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use crate::assert_navigation_popped;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -302,7 +301,7 @@ mod tests {
use crate::models::radarr_models::MinimumAvailability;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::{
EDIT_MOVIE_SELECTION_BLOCKS, RadarrData,
RadarrData, EDIT_MOVIE_SELECTION_BLOCKS,
};
use crate::network::radarr_network::RadarrEvent;
src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
+4 -5
View File
@@ -7,16 +7,16 @@ mod tests {
use serde_json::Number;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_modal_absent;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::library::movie_details_handler::{
MovieDetailsHandler, releases_sorting_options,
releases_sorting_options, MovieDetailsHandler,
};
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::{movie, release};
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::{Credit, MovieHistoryItem};
use crate::models::radarr_models::{RadarrRelease, RadarrReleaseDownloadBody};
use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
@@ -432,7 +432,6 @@ mod tests {
use crate::{assert_movie_info_tabs_reset, assert_navigation_popped};
use super::*;
use crate::assert_navigation_pushed;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -496,7 +495,7 @@ mod tests {
use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::{
EDIT_MOVIE_SELECTION_BLOCKS, RadarrData,
RadarrData, EDIT_MOVIE_SELECTION_BLOCKS,
};
use crate::network::radarr_network::RadarrEvent;
use crate::{assert_navigation_popped, test_edit_movie_key};
src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs
+3 -4
View File
@@ -4,18 +4,18 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_modal_absent;
use crate::assert_modal_present;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::root_folder;
use crate::handlers::radarr_handlers::root_folders::RootFoldersHandler;
use crate::models::HorizontallyScrollableText;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS};
use crate::models::servarr_models::{AddRootFolderBody, RootFolder};
use crate::models::HorizontallyScrollableText;
mod test_handle_home_end {
use pretty_assertions::assert_eq;
@@ -367,7 +367,6 @@ mod tests {
mod test_handle_esc {
use super::*;
use crate::assert_navigation_popped;
use pretty_assertions::assert_eq;
use rstest::rstest;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
src/handlers/radarr_handlers/system/system_details_handler_tests.rs
+3 -4
View File
@@ -4,12 +4,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::system::system_details_handler::SystemDetailsHandler;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::{RadarrTask, RadarrTaskName};
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS,
@@ -723,11 +723,10 @@ mod tests {
mod test_handle_esc {
use crate::models::HorizontallyScrollableText;
use pretty_assertions::assert_eq;
use rstest::rstest;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use crate::assert_navigation_popped;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
src/handlers/radarr_handlers/system/system_handler_tests.rs
+3 -4
View File
@@ -3,12 +3,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::radarr_handlers::system::SystemHandler;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::RadarrTask;
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS,
@@ -66,10 +66,9 @@ mod tests {
}
mod test_handle_esc {
use pretty_assertions::assert_eq;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use crate::assert_navigation_popped;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;