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

refactor: Created dedicated proptests and assertions to clean up the handler unit tests

Browse Source
This commit is contained in:
Alex Clarke
2025-12-04 22:57:06 -07:00
parent 35dce0bf01
commit 49fd086b92
46 changed files with 1023 additions and 1018 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs
+18 -23
View File
@@ -9,6 +9,7 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::blocklist::{BlocklistHandler, blocklist_sorting_options};
@@ -31,10 +32,7 @@ mod tests {
BlocklistHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::DeleteBlocklistItemPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::DeleteBlocklistItemPrompt.into());
}
#[test]
@@ -55,6 +53,7 @@ mod tests {
use rstest::rstest;
use super::*;
use crate::assert_navigation_pushed;
#[rstest]
fn test_blocklist_tab_left(#[values(true, false)] is_ready: bool) {
@@ -75,7 +74,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::Downloads.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Downloads.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Downloads.into());
}
#[rstest]
@@ -97,7 +96,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::History.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::History.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::History.into());
}
#[rstest]
@@ -123,11 +122,11 @@ mod tests {
}
mod test_handle_submit {
use crate::assert_navigation_popped;
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::network::sonarr_network::SonarrEvent;
use super::*;
const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
@@ -140,10 +139,7 @@ mod tests {
BlocklistHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::BlocklistItemDetails.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::BlocklistItemDetails.into());
}
#[test]
@@ -187,7 +183,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
);
assert_eq!(app.get_current_route(), base_route.into());
assert_navigation_popped!(app, base_route.into());
}
#[rstest]
@@ -207,7 +203,7 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Blocklist.into());
}
}
@@ -216,6 +212,7 @@ mod tests {
use rstest::rstest;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -239,7 +236,7 @@ mod tests {
BlocklistHandler::new(ESC_KEY, &mut app, prompt_block, None).handle();
assert_eq!(app.get_current_route(), base_block.into());
assert_navigation_popped!(app, base_block.into());
assert!(!app.data.sonarr_data.prompt_confirm);
}
@@ -257,7 +254,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Blocklist.into());
}
#[rstest]
@@ -270,7 +267,7 @@ mod tests {
BlocklistHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Blocklist.into());
assert!(app.error.text.is_empty());
}
}
@@ -282,6 +279,7 @@ mod tests {
use crate::network::sonarr_network::SonarrEvent;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
#[test]
fn test_refresh_blocklist_key() {
@@ -297,7 +295,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Blocklist.into());
assert!(app.should_refresh);
}
@@ -334,10 +332,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::BlocklistClearAllItemsPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::BlocklistClearAllItemsPrompt.into());
}
#[test]
@@ -392,7 +387,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
);
assert_eq!(app.get_current_route(), base_route.into());
assert_navigation_popped!(app, base_route.into());
}
}
src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs
+16 -18
View File
@@ -6,6 +6,7 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::downloads::DownloadsHandler;
@@ -32,10 +33,7 @@ mod tests {
DownloadsHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Downloads, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::DeleteDownloadPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::DeleteDownloadPrompt.into());
}
#[test]
@@ -60,6 +58,7 @@ mod tests {
use rstest::rstest;
use super::*;
use crate::assert_navigation_pushed;
#[rstest]
fn test_downloads_tab_left(#[values(true, false)] is_ready: bool) {
@@ -80,7 +79,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::Series.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Series.into());
}
#[rstest]
@@ -102,7 +101,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::Blocklist.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Blocklist.into());
}
#[rstest]
@@ -134,6 +133,7 @@ mod tests {
use crate::network::sonarr_network::SonarrEvent;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
@@ -170,7 +170,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
);
assert_eq!(app.get_current_route(), base_route.into());
assert_navigation_popped!(app, base_route.into());
}
#[rstest]
@@ -193,7 +193,7 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_eq!(app.get_current_route(), base_route.into());
assert_navigation_popped!(app, base_route.into());
}
}
@@ -202,6 +202,7 @@ mod tests {
use rstest::rstest;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -219,7 +220,7 @@ mod tests {
DownloadsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle();
assert_eq!(app.get_current_route(), base_block.into());
assert_navigation_popped!(app, base_block.into());
assert!(!app.data.sonarr_data.prompt_confirm);
}
@@ -233,17 +234,17 @@ mod tests {
DownloadsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Downloads, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Downloads.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Downloads.into());
assert!(app.error.text.is_empty());
}
}
mod test_handle_key_char {
use crate::assert_navigation_popped;
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::network::sonarr_network::SonarrEvent;
use super::*;
#[test]
@@ -264,10 +265,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::UpdateDownloadsPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::UpdateDownloadsPrompt.into());
}
#[test]
@@ -310,7 +308,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Downloads.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Downloads.into());
assert!(app.should_refresh);
}
@@ -375,7 +373,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
);
assert_eq!(app.get_current_route(), base_route.into());
assert_navigation_popped!(app, base_route.into());
}
}
src/handlers/sonarr_handlers/history/history_handler_tests.rs
+8 -7
View File
@@ -9,6 +9,7 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::history::{HistoryHandler, history_sorting_options};
@@ -21,6 +22,7 @@ mod tests {
use rstest::rstest;
use super::*;
use crate::assert_navigation_pushed;
#[rstest]
fn test_history_tab_left(#[values(true, false)] is_ready: bool) {
@@ -41,7 +43,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::Blocklist.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Blocklist.into());
}
#[rstest]
@@ -85,10 +87,7 @@ mod tests {
HistoryHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::History, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::HistoryItemDetails.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::HistoryItemDetails.into());
}
#[test]
@@ -111,6 +110,7 @@ mod tests {
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -133,7 +133,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::History.into());
assert_navigation_popped!(app, ActiveSonarrBlock::History.into());
}
#[rstest]
@@ -161,6 +161,7 @@ mod tests {
use pretty_assertions::assert_eq;
use super::*;
use crate::assert_navigation_pushed;
#[test]
fn test_refresh_history_key() {
@@ -176,7 +177,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::History.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::History.into());
assert!(app.should_refresh);
}
src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs
+23 -36
View File
@@ -2,6 +2,9 @@
mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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::sonarr_handlers::indexers::edit_indexer_handler::EditIndexerHandler;
@@ -850,6 +853,7 @@ mod tests {
use rstest::rstest;
use crate::app::App;
use crate::assert_navigation_popped;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::{
BlockSelectionState, servarr_data::sonarr::sonarr_data::EDIT_INDEXER_TORRENT_SELECTION_BLOCKS,
@@ -882,7 +886,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert!(!app.should_refresh);
assert_eq!(app.data.sonarr_data.edit_indexer_modal, None);
@@ -936,8 +940,8 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert!(app.data.sonarr_data.edit_indexer_modal.is_none());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_modal_absent!(app.data.sonarr_data.edit_indexer_modal);
assert!(app.should_refresh);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
@@ -966,7 +970,7 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert!(app.data.sonarr_data.edit_indexer_modal.is_some());
assert_modal_present!(app.data.sonarr_data.edit_indexer_modal);
assert!(!app.should_refresh);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
}
@@ -1002,7 +1006,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), block.into());
assert_navigation_pushed!(app, block.into());
assert!(app.ignore_special_keys_for_textbox_input);
}
@@ -1024,10 +1028,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPriorityInput.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::EditIndexerPriorityInput.into());
assert!(!app.ignore_special_keys_for_textbox_input);
}
@@ -1234,10 +1235,7 @@ mod tests {
.text
.is_empty()
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
#[test]
@@ -1272,10 +1270,7 @@ mod tests {
.text
.is_empty()
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
#[test]
@@ -1310,10 +1305,7 @@ mod tests {
.text
.is_empty()
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
#[test]
@@ -1348,10 +1340,7 @@ mod tests {
.text
.is_empty()
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
#[test]
@@ -1386,10 +1375,7 @@ mod tests {
.text
.is_empty()
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
}
@@ -1398,6 +1384,7 @@ mod tests {
use crate::app::App;
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;
@@ -1419,7 +1406,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.edit_indexer_modal, None);
}
@@ -1444,7 +1431,7 @@ mod tests {
EditIndexerHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(!app.ignore_special_keys_for_textbox_input);
assert_eq!(
app.data.sonarr_data.edit_indexer_modal,
@@ -1454,15 +1441,15 @@ mod tests {
}
mod test_handle_key_char {
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::sonarr::sonarr_data::EDIT_INDEXER_TORRENT_SELECTION_BLOCKS;
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::{assert_eq, assert_str_eq};
use super::*;
#[test]
fn test_edit_indexer_name_input_backspace() {
let mut app = App::test_default();
@@ -1795,8 +1782,8 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert!(app.data.sonarr_data.edit_indexer_modal.is_none());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_modal_absent!(app.data.sonarr_data.edit_indexer_modal);
assert!(app.should_refresh);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
@@ -1874,7 +1861,7 @@ mod tests {
.build_edit_indexer_params();
assert_eq!(params, expected_edit_indexer_params);
assert!(app.data.sonarr_data.edit_indexer_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_indexer_modal);
}
#[test]
src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
+15 -13
View File
@@ -6,6 +6,8 @@ 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::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::indexers::edit_indexer_settings_handler::IndexerSettingsHandler;
@@ -237,6 +239,7 @@ mod tests {
use rstest::rstest;
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState, servarr_data::sonarr::sonarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS,
sonarr_models::IndexerSettings,
@@ -270,7 +273,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert!(!app.should_refresh);
assert_eq!(app.data.sonarr_data.indexer_settings, None);
@@ -299,12 +302,12 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::EditAllIndexerSettings(indexer_settings()))
);
assert!(app.data.sonarr_data.indexer_settings.is_none());
assert_modal_absent!(app.data.sonarr_data.indexer_settings);
assert!(app.should_refresh);
}
@@ -357,7 +360,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), selected_block.into());
assert_navigation_pushed!(app, selected_block.into());
}
#[rstest]
@@ -405,10 +408,7 @@ mod tests {
IndexerSettingsHandler::new(SUBMIT_KEY, &mut app, active_sonarr_block, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AllIndexerSettingsPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
}
}
@@ -419,6 +419,7 @@ mod tests {
use crate::models::sonarr_models::IndexerSettings;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -438,7 +439,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.indexer_settings, None);
}
@@ -460,7 +461,7 @@ mod tests {
IndexerSettingsHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(
app.data.sonarr_data.indexer_settings,
Some(IndexerSettings::default())
@@ -470,6 +471,7 @@ mod tests {
mod test_handle_key_char {
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState, servarr_data::sonarr::sonarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS,
},
@@ -501,12 +503,12 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::EditAllIndexerSettings(indexer_settings()))
);
assert!(app.data.sonarr_data.indexer_settings.is_none());
assert_modal_absent!(app.data.sonarr_data.indexer_settings);
assert!(app.should_refresh);
}
}
@@ -555,7 +557,7 @@ mod tests {
.build_edit_indexer_settings_params();
assert_eq!(actual_indexer_settings, indexer_settings());
assert!(app.data.sonarr_data.indexer_settings.is_none());
assert_modal_absent!(app.data.sonarr_data.indexer_settings);
}
#[test]
src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs
+19 -34
View File
@@ -6,6 +6,7 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::indexers::IndexersHandler;
@@ -35,10 +36,7 @@ mod tests {
IndexersHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::DeleteIndexerPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::DeleteIndexerPrompt.into());
}
#[test]
@@ -83,10 +81,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::RootFolders.into());
}
#[rstest]
@@ -108,7 +103,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::System.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::System.into());
}
#[rstest]
@@ -129,17 +124,17 @@ mod tests {
}
mod test_handle_submit {
use crate::assert_navigation_popped;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::servarr_data::sonarr::sonarr_data::{
EDIT_INDEXER_NZB_SELECTION_BLOCKS, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS, SonarrData,
};
use crate::models::servarr_models::{Indexer, IndexerField};
use crate::network::sonarr_network::SonarrEvent;
use bimap::BiMap;
use pretty_assertions::assert_eq;
use serde_json::{Number, Value};
use crate::network::sonarr_network::SonarrEvent;
use super::*;
const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
@@ -201,10 +196,7 @@ mod tests {
IndexersHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
assert_eq!(
app.data.sonarr_data.edit_indexer_modal,
Some((&app.data.sonarr_data).into())
@@ -265,7 +257,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteIndexer(1))
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
}
#[test]
@@ -289,7 +281,7 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
}
}
@@ -297,6 +289,7 @@ mod tests {
use pretty_assertions::assert_eq;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -316,7 +309,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(!app.data.sonarr_data.prompt_confirm);
}
@@ -330,7 +323,7 @@ mod tests {
IndexersHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::TestIndexer, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(app.data.sonarr_data.indexer_test_errors, None);
}
@@ -344,7 +337,7 @@ mod tests {
IndexersHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(app.error.text.is_empty());
}
}
@@ -353,6 +346,7 @@ mod tests {
use pretty_assertions::assert_eq;
use crate::{
assert_navigation_popped,
models::servarr_data::sonarr::sonarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS,
network::sonarr_network::SonarrEvent,
};
@@ -377,7 +371,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Indexers.into());
assert!(app.should_refresh);
}
@@ -427,10 +421,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AllIndexerSettingsPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
assert_eq!(
app.data.sonarr_data.selected_block.blocks,
INDEXER_SETTINGS_SELECTION_BLOCKS
@@ -477,10 +468,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::TestIndexer.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::TestIndexer.into());
}
#[test]
@@ -523,10 +511,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::TestAllIndexers.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::TestAllIndexers.into());
}
#[test]
@@ -571,7 +556,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteIndexer(1))
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
}
}
src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs
+6 -2
View File
@@ -2,6 +2,8 @@
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::handlers::sonarr_handlers::indexers::test_all_indexers_handler::TestAllIndexersHandler;
use crate::models::servarr_data::modals::IndexerTestResultModalItem;
@@ -12,7 +14,9 @@ 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;
@@ -32,9 +36,9 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(app.data.sonarr_data.indexer_test_all_results.is_none());
assert_modal_absent!(app.data.sonarr_data.indexer_test_all_results);
}
}
src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
+32 -57
View File
@@ -7,6 +7,9 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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::sonarr_handlers::library::add_series_handler::AddSeriesHandler;
@@ -894,16 +897,16 @@ mod tests {
}
mod test_handle_submit {
use bimap::BiMap;
use pretty_assertions::{assert_eq, assert_str_eq};
use rstest::rstest;
use crate::assert_navigation_popped;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::ADD_SERIES_SELECTION_BLOCKS;
use crate::models::sonarr_models::Series;
use crate::models::stateful_table::StatefulTable;
use crate::network::sonarr_network::SonarrEvent;
use bimap::BiMap;
use pretty_assertions::{assert_eq, assert_str_eq};
use rstest::rstest;
use super::*;
@@ -925,10 +928,7 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesSearchResults.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::AddSeriesSearchResults.into());
}
#[test]
@@ -972,15 +972,12 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::AddSeriesPrompt.into());
assert_eq!(
app.data.sonarr_data.selected_block.get_active_block(),
ActiveSonarrBlock::AddSeriesSelectRootFolder
);
assert!(app.data.sonarr_data.add_series_modal.is_some());
assert_modal_present!(app.data.sonarr_data.add_series_modal);
assert!(
!app
.data
@@ -1048,7 +1045,7 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::AddSeriesSearchResults.into()
);
assert!(app.data.sonarr_data.add_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.add_series_modal);
}
#[test]
@@ -1091,10 +1088,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesAlreadyInLibrary.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::AddSeriesAlreadyInLibrary.into());
}
#[test]
@@ -1117,7 +1111,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
}
@@ -1200,12 +1194,12 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::AddSeries(expected_add_series_body))
);
assert!(app.data.sonarr_data.add_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.add_series_modal);
}
#[rstest]
@@ -1233,7 +1227,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), selected_block.into());
assert_navigation_pushed!(app, selected_block.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
if selected_block == ActiveSonarrBlock::AddSeriesTagsInput {
@@ -1260,10 +1254,7 @@ mod tests {
AddSeriesHandler::new(SUBMIT_KEY, &mut app, active_sonarr_block, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::AddSeriesPrompt.into());
if active_sonarr_block == ActiveSonarrBlock::AddSeriesTagsInput {
assert!(!app.ignore_special_keys_for_textbox_input);
@@ -1332,9 +1323,10 @@ mod tests {
use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use crate::models::stateful_table::StatefulTable;
use crate::simple_stateful_iterable_vec;
use crate::{assert_navigation_popped, simple_stateful_iterable_vec};
use super::*;
use crate::assert_navigation_pushed;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -1356,7 +1348,7 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(app.data.sonarr_data.add_series_search, None);
}
@@ -1378,10 +1370,7 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::AddSeriesPrompt.into());
}
#[rstest]
@@ -1405,11 +1394,8 @@ mod tests {
AddSeriesHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesSearchInput.into()
);
assert!(app.data.sonarr_data.add_searched_series.is_none());
assert_navigation_popped!(app, ActiveSonarrBlock::AddSeriesSearchInput.into());
assert_modal_absent!(app.data.sonarr_data.add_searched_series);
assert!(app.ignore_special_keys_for_textbox_input);
}
@@ -1429,10 +1415,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesSearchResults.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::AddSeriesSearchResults.into());
}
#[test]
@@ -1447,11 +1430,8 @@ mod tests {
AddSeriesHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesSearchResults.into()
);
assert!(app.data.sonarr_data.add_series_modal.is_none());
assert_navigation_popped!(app, ActiveSonarrBlock::AddSeriesSearchResults.into());
assert_modal_absent!(app.data.sonarr_data.add_series_modal);
}
#[test]
@@ -1472,10 +1452,7 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::AddSeriesPrompt.into());
}
#[rstest]
@@ -1496,16 +1473,14 @@ mod tests {
AddSeriesHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::AddSeriesPrompt.into());
}
}
mod test_handle_key_char {
use super::*;
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState,
servarr_data::sonarr::{modals::AddSeriesModal, sonarr_data::ADD_SERIES_SELECTION_BLOCKS},
@@ -1701,12 +1676,12 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::AddSeries(expected_add_series_body))
);
assert!(app.data.sonarr_data.add_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.add_series_modal);
}
}
@@ -1824,7 +1799,7 @@ mod tests {
.build_add_series_body();
assert_eq!(add_series_body, expected_add_series_body);
assert!(app.data.sonarr_data.add_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.add_series_modal);
}
#[test]
src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs
+8 -4
View File
@@ -6,6 +6,7 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::library::delete_series_handler::DeleteSeriesHandler;
@@ -91,6 +92,7 @@ mod tests {
use crate::network::sonarr_network::SonarrEvent;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
@@ -117,7 +119,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(!app.data.sonarr_data.delete_series_files);
@@ -154,7 +156,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteSeries(expected_delete_series_params))
@@ -228,6 +230,7 @@ mod tests {
mod test_handle_esc {
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
use pretty_assertions::assert_eq;
use rstest::rstest;
@@ -251,7 +254,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(!app.data.sonarr_data.delete_series_files);
assert!(!app.data.sonarr_data.add_list_exclusion);
@@ -260,6 +263,7 @@ mod tests {
mod test_handle_key_char {
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState, servarr_data::sonarr::sonarr_data::DELETE_SERIES_SELECTION_BLOCKS,
},
@@ -298,7 +302,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteSeries(expected_delete_series_params))
src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs
+25 -34
View File
@@ -7,6 +7,8 @@ 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::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::library::edit_series_handler::EditSeriesHandler;
@@ -25,7 +27,7 @@ mod tests {
use crate::models::servarr_data::sonarr::sonarr_data::EDIT_SERIES_SELECTION_BLOCKS;
use super::*;
#[rstest]
fn test_edit_series_select_series_type_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
@@ -663,13 +665,13 @@ mod tests {
}
mod test_handle_submit {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::assert_navigation_popped;
use crate::models::servarr_data::sonarr::modals::EditSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::EDIT_SERIES_SELECTION_BLOCKS;
use crate::models::{BlockSelectionState, Route};
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::assert_eq;
use rstest::rstest;
use super::*;
@@ -707,10 +709,7 @@ mod tests {
.text
.is_empty()
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditSeriesPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditSeriesPrompt.into());
}
#[test]
@@ -745,10 +744,7 @@ mod tests {
.text
.is_empty()
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditSeriesPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditSeriesPrompt.into());
}
#[test]
@@ -772,7 +768,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
}
@@ -834,12 +830,12 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::EditSeries(expected_edit_series_params))
);
assert!(app.data.sonarr_data.edit_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_series_modal);
assert!(app.should_refresh);
}
@@ -1006,8 +1002,8 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
assert_navigation_pushed!(
app,
(selected_block, Some(ActiveSonarrBlock::Series)).into()
);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
@@ -1082,10 +1078,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditSeriesPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditSeriesPrompt.into());
if active_sonarr_block == ActiveSonarrBlock::EditSeriesPathInput
|| active_sonarr_block == ActiveSonarrBlock::EditSeriesTagsInput
@@ -1096,11 +1089,11 @@ mod tests {
}
mod test_handle_esc {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::assert_navigation_popped;
use crate::models::servarr_data::sonarr::modals::EditSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use pretty_assertions::assert_eq;
use rstest::rstest;
use super::*;
@@ -1124,10 +1117,7 @@ mod tests {
EditSeriesHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EditSeriesPrompt.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditSeriesPrompt.into());
}
#[test]
@@ -1140,9 +1130,9 @@ mod tests {
EditSeriesHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert!(app.data.sonarr_data.edit_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_series_modal);
assert!(!app.data.sonarr_data.prompt_confirm);
}
@@ -1164,13 +1154,14 @@ mod tests {
EditSeriesHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
}
}
mod test_handle_key_char {
use super::*;
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState,
servarr_data::sonarr::{
@@ -1352,12 +1343,12 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::EditSeries(expected_edit_series_params))
);
assert!(app.data.sonarr_data.edit_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_series_modal);
assert!(app.should_refresh);
}
}
@@ -1442,7 +1433,7 @@ mod tests {
.build_edit_series_params();
assert_eq!(edit_series_params, expected_edit_series_params);
assert!(app.data.sonarr_data.edit_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_series_modal);
}
#[test]
src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
+20 -37
View File
@@ -2,6 +2,7 @@
mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::library::episode_details_handler::EpisodeDetailsHandler;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::episode;
@@ -103,7 +104,7 @@ mod tests {
.episode_details_tabs
.get_active_route()
);
assert_eq!(app.get_current_route(), left_block.into());
assert_navigation_pushed!(app, left_block.into());
EpisodeDetailsHandler::new(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None)
.handle();
@@ -122,12 +123,13 @@ mod tests {
.episode_details_tabs
.get_active_route()
);
assert_eq!(app.get_current_route(), right_block.into());
assert_navigation_pushed!(app, right_block.into());
}
}
mod test_handle_submit {
use super::*;
use crate::assert_navigation_popped;
use crate::event::Key;
use crate::models::stateful_table::StatefulTable;
use crate::network::sonarr_network::SonarrEvent;
@@ -148,10 +150,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EpisodeHistoryDetails.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::EpisodeHistoryDetails.into());
}
#[test]
@@ -238,7 +237,7 @@ mod tests {
EpisodeDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert_navigation_pushed!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
@@ -262,10 +261,7 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::ManualEpisodeSearch.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::ManualEpisodeSearch.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
@@ -293,10 +289,7 @@ mod tests {
EpisodeDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EpisodeDetails.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EpisodeDetails.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
}
@@ -314,8 +307,8 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
assert_navigation_pushed!(
app,
ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt.into()
);
}
@@ -344,6 +337,7 @@ mod tests {
mod test_handle_esc {
use super::*;
use crate::assert_navigation_popped;
use crate::event::Key;
use pretty_assertions::assert_eq;
@@ -364,10 +358,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EpisodeHistory.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EpisodeHistory.into());
}
#[rstest]
@@ -389,10 +380,7 @@ mod tests {
EpisodeDetailsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EpisodeDetails.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EpisodeDetails.into());
}
#[rstest]
@@ -412,10 +400,7 @@ mod tests {
EpisodeDetailsHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeasonDetails.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SeasonDetails.into());
assert!(
app
.data
@@ -431,6 +416,7 @@ mod tests {
mod test_handle_key_char {
use super::*;
use crate::assert_navigation_popped;
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::assert_eq;
@@ -457,8 +443,8 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
assert_navigation_pushed!(
app,
ActiveSonarrBlock::AutomaticallySearchEpisodePrompt.into()
);
}
@@ -511,7 +497,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert_navigation_pushed!(app, active_sonarr_block.into());
assert!(app.is_routing);
}
@@ -576,7 +562,7 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert_navigation_popped!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::TriggerAutomaticEpisodeSearch(1))
@@ -600,10 +586,7 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::ManualEpisodeSearch.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::ManualEpisodeSearch.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
src/handlers/sonarr_handlers/library/library_handler_tests.rs
+23 -27
View File
@@ -7,6 +7,9 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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::sonarr_handlers::library::{LibraryHandler, series_sorting_options};
@@ -71,6 +74,7 @@ mod tests {
use rstest::rstest;
use super::*;
use crate::assert_navigation_pushed;
#[rstest]
fn test_series_tab_left(#[values(true, false)] is_ready: bool) {
@@ -90,7 +94,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::System.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::System.into());
}
#[rstest]
@@ -111,7 +115,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::Downloads.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Downloads.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Downloads.into());
}
#[rstest]
@@ -144,9 +148,9 @@ mod tests {
}
mod test_handle_submit {
use pretty_assertions::assert_eq;
use crate::assert_navigation_popped;
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::assert_eq;
use super::*;
@@ -163,10 +167,7 @@ mod tests {
LibraryHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Series, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeriesDetails.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::SeriesDetails.into());
}
#[test]
@@ -210,7 +211,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::UpdateAllSeries)
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
}
#[test]
@@ -234,7 +235,7 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
}
}
@@ -244,6 +245,7 @@ mod tests {
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -262,7 +264,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert!(!app.data.sonarr_data.prompt_confirm);
}
@@ -277,7 +279,7 @@ mod tests {
LibraryHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Series, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert!(app.error.text.is_empty());
}
}
@@ -292,7 +294,7 @@ mod tests {
use crate::models::sonarr_models::SeriesType;
use crate::network::sonarr_network::SonarrEvent;
use crate::test_edit_series_key;
use crate::{assert_navigation_popped, test_edit_series_key};
use super::*;
@@ -313,12 +315,9 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddSeriesSearchInput.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::AddSeriesSearchInput.into());
assert!(app.ignore_special_keys_for_textbox_input);
assert!(app.data.sonarr_data.add_series_search.is_some());
assert_modal_present!(app.data.sonarr_data.add_series_search);
}
#[test]
@@ -342,7 +341,7 @@ mod tests {
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(app.data.sonarr_data.add_series_search.is_none());
assert_modal_absent!(app.data.sonarr_data.add_series_search);
}
#[test]
@@ -374,7 +373,7 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert!(app.data.sonarr_data.edit_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_series_modal);
}
#[test]
@@ -418,7 +417,7 @@ mod tests {
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(app.data.sonarr_data.prompt_confirm_action.is_none());
assert_modal_absent!(app.data.sonarr_data.prompt_confirm_action);
assert!(!app.is_routing);
}
@@ -439,10 +438,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::UpdateAllSeriesPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::UpdateAllSeriesPrompt.into());
}
#[test]
@@ -485,7 +481,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Series.into());
assert!(app.should_refresh);
}
@@ -536,7 +532,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::UpdateAllSeries)
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
}
}
src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
+25 -47
View File
@@ -2,6 +2,8 @@
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::handlers::sonarr_handlers::library::season_details_handler::{
SeasonDetailsHandler, releases_sorting_options,
@@ -37,10 +39,7 @@ mod tests {
SeasonDetailsHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::DeleteEpisodeFilePrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::DeleteEpisodeFilePrompt.into());
}
#[test]
@@ -139,7 +138,7 @@ mod tests {
.season_details_tabs
.get_active_route()
);
assert_eq!(app.get_current_route(), left_block.into());
assert_navigation_pushed!(app, left_block.into());
SeasonDetailsHandler::new(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None).handle();
@@ -154,12 +153,13 @@ mod tests {
.season_details_tabs
.get_active_route()
);
assert_eq!(app.get_current_route(), right_block.into());
assert_navigation_pushed!(app, right_block.into());
}
}
mod test_handle_submit {
use super::*;
use crate::assert_navigation_popped;
use crate::event::Key;
use crate::models::stateful_table::StatefulTable;
use crate::network::sonarr_network::SonarrEvent;
@@ -176,10 +176,7 @@ mod tests {
SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::EpisodeDetails.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::EpisodeDetails.into());
}
#[test]
@@ -227,10 +224,7 @@ mod tests {
SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeasonHistoryDetails.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::SeasonHistoryDetails.into());
}
#[test]
@@ -295,7 +289,7 @@ mod tests {
SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert_navigation_popped!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
@@ -319,10 +313,7 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::ManualSeasonSearch.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::ManualSeasonSearch.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
@@ -352,10 +343,7 @@ mod tests {
SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeasonDetails.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SeasonDetails.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
}
@@ -373,8 +361,8 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
assert_navigation_pushed!(
app,
ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt.into()
);
}
@@ -403,6 +391,7 @@ mod tests {
mod test_handle_esc {
use super::*;
use crate::assert_navigation_popped;
use crate::event::Key;
use crate::models::sonarr_models::SonarrHistoryItem;
use crate::models::stateful_table::StatefulTable;
@@ -426,10 +415,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeasonHistory.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SeasonHistory.into());
}
#[rstest]
@@ -452,10 +438,7 @@ mod tests {
SeasonDetailsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeasonDetails.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SeasonDetails.into());
}
#[test]
@@ -536,16 +519,14 @@ mod tests {
SeasonDetailsHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeriesDetails.into()
);
assert!(app.data.sonarr_data.season_details_modal.is_none());
assert_navigation_popped!(app, ActiveSonarrBlock::SeriesDetails.into());
assert_modal_absent!(app.data.sonarr_data.season_details_modal);
}
}
mod test_handle_key_char {
use super::*;
use crate::assert_navigation_popped;
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::assert_eq;
@@ -605,7 +586,7 @@ mod tests {
ActiveSonarrBlock::SeasonDetails.into()
);
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(app.data.sonarr_data.prompt_confirm_action.is_none());
assert_modal_absent!(app.data.sonarr_data.prompt_confirm_action);
assert!(!app.is_routing);
}
@@ -630,8 +611,8 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
assert_navigation_pushed!(
app,
ActiveSonarrBlock::AutomaticallySearchSeasonPrompt.into()
);
}
@@ -682,7 +663,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert_navigation_pushed!(app, active_sonarr_block.into());
assert!(app.is_routing);
}
@@ -743,7 +724,7 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert_navigation_popped!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
@@ -767,10 +748,7 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::ManualSeasonSearch.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::ManualSeasonSearch.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
+20 -38
View File
@@ -2,6 +2,8 @@
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::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::library::series_details_handler::SeriesDetailsHandler;
@@ -69,7 +71,7 @@ mod tests {
app.get_current_route(),
app.data.sonarr_data.series_info_tabs.get_active_route()
);
assert_eq!(app.get_current_route(), left_block.into());
assert_navigation_pushed!(app, left_block.into());
SeriesDetailsHandler::new(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None).handle();
@@ -77,15 +79,15 @@ mod tests {
app.get_current_route(),
app.data.sonarr_data.series_info_tabs.get_active_route()
);
assert_eq!(app.get_current_route(), right_block.into());
assert_navigation_pushed!(app, right_block.into());
}
}
mod test_handle_submit {
use pretty_assertions::assert_eq;
use crate::extended_stateful_iterable_vec;
use crate::network::sonarr_network::SonarrEvent;
use crate::{assert_navigation_popped, extended_stateful_iterable_vec};
use super::*;
@@ -103,10 +105,7 @@ mod tests {
SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesDetails, None)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeasonDetails.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::SeasonDetails.into());
}
#[test]
@@ -145,10 +144,7 @@ mod tests {
SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesHistory, None)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeriesHistoryDetails.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::SeriesHistoryDetails.into());
}
#[test]
@@ -200,10 +196,7 @@ mod tests {
SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeriesDetails.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SeriesDetails.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
@@ -225,16 +218,14 @@ mod tests {
SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeriesDetails.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SeriesDetails.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
}
}
mod test_handle_esc {
use super::*;
use crate::assert_navigation_popped;
use crate::models::stateful_table::StatefulTable;
use pretty_assertions::assert_eq;
use ratatui::widgets::TableState;
@@ -255,10 +246,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeriesHistory.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SeriesHistory.into());
}
#[rstest]
@@ -279,10 +267,7 @@ mod tests {
SeriesDetailsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeriesDetails.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SeriesDetails.into());
}
#[test]
@@ -343,7 +328,7 @@ mod tests {
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use crate::models::sonarr_models::{Series, SeriesType};
use crate::network::sonarr_network::SonarrEvent;
use crate::test_edit_series_key;
use crate::{assert_navigation_popped, test_edit_series_key};
use pretty_assertions::{assert_eq, assert_str_eq};
use serde_json::Number;
use strum::IntoEnumIterator;
@@ -378,7 +363,7 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert!(app.data.sonarr_data.edit_series_modal.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_series_modal);
}
#[test]
@@ -428,7 +413,7 @@ mod tests {
ActiveSonarrBlock::SeriesDetails.into()
);
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(app.data.sonarr_data.prompt_confirm_action.is_none());
assert_modal_absent!(app.data.sonarr_data.prompt_confirm_action);
assert!(!app.is_routing);
}
@@ -451,8 +436,8 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
assert_navigation_pushed!(
app,
ActiveSonarrBlock::AutomaticallySearchSeriesPrompt.into()
);
}
@@ -496,10 +481,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::UpdateAndScanSeriesPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::UpdateAndScanSeriesPrompt.into());
}
#[rstest]
@@ -542,7 +524,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert_navigation_pushed!(app, active_sonarr_block.into());
assert!(app.is_routing);
}
@@ -598,7 +580,7 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert_navigation_popped!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs
+26 -50
View File
@@ -6,6 +6,9 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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::sonarr_handlers::root_folders::RootFoldersHandler;
@@ -94,10 +97,7 @@ mod tests {
RootFoldersHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::RootFolders, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::DeleteRootFolderPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::DeleteRootFolderPrompt.into());
}
#[test]
@@ -127,6 +127,7 @@ mod tests {
use rstest::rstest;
use super::*;
use crate::assert_navigation_pushed;
#[rstest]
fn test_root_folders_tab_left(#[values(true, false)] is_ready: bool) {
@@ -147,7 +148,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::History.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::History.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::History.into());
}
#[rstest]
@@ -169,7 +170,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::Indexers.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Indexers.into());
}
#[rstest]
@@ -254,6 +255,7 @@ mod tests {
use crate::network::sonarr_network::SonarrEvent;
use super::*;
use crate::{assert_modal_absent, assert_navigation_popped};
const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
@@ -288,11 +290,8 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::AddRootFolder(expected_add_root_folder_body))
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert!(app.data.sonarr_data.edit_root_folder.is_none());
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
assert_modal_absent!(app.data.sonarr_data.edit_root_folder);
}
#[test]
@@ -314,7 +313,7 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(app.ignore_special_keys_for_textbox_input);
assert!(app.data.sonarr_data.prompt_confirm_action.is_none());
assert_modal_absent!(app.data.sonarr_data.prompt_confirm_action);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddRootFolderPrompt.into()
@@ -346,10 +345,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteRootFolder(1))
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
}
#[test]
@@ -373,15 +369,13 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
}
}
mod test_handle_esc {
use super::*;
use crate::assert_navigation_popped;
use pretty_assertions::assert_eq;
use rstest::rstest;
@@ -402,10 +396,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
assert!(!app.data.sonarr_data.prompt_confirm);
}
@@ -425,12 +416,9 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
assert!(app.data.sonarr_data.edit_root_folder.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_root_folder);
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(!app.ignore_special_keys_for_textbox_input);
}
@@ -445,18 +433,15 @@ mod tests {
RootFoldersHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::RootFolders, None).handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
assert!(app.error.text.is_empty());
}
}
mod test_handle_key_char {
use pretty_assertions::{assert_eq, assert_str_eq};
use crate::assert_navigation_popped;
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::{assert_eq, assert_str_eq};
use super::*;
@@ -478,12 +463,9 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::AddRootFolderPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::AddRootFolderPrompt.into());
assert!(app.ignore_special_keys_for_textbox_input);
assert!(app.data.sonarr_data.edit_root_folder.is_some());
assert_modal_present!(app.data.sonarr_data.edit_root_folder);
}
#[test]
@@ -510,7 +492,7 @@ mod tests {
ActiveSonarrBlock::RootFolders.into()
);
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(app.data.sonarr_data.edit_root_folder.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_root_folder);
}
#[test]
@@ -531,10 +513,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::RootFolders.into());
assert!(app.should_refresh);
}
@@ -638,10 +617,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteRootFolder(1))
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::RootFolders.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
}
}
@@ -712,7 +688,7 @@ mod tests {
.build_add_root_folder_body();
assert_eq!(root_folder, expected_add_root_folder_body);
assert!(app.data.sonarr_data.edit_root_folder.is_none());
assert_modal_absent!(app.data.sonarr_data.edit_root_folder);
}
#[test]
src/handlers/sonarr_handlers/sonarr_handler_tests.rs
+5 -4
View File
@@ -2,6 +2,7 @@
mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::SonarrHandler;
use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
@@ -33,7 +34,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
left_block.into()
);
assert_eq!(app.get_current_route(), left_block.into());
assert_navigation_pushed!(app, left_block.into());
app.data.sonarr_data.main_tabs.set_index(index);
@@ -43,7 +44,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
right_block.into()
);
assert_eq!(app.get_current_route(), right_block.into());
assert_navigation_pushed!(app, right_block.into());
}
#[rstest]
@@ -68,7 +69,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
left_block.into()
);
assert_eq!(app.get_current_route(), left_block.into());
assert_navigation_pushed!(app, left_block.into());
app.data.sonarr_data.main_tabs.set_index(index);
@@ -78,7 +79,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
right_block.into()
);
assert_eq!(app.get_current_route(), right_block.into());
assert_navigation_pushed!(app, right_block.into());
}
#[rstest]
src/handlers/sonarr_handlers/system/system_details_handler_tests.rs
+15 -27
View File
@@ -6,6 +6,7 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::system::system_details_handler::SystemDetailsHandler;
@@ -652,9 +653,9 @@ mod tests {
}
mod test_handle_submit {
use pretty_assertions::assert_eq;
use crate::assert_navigation_popped;
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::assert_eq;
use super::*;
@@ -669,10 +670,7 @@ mod tests {
SystemDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SystemTasks, None)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SystemTaskStartConfirmPrompt.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::SystemTaskStartConfirmPrompt.into());
}
#[test]
@@ -717,10 +715,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::StartTask(SonarrTaskName::default()))
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SystemTasks.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SystemTasks.into());
}
#[test]
@@ -740,10 +735,7 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SystemTasks.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SystemTasks.into());
}
}
@@ -753,6 +745,7 @@ mod tests {
use rstest::rstest;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -775,7 +768,7 @@ mod tests {
SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::SystemLogs, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into());
assert_navigation_popped!(app, ActiveSonarrBlock::System.into());
assert!(app.data.sonarr_data.log_details.items.is_empty());
}
@@ -793,7 +786,7 @@ mod tests {
SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::SystemTasks, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into());
assert_navigation_popped!(app, ActiveSonarrBlock::System.into());
}
#[rstest]
@@ -816,7 +809,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into());
assert_navigation_popped!(app, ActiveSonarrBlock::System.into());
}
#[rstest]
@@ -828,7 +821,7 @@ mod tests {
SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::SystemUpdates, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into());
assert_navigation_popped!(app, ActiveSonarrBlock::System.into());
}
#[test]
@@ -846,10 +839,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SystemTasks.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SystemTasks.into());
assert!(!app.data.sonarr_data.prompt_confirm);
}
}
@@ -861,6 +851,7 @@ mod tests {
use crate::network::sonarr_network::SonarrEvent;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
#[rstest]
fn test_refresh_key(
@@ -885,7 +876,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), active_sonarr_block.into());
assert_navigation_pushed!(app, active_sonarr_block.into());
assert!(app.should_refresh);
}
@@ -943,10 +934,7 @@ mod tests {
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::StartTask(SonarrTaskName::default()))
);
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SystemTasks.into()
);
assert_navigation_popped!(app, ActiveSonarrBlock::SystemTasks.into());
}
}
src/handlers/sonarr_handlers/system/system_handler_tests.rs
+11 -20
View File
@@ -5,6 +5,7 @@ mod tests {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::system::SystemHandler;
@@ -19,6 +20,7 @@ mod tests {
use pretty_assertions::assert_eq;
use super::*;
use crate::assert_navigation_pushed;
#[rstest]
fn test_system_tab_left(#[values(true, false)] is_ready: bool) {
@@ -39,7 +41,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::Indexers.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Indexers.into());
}
#[rstest]
@@ -61,7 +63,7 @@ mod tests {
app.data.sonarr_data.main_tabs.get_active_route(),
ActiveSonarrBlock::Series.into()
);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::Series.into());
}
}
@@ -69,6 +71,7 @@ mod tests {
use pretty_assertions::assert_eq;
use super::*;
use crate::{assert_navigation_popped, assert_navigation_pushed};
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -82,7 +85,7 @@ mod tests {
SystemHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::System, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into());
assert_navigation_popped!(app, ActiveSonarrBlock::System.into());
assert!(app.error.text.is_empty());
}
}
@@ -121,10 +124,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SystemUpdates.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::SystemUpdates.into());
}
#[test]
@@ -185,10 +185,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SystemQueuedEvents.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::SystemQueuedEvents.into());
}
#[test]
@@ -249,7 +246,7 @@ mod tests {
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into());
assert_navigation_pushed!(app, ActiveSonarrBlock::System.into());
assert!(app.should_refresh);
}
@@ -313,10 +310,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SystemLogs.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::SystemLogs.into());
assert_eq!(
app.data.sonarr_data.log_details.items,
app.data.sonarr_data.logs.items
@@ -386,10 +380,7 @@ mod tests {
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SystemTasks.into()
);
assert_navigation_pushed!(app, ActiveSonarrBlock::SystemTasks.into());
}
#[test]