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

src/handlers/radarr_handlers/library/movie_details_handler_tests.rs

@@ -9,6 +9,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::radarr_handlers::library::movie_details_handler::{
@@ -294,7 +296,7 @@ mod tests {
         app.get_current_route(),
         app.data.radarr_data.movie_info_tabs.get_active_route()
       );
-      assert_eq!(app.get_current_route(), left_block.into());
+      assert_navigation_pushed!(app, left_block.into());
 
       MovieDetailsHandler::new(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None).handle();
 
@@ -302,16 +304,16 @@ mod tests {
         app.get_current_route(),
         app.data.radarr_data.movie_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 rstest::rstest;
-
+    use crate::assert_navigation_popped;
     use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
     use crate::network::radarr_network::RadarrEvent;
+    use pretty_assertions::assert_eq;
+    use rstest::rstest;
 
     use super::*;
 
@@ -333,10 +335,7 @@ mod tests {
       MovieDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::ManualSearch, None)
         .handle();
 
-      assert_eq!(
-        app.get_current_route(),
-        ActiveRadarrBlock::ManualSearchConfirmPrompt.into()
-      );
+      assert_navigation_pushed!(app, ActiveRadarrBlock::ManualSearchConfirmPrompt.into());
     }
 
     #[test]
@@ -393,10 +392,7 @@ mod tests {
       MovieDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
-      assert_eq!(
-        app.get_current_route(),
-        ActiveRadarrBlock::MovieDetails.into()
-      );
+      assert_navigation_popped!(app, ActiveRadarrBlock::MovieDetails.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
         Some(expected_action)
@@ -423,10 +419,7 @@ mod tests {
       MovieDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
-      assert_eq!(
-        app.get_current_route(),
-        ActiveRadarrBlock::MovieDetails.into()
-      );
+      assert_navigation_popped!(app, ActiveRadarrBlock::MovieDetails.into());
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
     }
   }
@@ -435,10 +428,11 @@ mod tests {
     use pretty_assertions::assert_eq;
     use rstest::rstest;
 
-    use crate::assert_movie_info_tabs_reset;
     use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
+    use crate::{assert_movie_info_tabs_reset, assert_navigation_popped};
 
     use super::*;
+    use crate::assert_navigation_pushed;
 
     const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
 
@@ -463,7 +457,7 @@ mod tests {
 
       MovieDetailsHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
-      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
+      assert_navigation_popped!(app, ActiveRadarrBlock::Movies.into());
       assert_movie_info_tabs_reset!(app.data.radarr_data);
     }
 
@@ -487,7 +481,7 @@ mod tests {
       MovieDetailsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
-      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
+      assert_navigation_popped!(app, ActiveRadarrBlock::Movies.into());
     }
   }
 
@@ -505,7 +499,7 @@ mod tests {
       EDIT_MOVIE_SELECTION_BLOCKS, RadarrData,
     };
     use crate::network::radarr_network::RadarrEvent;
-    use crate::test_edit_movie_key;
+    use crate::{assert_navigation_popped, test_edit_movie_key};
 
     use super::*;
 
@@ -544,8 +538,8 @@ mod tests {
       )
       .handle();
 
-      assert_eq!(
-        app.get_current_route(),
+      assert_navigation_pushed!(
+        app,
         ActiveRadarrBlock::AutomaticallySearchMoviePrompt.into()
       );
     }
@@ -629,7 +623,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), active_radarr_block.into());
-      assert!(app.data.radarr_data.edit_movie_modal.is_none());
+      assert_modal_absent!(app.data.radarr_data.edit_movie_modal);
     }
 
     #[rstest]
@@ -667,10 +661,7 @@ mod tests {
       )
       .handle();
 
-      assert_eq!(
-        app.get_current_route(),
-        ActiveRadarrBlock::UpdateAndScanPrompt.into()
-      );
+      assert_navigation_pushed!(app, ActiveRadarrBlock::UpdateAndScanPrompt.into());
     }
 
     #[rstest]
@@ -739,7 +730,7 @@ mod tests {
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), active_radarr_block.into());
+      assert_navigation_pushed!(app, active_radarr_block.into());
       assert!(app.is_routing);
     }
 
@@ -817,10 +808,7 @@ mod tests {
       .handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
-      assert_eq!(
-        app.get_current_route(),
-        ActiveRadarrBlock::MovieDetails.into()
-      );
+      assert_navigation_popped!(app, ActiveRadarrBlock::MovieDetails.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
         Some(expected_action)