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

refactor: Updated all handler tests to use purpose built assertions to improve readability and maintainability

Browse Source
This commit is contained in:
Alex Clarke
2025-12-09 14:28:47 -07:00
parent d47dadeb88
commit d4bea91186
38 changed files with 801 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs
+10 -10
View File
@@ -7,12 +7,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::sonarr_handlers::blocklist::{blocklist_sorting_options, BlocklistHandler};
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::blocklist::{BlocklistHandler, blocklist_sorting_options};
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, BLOCKLIST_BLOCKS};
use crate::models::servarr_models::{Language, Quality, QualityWrapper};
use crate::models::sonarr_models::BlocklistItem;
@@ -179,9 +179,9 @@ mod tests {
BlocklistHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&expected_action
);
assert_navigation_popped!(app, base_route.into());
}
@@ -202,7 +202,7 @@ mod tests {
BlocklistHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert_navigation_popped!(app, ActiveSonarrBlock::Blocklist.into());
}
}
@@ -267,7 +267,7 @@ mod tests {
BlocklistHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Blocklist.into());
assert!(app.error.text.is_empty());
assert_is_empty!(app.error.text);
}
}
@@ -382,9 +382,9 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&expected_action
);
assert_navigation_popped!(app, base_route.into());
}
src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs
+10 -11
View File
@@ -4,13 +4,13 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::download_record;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DOWNLOADS_BLOCKS};
use crate::models::sonarr_models::DownloadRecord;
@@ -127,7 +127,6 @@ mod tests {
}
mod test_handle_submit {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::network::sonarr_network::SonarrEvent;
@@ -166,9 +165,9 @@ mod tests {
DownloadsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&expected_action
);
assert_navigation_popped!(app, base_route.into());
}
@@ -192,7 +191,7 @@ mod tests {
DownloadsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert_navigation_popped!(app, base_route.into());
}
}
@@ -234,7 +233,7 @@ mod tests {
DownloadsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Downloads, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Downloads.into());
assert!(app.error.text.is_empty());
assert_is_empty!(app.error.text);
}
}
@@ -368,9 +367,9 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&expected_action
);
assert_navigation_popped!(app, base_route.into());
}
src/handlers/sonarr_handlers/history/history_handler_tests.rs
+3 -3
View File
@@ -7,12 +7,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::sonarr_handlers::history::{history_sorting_options, HistoryHandler};
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::history::{HistoryHandler, history_sorting_options};
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, HISTORY_BLOCKS};
use crate::models::servarr_models::{Language, Quality, QualityWrapper};
use crate::models::sonarr_models::{SonarrHistoryEventType, SonarrHistoryItem};
@@ -153,7 +153,7 @@ mod tests {
HistoryHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::History, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::History.into());
assert!(app.error.text.is_empty());
assert_is_empty!(app.error.text);
}
}
src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs
+128 -107
View File
@@ -1,14 +1,14 @@
#[cfg(test)]
mod tests {
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::indexer;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, 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::sonarr::sonarr_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::sonarr::sonarr_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::{
servarr_data::sonarr::sonarr_data::EDIT_INDEXER_TORRENT_SELECTION_BLOCKS, BlockSelectionState,
BlockSelectionState, servarr_data::sonarr::sonarr_data::EDIT_INDEXER_TORRENT_SELECTION_BLOCKS,
};
use crate::network::sonarr_network::SonarrEvent;
@@ -887,9 +887,9 @@ mod tests {
.handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert!(!app.should_refresh);
assert_eq!(app.data.sonarr_data.edit_indexer_modal, None);
assert_none!(app.data.sonarr_data.edit_indexer_modal);
}
#[test]
@@ -972,7 +972,7 @@ mod tests {
);
assert_modal_present!(app.data.sonarr_data.edit_indexer_modal);
assert!(!app.should_refresh);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
}
#[rstest]
@@ -1054,14 +1054,16 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert!(app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_rss
.unwrap());
assert!(
app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_rss
.unwrap()
);
EditIndexerHandler::new(
SUBMIT_KEY,
@@ -1075,14 +1077,16 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert!(!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_rss
.unwrap());
assert!(
!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_rss
.unwrap()
);
}
#[test]
@@ -1107,14 +1111,16 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert!(app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_automatic_search
.unwrap());
assert!(
app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_automatic_search
.unwrap()
);
EditIndexerHandler::new(
SUBMIT_KEY,
@@ -1128,14 +1134,16 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert!(!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_automatic_search
.unwrap());
assert!(
!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_automatic_search
.unwrap()
);
}
#[test]
@@ -1160,14 +1168,16 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert!(app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_interactive_search
.unwrap());
assert!(
app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_interactive_search
.unwrap()
);
EditIndexerHandler::new(
SUBMIT_KEY,
@@ -1181,14 +1191,16 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::EditIndexerPrompt.into()
);
assert!(!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_interactive_search
.unwrap());
assert!(
!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.enable_interactive_search
.unwrap()
);
}
#[test]
@@ -1212,15 +1224,17 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.name
.text
.is_empty());
assert!(
!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.name
.text
.is_empty()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
@@ -1245,15 +1259,17 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.url
.text
.is_empty());
assert!(
!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.url
.text
.is_empty()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
@@ -1278,15 +1294,17 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.api_key
.text
.is_empty());
assert!(
!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.api_key
.text
.is_empty()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
@@ -1311,15 +1329,17 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.seed_ratio
.text
.is_empty());
assert!(
!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.seed_ratio
.text
.is_empty()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
@@ -1344,15 +1364,17 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.tags
.text
.is_empty());
assert!(
!app
.data
.sonarr_data
.edit_indexer_modal
.as_ref()
.unwrap()
.tags
.text
.is_empty()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
}
}
@@ -1363,7 +1385,6 @@ mod tests {
use crate::assert_navigation_popped;
use crate::event::Key;
use crate::models::servarr_data::modals::EditIndexerModal;
use pretty_assertions::assert_eq;
use rstest::rstest;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -1386,7 +1407,7 @@ mod tests {
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.edit_indexer_modal, None);
assert_none!(app.data.sonarr_data.edit_indexer_modal);
}
#[rstest]
@@ -1411,9 +1432,9 @@ mod tests {
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(!app.ignore_special_keys_for_textbox_input);
assert_eq!(
app.data.sonarr_data.edit_indexer_modal,
Some(EditIndexerModal::default())
assert_some_eq_x!(
&app.data.sonarr_data.edit_indexer_modal,
&EditIndexerModal::default()
);
}
}
@@ -1422,9 +1443,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::sonarr::sonarr_data::EDIT_INDEXER_TORRENT_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use crate::network::sonarr_network::SonarrEvent;
use pretty_assertions::{assert_eq, assert_str_eq};
src/handlers/sonarr_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::key_binding::DEFAULT_KEYBINDINGS;
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;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::indexer_settings;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, INDEXER_SETTINGS_BLOCKS,
};
@@ -21,9 +21,9 @@ mod tests {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::sonarr::sonarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS;
use crate::models::sonarr_models::IndexerSettings;
use crate::models::BlockSelectionState;
use super::*;
@@ -241,8 +241,8 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
servarr_data::sonarr::sonarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS,
sonarr_models::IndexerSettings, BlockSelectionState,
BlockSelectionState, servarr_data::sonarr::sonarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS,
sonarr_models::IndexerSettings,
},
network::sonarr_network::SonarrEvent,
};
@@ -274,9 +274,9 @@ mod tests {
.handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert!(!app.should_refresh);
assert_eq!(app.data.sonarr_data.indexer_settings, None);
assert_none!(app.data.sonarr_data.indexer_settings);
}
#[test]
@@ -303,9 +303,9 @@ mod tests {
.handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::EditAllIndexerSettings(indexer_settings()))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::EditAllIndexerSettings(indexer_settings())
);
assert_modal_absent!(app.data.sonarr_data.indexer_settings);
assert!(app.should_refresh);
@@ -413,7 +413,6 @@ mod tests {
}
mod test_handle_esc {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::sonarr_models::IndexerSettings;
@@ -441,7 +440,7 @@ mod tests {
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.indexer_settings, None);
assert_none!(app.data.sonarr_data.indexer_settings);
}
#[rstest]
@@ -462,9 +461,9 @@ mod tests {
IndexerSettingsHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(
app.data.sonarr_data.indexer_settings,
Some(IndexerSettings::default())
assert_some_eq_x!(
&app.data.sonarr_data.indexer_settings,
&IndexerSettings::default()
);
}
}
@@ -473,11 +472,10 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
servarr_data::sonarr::sonarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS, BlockSelectionState,
BlockSelectionState, servarr_data::sonarr::sonarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS,
},
network::sonarr_network::SonarrEvent,
};
use pretty_assertions::assert_eq;
use super::*;
@@ -504,9 +502,9 @@ mod tests {
.handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::EditAllIndexerSettings(indexer_settings()))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::EditAllIndexerSettings(indexer_settings())
);
assert_modal_absent!(app.data.sonarr_data.indexer_settings);
assert!(app.should_refresh);
src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs
+20 -21
View File
@@ -4,15 +4,15 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::indexer;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, EDIT_INDEXER_BLOCKS, INDEXERS_BLOCKS, INDEXER_SETTINGS_BLOCKS,
ActiveSonarrBlock, EDIT_INDEXER_BLOCKS, INDEXER_SETTINGS_BLOCKS, INDEXERS_BLOCKS,
};
use crate::models::servarr_models::Indexer;
use crate::test_handler_delegation;
@@ -127,7 +127,7 @@ mod tests {
use crate::assert_navigation_popped;
use crate::models::servarr_data::modals::EditIndexerModal;
use crate::models::servarr_data::sonarr::sonarr_data::{
SonarrData, EDIT_INDEXER_NZB_SELECTION_BLOCKS, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS,
EDIT_INDEXER_NZB_SELECTION_BLOCKS, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS, SonarrData,
};
use crate::models::servarr_models::{Indexer, IndexerField};
use crate::network::sonarr_network::SonarrEvent;
@@ -197,13 +197,13 @@ mod tests {
IndexersHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle();
assert_navigation_pushed!(app, ActiveSonarrBlock::EditIndexerPrompt.into());
assert_eq!(
app.data.sonarr_data.edit_indexer_modal,
Some((&app.data.sonarr_data).into())
assert_some_eq_x!(
&app.data.sonarr_data.edit_indexer_modal,
&EditIndexerModal::from(&app.data.sonarr_data)
);
assert_eq!(
app.data.sonarr_data.edit_indexer_modal,
Some(expected_edit_indexer_modal)
assert_some_eq_x!(
&app.data.sonarr_data.edit_indexer_modal,
&expected_edit_indexer_modal
);
if torrent_protocol {
assert_eq!(
@@ -233,7 +233,7 @@ mod tests {
IndexersHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
assert_eq!(app.data.sonarr_data.edit_indexer_modal, None);
assert_none!(app.data.sonarr_data.edit_indexer_modal);
}
#[test]
@@ -253,9 +253,9 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteIndexer(1))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::DeleteIndexer(1)
);
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
}
@@ -280,13 +280,12 @@ mod tests {
.handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
}
}
mod test_handle_esc {
use pretty_assertions::assert_eq;
use super::*;
use crate::assert_navigation_popped;
@@ -324,7 +323,7 @@ mod tests {
IndexersHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::TestIndexer, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert_eq!(app.data.sonarr_data.indexer_test_errors, None);
assert_none!(app.data.sonarr_data.indexer_test_errors);
}
#[rstest]
@@ -338,7 +337,7 @@ mod tests {
IndexersHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
assert!(app.error.text.is_empty());
assert_is_empty!(app.error.text);
}
}
@@ -552,9 +551,9 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteIndexer(1))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::DeleteIndexer(1)
);
assert_navigation_popped!(app, ActiveSonarrBlock::Indexers.into());
}
src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs
+2 -2
View File
@@ -1,9 +1,9 @@
#[cfg(test)]
mod tests {
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::handlers::sonarr_handlers::indexers::test_all_indexers_handler::TestAllIndexersHandler;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::indexers::test_all_indexers_handler::TestAllIndexersHandler;
use crate::models::servarr_data::modals::IndexerTestResultModalItem;
use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
use crate::models::stateful_table::StatefulTable;
src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
+43 -38
View File
@@ -5,32 +5,32 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::add_series_search_result;
use crate::handlers::KeyEventHandler;
use crate::models::HorizontallyScrollableText;
use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, ADD_SERIES_BLOCKS};
use crate::models::servarr_data::sonarr::sonarr_data::{ADD_SERIES_BLOCKS, ActiveSonarrBlock};
use crate::models::servarr_models::RootFolder;
use crate::models::sonarr_models::{
AddSeriesBody, AddSeriesOptions, AddSeriesSearchResult, SeriesMonitor, SeriesType,
};
use crate::models::stateful_table::StatefulTable;
use crate::models::HorizontallyScrollableText;
mod test_handle_scroll_up_and_down {
use pretty_assertions::assert_eq;
use rstest::rstest;
use strum::IntoEnumIterator;
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::BlockSelectionState;
use crate::simple_stateful_iterable_vec;
use super::*;
@@ -898,11 +898,11 @@ mod tests {
mod test_handle_submit {
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::models::BlockSelectionState;
use crate::network::sonarr_network::SonarrEvent;
use bimap::BiMap;
use pretty_assertions::{assert_eq, assert_str_eq};
@@ -978,33 +978,39 @@ mod tests {
ActiveSonarrBlock::AddSeriesSelectRootFolder
);
assert_modal_present!(app.data.sonarr_data.add_series_modal);
assert!(!app
.data
.sonarr_data
.add_series_modal
.as_ref()
.unwrap()
.monitor_list
.items
.is_empty());
assert!(!app
.data
.sonarr_data
.add_series_modal
.as_ref()
.unwrap()
.series_type_list
.items
.is_empty());
assert!(!app
.data
.sonarr_data
.add_series_modal
.as_ref()
.unwrap()
.quality_profile_list
.items
.is_empty());
assert!(
!app
.data
.sonarr_data
.add_series_modal
.as_ref()
.unwrap()
.monitor_list
.items
.is_empty()
);
assert!(
!app
.data
.sonarr_data
.add_series_modal
.as_ref()
.unwrap()
.series_type_list
.items
.is_empty()
);
assert!(
!app
.data
.sonarr_data
.add_series_modal
.as_ref()
.unwrap()
.quality_profile_list
.items
.is_empty()
);
assert_str_eq!(
app
.data
@@ -1106,7 +1112,7 @@ mod tests {
.handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
}
#[test]
@@ -1222,7 +1228,7 @@ mod tests {
.handle();
assert_navigation_pushed!(app, selected_block.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
if selected_block == ActiveSonarrBlock::AddSeriesTagsInput {
assert!(app.ignore_special_keys_for_textbox_input);
@@ -1311,7 +1317,6 @@ mod tests {
}
mod test_handle_esc {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
@@ -1342,7 +1347,7 @@ mod tests {
assert!(!app.ignore_special_keys_for_textbox_input);
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(app.data.sonarr_data.add_series_search, None);
assert_none!(app.data.sonarr_data.add_series_search);
}
#[test]
@@ -1475,8 +1480,8 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
servarr_data::sonarr::{modals::AddSeriesModal, sonarr_data::ADD_SERIES_SELECTION_BLOCKS},
BlockSelectionState,
servarr_data::sonarr::{modals::AddSeriesModal, sonarr_data::ADD_SERIES_SELECTION_BLOCKS},
},
network::sonarr_network::SonarrEvent,
};
src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs
+7 -7
View File
@@ -4,12 +4,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::library::delete_series_handler::DeleteSeriesHandler;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::series;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DELETE_SERIES_BLOCKS};
use crate::models::sonarr_models::DeleteSeriesParams;
@@ -17,8 +17,8 @@ mod tests {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::servarr_data::sonarr::sonarr_data::DELETE_SERIES_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::sonarr::sonarr_data::DELETE_SERIES_SELECTION_BLOCKS;
use super::*;
@@ -86,8 +86,8 @@ mod tests {
mod test_handle_submit {
use pretty_assertions::assert_eq;
use crate::models::servarr_data::sonarr::sonarr_data::DELETE_SERIES_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::sonarr::sonarr_data::DELETE_SERIES_SELECTION_BLOCKS;
use crate::network::sonarr_network::SonarrEvent;
use super::*;
@@ -119,7 +119,7 @@ mod tests {
.handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(!app.data.sonarr_data.delete_series_files);
assert!(!app.data.sonarr_data.add_list_exclusion);
@@ -188,7 +188,7 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::DeleteSeriesPrompt.into()
);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert!(!app.should_refresh);
assert!(app.data.sonarr_data.prompt_confirm);
assert!(app.data.sonarr_data.delete_series_files);
@@ -263,7 +263,7 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
servarr_data::sonarr::sonarr_data::DELETE_SERIES_SELECTION_BLOCKS, BlockSelectionState,
BlockSelectionState, servarr_data::sonarr::sonarr_data::DELETE_SERIES_SELECTION_BLOCKS,
},
network::sonarr_network::SonarrEvent,
};
src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs
+38 -34
View File
@@ -5,14 +5,14 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::series;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::sonarr::modals::EditSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, EDIT_SERIES_BLOCKS};
use crate::models::sonarr_models::{EditSeriesParams, Series, SeriesType};
@@ -22,9 +22,9 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::sonarr::modals::EditSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::EDIT_SERIES_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use super::*;
@@ -698,15 +698,17 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(!app
.data
.sonarr_data
.edit_series_modal
.as_ref()
.unwrap()
.path
.text
.is_empty());
assert!(
!app
.data
.sonarr_data
.edit_series_modal
.as_ref()
.unwrap()
.path
.text
.is_empty()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditSeriesPrompt.into());
}
@@ -731,15 +733,17 @@ mod tests {
.handle();
assert!(!app.ignore_special_keys_for_textbox_input);
assert!(!app
.data
.sonarr_data
.edit_series_modal
.as_mut()
.unwrap()
.tags
.text
.is_empty());
assert!(
!app
.data
.sonarr_data
.edit_series_modal
.as_mut()
.unwrap()
.tags
.text
.is_empty()
);
assert_navigation_popped!(app, ActiveSonarrBlock::EditSeriesPrompt.into());
}
@@ -765,7 +769,7 @@ mod tests {
.handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
}
#[test]
@@ -856,7 +860,7 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::EditSeriesPrompt.into()
);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert!(!app.should_refresh);
}
@@ -881,7 +885,7 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), current_route);
assert_eq!(
assert_some_eq_x!(
app
.data
.sonarr_data
@@ -889,7 +893,7 @@ mod tests {
.as_ref()
.unwrap()
.monitored,
Some(true)
true
);
EditSeriesHandler::new(
@@ -901,7 +905,7 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), current_route);
assert_eq!(
assert_some_eq_x!(
app
.data
.sonarr_data
@@ -909,7 +913,7 @@ mod tests {
.as_ref()
.unwrap()
.monitored,
Some(false)
false
);
}
@@ -935,7 +939,7 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), current_route);
assert_eq!(
assert_some_eq_x!(
app
.data
.sonarr_data
@@ -943,7 +947,7 @@ mod tests {
.as_ref()
.unwrap()
.use_season_folders,
Some(true)
true
);
EditSeriesHandler::new(
@@ -955,7 +959,7 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), current_route);
assert_eq!(
assert_some_eq_x!(
app
.data
.sonarr_data
@@ -963,7 +967,7 @@ mod tests {
.as_ref()
.unwrap()
.use_season_folders,
Some(false)
false
);
}
@@ -1002,7 +1006,7 @@ mod tests {
app,
(selected_block, Some(ActiveSonarrBlock::Series)).into()
);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
if selected_block == ActiveSonarrBlock::EditSeriesPathInput
|| selected_block == ActiveSonarrBlock::EditSeriesTagsInput
@@ -1045,7 +1049,7 @@ mod tests {
)
.into()
);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert!(!app.ignore_special_keys_for_textbox_input);
}
@@ -1158,10 +1162,10 @@ mod tests {
use crate::{
assert_navigation_popped,
models::{
BlockSelectionState,
servarr_data::sonarr::{
modals::EditSeriesModal, sonarr_data::EDIT_SERIES_SELECTION_BLOCKS,
},
BlockSelectionState,
},
network::sonarr_network::SonarrEvent,
};
src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
+26 -25
View File
@@ -1,11 +1,11 @@
#[cfg(test)]
mod tests {
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::sonarr::modals::{EpisodeDetailsModal, SeasonDetailsModal};
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use crate::models::servarr_data::sonarr::sonarr_data::{
@@ -238,9 +238,9 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_pushed!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&expected_action
);
}
@@ -262,14 +262,14 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveSonarrBlock::ManualEpisodeSearch.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
guid: String::new(),
indexer_id: 0,
episode_id: Some(0),
..SonarrReleaseDownloadBody::default()
}))
})
);
}
@@ -290,7 +290,7 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveSonarrBlock::EpisodeDetails.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
}
#[test]
@@ -400,14 +400,15 @@ mod tests {
EpisodeDetailsHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::SeasonDetails.into());
assert!(app
.data
.sonarr_data
.season_details_modal
.as_ref()
.unwrap()
.episode_details_modal
.is_none());
assert_none!(
app
.data
.sonarr_data
.season_details_modal
.as_ref()
.unwrap()
.episode_details_modal
);
}
}
@@ -560,9 +561,9 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::TriggerAutomaticEpisodeSearch(1))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::TriggerAutomaticEpisodeSearch(1)
);
}
@@ -584,14 +585,14 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveSonarrBlock::ManualEpisodeSearch.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
guid: String::new(),
indexer_id: 0,
episode_id: Some(0),
..SonarrReleaseDownloadBody::default()
}))
})
);
}
}
src/handlers/sonarr_handlers/library/library_handler_tests.rs
+16 -16
View File
@@ -5,17 +5,17 @@ mod tests {
use std::cmp::Ordering;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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::sonarr_handlers::library::{series_sorting_options, LibraryHandler};
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::series;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::library::{LibraryHandler, series_sorting_options};
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::series;
use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, ADD_SERIES_BLOCKS, DELETE_SERIES_BLOCKS, EDIT_SERIES_BLOCKS,
ADD_SERIES_BLOCKS, ActiveSonarrBlock, DELETE_SERIES_BLOCKS, EDIT_SERIES_BLOCKS,
EPISODE_DETAILS_BLOCKS, LIBRARY_BLOCKS, SEASON_DETAILS_BLOCKS, SERIES_DETAILS_BLOCKS,
};
use crate::models::sonarr_models::{Series, SeriesStatistics, SeriesStatus, SeriesType};
@@ -207,9 +207,9 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::UpdateAllSeries)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::UpdateAllSeries
);
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
}
@@ -234,7 +234,7 @@ mod tests {
.handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
}
}
@@ -279,7 +279,7 @@ mod tests {
LibraryHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Series, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
assert!(app.error.text.is_empty());
assert_is_empty!(app.error.text);
}
}
@@ -288,8 +288,8 @@ mod tests {
use serde_json::Number;
use strum::IntoEnumIterator;
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use crate::models::servarr_data::sonarr::sonarr_data::SonarrData;
use crate::models::servarr_data::sonarr::sonarr_data::sonarr_test_utils::utils::create_test_sonarr_data;
use crate::models::sonarr_models::SeriesType;
use crate::network::sonarr_network::SonarrEvent;
@@ -393,9 +393,9 @@ mod tests {
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
assert!(app.data.sonarr_data.prompt_confirm);
assert!(app.is_routing);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::ToggleSeriesMonitoring(0))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::ToggleSeriesMonitoring(0)
);
}
@@ -527,9 +527,9 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::UpdateAllSeries)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::UpdateAllSeries
);
assert_navigation_popped!(app, ActiveSonarrBlock::Series.into());
}
src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
+21 -24
View File
@@ -290,9 +290,9 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&expected_action
);
}
@@ -314,15 +314,15 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveSonarrBlock::ManualSeasonSearch.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
guid: String::new(),
indexer_id: 0,
series_id: Some(0),
season_number: Some(0),
..SonarrReleaseDownloadBody::default()
}))
})
);
}
@@ -344,7 +344,7 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveSonarrBlock::SeasonDetails.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
}
#[test]
@@ -468,7 +468,7 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::SeasonHistory.into()
);
assert!(
assert_none!(
app
.data
.sonarr_data
@@ -477,9 +477,8 @@ mod tests {
.unwrap()
.season_history
.filter
.is_none()
);
assert!(
assert_none!(
app
.data
.sonarr_data
@@ -488,9 +487,8 @@ mod tests {
.unwrap()
.season_history
.filtered_items
.is_none()
);
assert!(
assert_none!(
app
.data
.sonarr_data
@@ -499,7 +497,6 @@ mod tests {
.unwrap()
.season_history
.filtered_state
.is_none()
);
}
@@ -560,9 +557,9 @@ mod tests {
);
assert!(app.data.sonarr_data.prompt_confirm);
assert!(app.is_routing);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::ToggleEpisodeMonitoring(1))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::ToggleEpisodeMonitoring(1)
);
}
@@ -725,9 +722,9 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&expected_action
);
}
@@ -749,15 +746,15 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveSonarrBlock::ManualSeasonSearch.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody {
guid: String::new(),
indexer_id: 0,
series_id: Some(0),
season_number: Some(0),
..SonarrReleaseDownloadBody::default()
}))
})
);
}
}
src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
+13 -24
View File
@@ -197,9 +197,9 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveSonarrBlock::SeriesDetails.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&expected_action
);
}
@@ -219,7 +219,7 @@ mod tests {
assert!(!app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveSonarrBlock::SeriesDetails.into());
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
}
}
@@ -289,17 +289,8 @@ mod tests {
app.get_current_route(),
ActiveSonarrBlock::SeriesHistory.into()
);
assert!(
app
.data
.sonarr_data
.series_history
.as_ref()
.unwrap()
.filter
.is_none()
);
assert!(
assert_none!(app.data.sonarr_data.series_history.as_ref().unwrap().filter);
assert_none!(
app
.data
.sonarr_data
@@ -307,9 +298,8 @@ mod tests {
.as_ref()
.unwrap()
.filtered_items
.is_none()
);
assert!(
assert_none!(
app
.data
.sonarr_data
@@ -317,7 +307,6 @@ mod tests {
.as_ref()
.unwrap()
.filtered_state
.is_none()
);
}
}
@@ -387,9 +376,9 @@ mod tests {
);
assert!(app.data.sonarr_data.prompt_confirm);
assert!(app.is_routing);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::ToggleSeasonMonitoring((0, 0)))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::ToggleSeasonMonitoring((0, 0))
);
}
@@ -581,9 +570,9 @@ mod tests {
assert!(app.data.sonarr_data.prompt_confirm);
assert_navigation_popped!(app, active_sonarr_block.into());
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(expected_action)
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&expected_action
);
}
}
src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs
+11 -11
View File
@@ -4,18 +4,18 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
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;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::root_folder;
use crate::handlers::KeyEventHandler;
use crate::models::HorizontallyScrollableText;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, ROOT_FOLDERS_BLOCKS};
use crate::models::servarr_models::{AddRootFolderBody, RootFolder};
use crate::models::HorizontallyScrollableText;
mod test_handle_home_end {
use crate::models::servarr_models::RootFolder;
@@ -341,9 +341,9 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteRootFolder(1))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::DeleteRootFolder(1)
);
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
}
@@ -368,7 +368,7 @@ mod tests {
.handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
}
}
@@ -433,7 +433,7 @@ mod tests {
RootFoldersHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::RootFolders, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
assert!(app.error.text.is_empty());
assert_is_empty!(app.error.text);
}
}
@@ -612,9 +612,9 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::DeleteRootFolder(1))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::DeleteRootFolder(1)
);
assert_navigation_popped!(app, ActiveSonarrBlock::RootFolders.into());
}
src/handlers/sonarr_handlers/system/system_details_handler_tests.rs
+7 -7
View File
@@ -4,12 +4,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::sonarr_handlers::system::system_details_handler::SystemDetailsHandler;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::system::system_details_handler::SystemDetailsHandler;
use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, SYSTEM_DETAILS_BLOCKS,
};
@@ -711,9 +711,9 @@ mod tests {
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::StartTask(SonarrTaskName::default()))
assert_some_eq_x!(
&app.data.sonarr_data.prompt_confirm_action,
&SonarrEvent::StartTask(SonarrTaskName::default())
);
assert_navigation_popped!(app, ActiveSonarrBlock::SystemTasks.into());
}
@@ -734,7 +734,7 @@ mod tests {
.handle();
assert!(!app.data.sonarr_data.prompt_confirm);
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_none!(app.data.sonarr_data.prompt_confirm_action);
assert_navigation_popped!(app, ActiveSonarrBlock::SystemTasks.into());
}
}
@@ -768,7 +768,7 @@ mod tests {
SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::SystemLogs, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::System.into());
assert!(app.data.sonarr_data.log_details.items.is_empty());
assert_is_empty!(app.data.sonarr_data.log_details.items);
}
#[rstest]
src/handlers/sonarr_handlers/system/system_handler_tests.rs
+4 -4
View File
@@ -3,12 +3,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::event::Key;
use crate::handlers::sonarr_handlers::system::SystemHandler;
use crate::handlers::KeyEventHandler;
use crate::handlers::sonarr_handlers::system::SystemHandler;
use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, SYSTEM_DETAILS_BLOCKS,
};
@@ -85,7 +85,7 @@ mod tests {
SystemHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::System, None).handle();
assert_navigation_popped!(app, ActiveSonarrBlock::System.into());
assert!(app.error.text.is_empty());
assert_is_empty!(app.error.text);
}
}
@@ -349,7 +349,7 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into());
assert!(app.data.sonarr_data.log_details.is_empty());
assert_is_empty!(app.data.sonarr_data.log_details);
}
#[test]