From 172cc18aadf7c30ac73bf05c46560d4e54e51e90 Mon Sep 17 00:00:00 2001 From: Tim Oram Date: Thu, 15 Feb 2024 09:59:46 -0330 Subject: Create test helper for Config::new --- src/application.rs | 13 +++-- src/config.rs | 14 +---- src/module/modules.rs | 4 +- src/modules/list/tests.rs | 4 +- src/modules/list/tests/abort_and_rebase.rs | 16 +++--- src/modules/list/tests/change_action.rs | 24 ++++----- src/modules/list/tests/edit_mode.rs | 10 ++-- src/modules/list/tests/external_editor.rs | 6 +-- src/modules/list/tests/help.rs | 8 +-- src/modules/list/tests/insert_line.rs | 2 +- src/modules/list/tests/movement.rs | 38 +++++++------- src/modules/list/tests/normal_mode.rs | 6 +-- src/modules/list/tests/read_event.rs | 24 ++++----- src/modules/list/tests/remove_lines.rs | 12 ++--- src/modules/list/tests/render.rs | 12 ++--- src/modules/list/tests/search.rs | 38 +++++++------- src/modules/list/tests/show_commit.rs | 6 +-- src/modules/list/tests/swap_lines.rs | 20 +++---- src/modules/list/tests/toggle_break.rs | 6 +-- src/modules/list/tests/toggle_option.rs | 6 +-- src/modules/list/tests/undo_redo.rs | 16 +++--- src/modules/list/tests/visual_mode.rs | 18 +++---- src/modules/show_commit/tests.rs | 83 +++++++++++++++--------------- src/test_helpers.rs | 2 + src/test_helpers/create_config.rs | 5 ++ 25 files changed, 198 insertions(+), 195 deletions(-) create mode 100644 src/test_helpers/create_config.rs diff --git a/src/application.rs b/src/application.rs index 7468d56..0a9fa56 100644 --- a/src/application.rs +++ b/src/application.rs @@ -197,7 +197,14 @@ mod tests { input::{Event, KeyCode, KeyEvent, KeyModifiers}, module::Modules, runtime::{Installer, RuntimeError}, - test_helpers::{create_event_reader, mocks, set_git_directory, DefaultTestModule, TestModuleProvider}, + test_helpers::{ + create_config, + create_event_reader, + mocks, + set_git_directory, + DefaultTestModule, + TestModuleProvider, + }, }; fn args(args: &[&str]) -> Args { @@ -267,7 +274,7 @@ mod tests { #[test] fn todo_file_options_without_command() { - let mut config = Config::new(); + let mut config = create_config(); config.undo_limit = 10; config.git.comment_char = String::from("#"); config.post_modified_line_exec_command = None; @@ -281,7 +288,7 @@ mod tests { #[test] fn todo_file_options_with_command() { - let mut config = Config::new(); + let mut config = create_config(); config.undo_limit = 10; config.git.comment_char = String::from("#"); config.post_modified_line_exec_command = Some(String::from("command")); diff --git a/src/config.rs b/src/config.rs index ef3fb5a..755458d 100644 --- a/src/config.rs +++ b/src/config.rs @@ -67,14 +67,7 @@ pub(crate) struct Config { } impl Config { - /// Create a new configuration with default values. - #[must_use] - #[allow(clippy::missing_panics_doc)] - pub(crate) fn new() -> Self { - Self::new_with_config(None).unwrap() // should never error with None config - } - - fn new_with_config(git_config: Option<&crate::git::Config>) -> Result { + pub(crate) fn new_with_config(git_config: Option<&crate::git::Config>) -> Result { Ok(Self { auto_select_next: get_bool(git_config, "interactive-rebase-tool.autoSelectNext", false)?, diff_ignore_whitespace: get_diff_ignore_whitespace( @@ -137,11 +130,6 @@ mod tests { use super::*; use crate::test_helpers::{invalid_utf, with_git_config, with_temp_bare_repository}; - #[test] - fn new() { - let _config = Config::new(); - } - #[test] fn try_from_repository() { with_temp_bare_repository(|repository| { diff --git a/src/module/modules.rs b/src/module/modules.rs index e29aaee..79c7a2a 100644 --- a/src/module/modules.rs +++ b/src/module/modules.rs @@ -69,14 +69,14 @@ impl ModuleProvider for Modules { #[cfg(test)] mod tests { use super::*; - use crate::test_helpers::{with_temp_repository, with_todo_file}; + use crate::test_helpers::{create_config, with_temp_repository, with_todo_file}; pub(crate) fn modules_test(callback: C) where C: FnOnce(Modules) { with_temp_repository(|repository| { with_todo_file(&[], |todo_file_context| { let (_todo_file_path, todo_file) = todo_file_context.to_owned(); - let config = Config::new(); + let config = create_config(); let modules = Modules::new(&config, repository, &Arc::new(Mutex::new(todo_file))); callback(modules); }); diff --git a/src/modules/list/tests.rs b/src/modules/list/tests.rs index 82fb75c..e881332 100644 --- a/src/modules/list/tests.rs +++ b/src/modules/list/tests.rs @@ -18,7 +18,7 @@ mod undo_redo; mod visual_mode; use super::*; -use crate::test_helpers::testers; +use crate::test_helpers::{create_config, testers}; pub(crate) fn create_list(config: &Config, todo_file: TodoFile) -> List { List::new(config, Arc::new(Mutex::new(todo_file))) @@ -27,7 +27,7 @@ pub(crate) fn create_list(config: &Config, todo_file: TodoFile) -> List { #[test] fn resize() { testers::module(&["pick aaa c1"], &[Event::Resize(100, 200)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_eq!(module.height, 200); }); diff --git a/src/modules/list/tests/abort_and_rebase.rs b/src/modules/list/tests/abort_and_rebase.rs index a39bd20..e064105 100644 --- a/src/modules/list/tests/abort_and_rebase.rs +++ b/src/modules/list/tests/abort_and_rebase.rs @@ -7,7 +7,7 @@ fn normal_mode_abort() { &["pick aaa c1"], &[Event::from(StandardEvent::Abort)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::Abort)), @@ -26,7 +26,7 @@ fn visual_mode_abort() { Event::from(StandardEvent::Abort), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_event(&mut module); assert_results!( test_context.handle_event(&mut module), @@ -43,7 +43,7 @@ fn normal_mode_force_abort() { &["pick aaa c1"], &[Event::from(StandardEvent::ForceAbort)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::ForceAbort)), @@ -63,7 +63,7 @@ fn visual_mode_force_abort() { Event::from(StandardEvent::ForceAbort), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_event(&mut module); assert_results!( test_context.handle_event(&mut module), @@ -81,7 +81,7 @@ fn normal_mode_rebase() { &["pick aaa c1"], &[Event::from(StandardEvent::Rebase)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::Rebase)), @@ -100,7 +100,7 @@ fn visual_mode_rebase() { Event::from(StandardEvent::Rebase), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_event(&mut module); assert_results!( test_context.handle_event(&mut module), @@ -117,7 +117,7 @@ fn normal_mode_force_rebase() { &["pick aaa c1"], &[Event::from(StandardEvent::ForceRebase)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::ForceRebase)), @@ -137,7 +137,7 @@ fn visual_mode_force_rebase() { Event::from(StandardEvent::ForceRebase), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_event(&mut module); assert_results!( test_context.handle_event(&mut module), diff --git a/src/modules/list/tests/change_action.rs b/src/modules/list/tests/change_action.rs index b1eeacd..215fd10 100644 --- a/src/modules/list/tests/change_action.rs +++ b/src/modules/list/tests/change_action.rs @@ -7,7 +7,7 @@ fn normal_mode_action_change_to_drop() { &["pick aaa c1"], &[Event::from(StandardEvent::ActionDrop)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!(Body view_data, action_line!(Selected Drop "aaa", "c1")); @@ -33,7 +33,7 @@ fn visual_mode_action_change_to_drop() { Event::from(StandardEvent::ActionDrop), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -54,7 +54,7 @@ fn normal_mode_action_change_to_edit() { &["pick aaa c1"], &[Event::from(StandardEvent::ActionEdit)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -83,7 +83,7 @@ fn visual_mode_action_change_to_edit() { Event::from(StandardEvent::ActionEdit), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -104,7 +104,7 @@ fn normal_mode_action_change_to_fixup() { &["pick aaa c1"], &[Event::from(StandardEvent::ActionFixup)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -133,7 +133,7 @@ fn visual_mode_action_change_to_fixup() { Event::from(StandardEvent::ActionFixup), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -154,7 +154,7 @@ fn normal_mode_action_change_to_pick() { &["drop aaa c1"], &[Event::from(StandardEvent::ActionPick)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -183,7 +183,7 @@ fn visual_mode_action_change_to_pick() { Event::from(StandardEvent::ActionPick), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -204,7 +204,7 @@ fn normal_mode_action_change_to_reword() { &["pick aaa c1"], &[Event::from(StandardEvent::ActionReword)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -233,7 +233,7 @@ fn visual_mode_action_change_to_reword() { Event::from(StandardEvent::ActionReword), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -254,7 +254,7 @@ fn normal_mode_action_change_to_squash() { &["pick aaa c1"], &[Event::from(StandardEvent::ActionSquash)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -282,7 +282,7 @@ fn visual_mode_action_change_to_squash() { Event::from(StandardEvent::ActionSquash), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( diff --git a/src/modules/list/tests/edit_mode.rs b/src/modules/list/tests/edit_mode.rs index 896b3b3..4736a83 100644 --- a/src/modules/list/tests/edit_mode.rs +++ b/src/modules/list/tests/edit_mode.rs @@ -7,7 +7,7 @@ fn edit_with_edit_content() { &["exec echo foo"], &[Event::from(StandardEvent::Edit)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::Edit)) @@ -23,7 +23,7 @@ fn edit_without_edit_content() { &["pick aaa c1"], &[Event::from(StandardEvent::Edit)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::Edit)) @@ -36,7 +36,7 @@ fn edit_without_edit_content() { #[test] fn edit_without_selected_line() { testers::module(&[], &[Event::from(StandardEvent::Edit)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::Edit)) @@ -55,7 +55,7 @@ fn handle_event() { Event::from(KeyCode::Enter), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.build_view_data(&mut module); _ = test_context.handle_all_events(&mut module); assert_eq!(module.todo_file.lock().get_line(0).unwrap().get_content(), "fo"); @@ -70,7 +70,7 @@ fn render() { &["exec foo"], &[Event::from(StandardEvent::Edit)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( diff --git a/src/modules/list/tests/external_editor.rs b/src/modules/list/tests/external_editor.rs index 5a848a3..4ab0d85 100644 --- a/src/modules/list/tests/external_editor.rs +++ b/src/modules/list/tests/external_editor.rs @@ -7,7 +7,7 @@ fn normal_mode_open_external_editor() { &["pick aaa c1"], &[Event::from(StandardEvent::OpenInEditor)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::OpenInEditor)), @@ -26,7 +26,7 @@ fn visual_mode_open_external_editor() { Event::from(StandardEvent::OpenInEditor), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_event(&mut module); assert_results!( test_context.handle_event(&mut module), @@ -48,7 +48,7 @@ fn cancels_search() { Event::from(StandardEvent::OpenInEditor), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert!(!module.search_bar.is_searching()); }, diff --git a/src/modules/list/tests/help.rs b/src/modules/list/tests/help.rs index 64867d2..3ffb99e 100644 --- a/src/modules/list/tests/help.rs +++ b/src/modules/list/tests/help.rs @@ -7,7 +7,7 @@ fn normal_mode_help() { &["pick aaa c1"], &[Event::from(StandardEvent::Help)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.state = ListState::Normal; _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); @@ -60,7 +60,7 @@ fn normal_mode_help_event() { &["pick aaa c1"], &[Event::from(StandardEvent::Help), Event::from(KeyCode::Enter)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.state = ListState::Normal; _ = test_context.handle_all_events(&mut module); assert!(!module.normal_mode_help.is_active()); @@ -74,7 +74,7 @@ fn visual_mode_help() { &["pick aaa c1"], &[Event::from(StandardEvent::Help)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.state = ListState::Visual; _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); @@ -123,7 +123,7 @@ fn visual_mode_help_event() { &["pick aaa c1"], &[Event::from(StandardEvent::Help), Event::from(KeyCode::Enter)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.state = ListState::Visual; _ = test_context.handle_all_events(&mut module); assert!(!module.visual_mode_help.is_active()); diff --git a/src/modules/list/tests/insert_line.rs b/src/modules/list/tests/insert_line.rs index 339d3a6..119526b 100644 --- a/src/modules/list/tests/insert_line.rs +++ b/src/modules/list/tests/insert_line.rs @@ -4,7 +4,7 @@ use crate::{assert_results, process::Artifact, test_helpers::testers}; #[test] fn insert_line() { testers::module(&[], &[Event::from(StandardEvent::InsertLine)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::InsertLine)), diff --git a/src/modules/list/tests/movement.rs b/src/modules/list/tests/movement.rs index 296c94f..03b055f 100644 --- a/src/modules/list/tests/movement.rs +++ b/src/modules/list/tests/movement.rs @@ -12,7 +12,7 @@ fn move_down_1() { &["pick aaa c1", "pick aaa c2", "pick aaa c3"], &[Event::from(StandardEvent::MoveCursorDown)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -31,7 +31,7 @@ fn move_down_view_end() { &["pick aaa c1", "pick aaa c2", "pick aaa c3"], &[Event::from(StandardEvent::MoveCursorDown); 2], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -50,7 +50,7 @@ fn move_down_past_end() { &["pick aaa c1", "pick aaa c2", "pick aaa c3"], &[Event::from(StandardEvent::MoveCursorDown); 3], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -73,7 +73,7 @@ fn move_down_scroll_bottom_move_up_one() { Event::from(StandardEvent::MoveCursorUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -96,7 +96,7 @@ fn move_down_scroll_bottom_move_up_top() { Event::from(StandardEvent::MoveCursorUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -118,7 +118,7 @@ fn move_up_attempt_above_top() { Event::from(StandardEvent::MoveCursorUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -138,7 +138,7 @@ fn move_down_attempt_below_bottom() { &["pick aaa c1", "pick aaa c2", "pick aaa c3", "pick aaa c4"], &[Event::from(StandardEvent::MoveCursorDown); 4], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -158,7 +158,7 @@ fn move_page_up_from_top() { &["pick aaa c1", "pick aaa c2", "pick aaa c3", "pick aaa c4"], &[Event::from(StandardEvent::MoveCursorPageUp)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.height = 4; _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); @@ -183,7 +183,7 @@ fn move_page_up_from_one_page_down() { Event::from(StandardEvent::MoveCursorPageUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.height = 4; _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); @@ -208,7 +208,7 @@ fn move_page_up_from_one_page_down_minus_1() { Event::from(StandardEvent::MoveCursorPageUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.height = 4; _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); @@ -234,7 +234,7 @@ fn move_page_up_from_bottom() { Event::from(StandardEvent::MoveCursorPageUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.height = 4; _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); @@ -259,7 +259,7 @@ fn move_home() { Event::from(StandardEvent::MoveCursorHome), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -279,7 +279,7 @@ fn move_end() { &["pick aaa c1", "pick aaa c2", "pick aaa c3", "pick aaa c4"], &[Event::from(StandardEvent::MoveCursorEnd)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -299,7 +299,7 @@ fn move_page_down_past_bottom() { &["pick aaa c1", "pick aaa c2", "pick aaa c3", "pick aaa c4"], &[Event::from(StandardEvent::MoveCursorPageDown); 3], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.height = 4; _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); @@ -325,7 +325,7 @@ fn move_page_down_one_from_bottom() { Event::from(StandardEvent::MoveCursorPageDown), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -348,7 +348,7 @@ fn move_page_down_one_page_from_bottom() { Event::from(StandardEvent::MoveCursorPageDown), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); module.height = 4; _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); @@ -388,7 +388,7 @@ fn mouse_scroll() { }), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -407,7 +407,7 @@ fn scroll_right() { &["pick aaa c1"], &[Event::from(StandardEvent::MoveCursorRight)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); test_context.view_context.assert_render_action(&["ScrollRight"]); }, @@ -420,7 +420,7 @@ fn scroll_left() { &["pick aaa c1"], &[Event::from(StandardEvent::MoveCursorLeft)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); test_context.view_context.assert_render_action(&["ScrollLeft"]); }, diff --git a/src/modules/list/tests/normal_mode.rs b/src/modules/list/tests/normal_mode.rs index 5ccf370..ec4306b 100644 --- a/src/modules/list/tests/normal_mode.rs +++ b/src/modules/list/tests/normal_mode.rs @@ -14,7 +14,7 @@ fn change_auto_select_next_with_next_line() { &["pick aaa c1", "pick aaa c2"], &[Event::from(StandardEvent::ActionSquash)], |mut test_context| { - let mut config = Config::new(); + let mut config = create_config(); config.auto_select_next = true; let mut module = create_list(&config, test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); @@ -34,7 +34,7 @@ fn toggle_visual_mode() { &["pick aaa c1"], &[Event::from(StandardEvent::ToggleVisualMode)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::ToggleVisualMode)) @@ -48,7 +48,7 @@ fn toggle_visual_mode() { #[test] fn other_event() { testers::module(&["pick aaa c1"], &[Event::from(KeyCode::Null)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(KeyCode::Null)) diff --git a/src/modules/list/tests/read_event.rs b/src/modules/list/tests/read_event.rs index 075076d..63646c6 100644 --- a/src/modules/list/tests/read_event.rs +++ b/src/modules/list/tests/read_event.rs @@ -9,7 +9,7 @@ use crate::{ #[test] fn edit_mode_passthrough_event() { testers::read_event(Event::from('p'), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); module.state = ListState::Edit; assert_eq!(context.read_event(&module), Event::from('p')); }); @@ -18,7 +18,7 @@ fn edit_mode_passthrough_event() { #[test] fn normal_mode_help() { testers::read_event(Event::from('?'), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); module.normal_mode_help.set_active(); assert_eq!(context.read_event(&module), Event::from(StandardEvent::Help)); }); @@ -27,7 +27,7 @@ fn normal_mode_help() { #[test] fn visual_mode_help() { testers::read_event(Event::from('?'), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); module.visual_mode_help.set_active(); assert_eq!(context.read_event(&module), Event::from(StandardEvent::Help)); }); @@ -36,7 +36,7 @@ fn visual_mode_help() { #[test] fn search() { testers::read_event(Event::from('p'), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); module.search_bar.start_search(Some("")); assert_eq!(context.read_event(&module), Event::from('p')); }); @@ -63,7 +63,7 @@ fn search() { #[case::togglevisualmode('v', StandardEvent::ToggleVisualMode)] fn default_events_single_char(#[case] binding: char, #[case] expected: StandardEvent) { testers::read_event(Event::from(binding), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); assert_eq!(context.read_event(&module), Event::from(expected)); }); } @@ -80,7 +80,7 @@ fn default_events_single_char(#[case] binding: char, #[case] expected: StandardE #[case::delete(KeyCode::Delete, StandardEvent::Delete)] fn default_events_special(#[case] code: KeyCode, #[case] expected: StandardEvent) { testers::read_event(Event::from(code), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); assert_eq!(context.read_event(&module), Event::from(expected)); }); } @@ -91,7 +91,7 @@ fn default_events_special(#[case] code: KeyCode, #[case] expected: StandardEvent #[case::abort('p', StandardEvent::ActionPick)] fn fixup_events(#[case] binding: char, #[case] expected: StandardEvent) { testers::read_event(Event::from(binding), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); module.selected_line_action = Some(Action::Fixup); assert_eq!(context.read_event(&module), Event::from(expected)); }); @@ -102,7 +102,7 @@ fn fixup_events(#[case] binding: char, #[case] expected: StandardEvent) { #[case::abort('U')] fn fixup_events_with_non_fixpo_event(#[case] binding: char) { testers::read_event(Event::from(binding), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); module.selected_line_action = Some(Action::Pick); assert_eq!(context.read_event(&module), Event::from(binding)); }); @@ -118,7 +118,7 @@ fn mouse_move_down() { modifiers: KeyModifiers::empty(), }), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); assert_eq!(context.read_event(&module), Event::from(StandardEvent::MoveCursorDown)); }, ); @@ -134,7 +134,7 @@ fn mouse_move_up() { modifiers: KeyModifiers::empty(), }), |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); assert_eq!(context.read_event(&module), Event::from(StandardEvent::MoveCursorUp)); }, ); @@ -149,7 +149,7 @@ fn mouse_other() { modifiers: KeyModifiers::empty(), }); testers::read_event(mouse_event, |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); assert_eq!(context.read_event(&module), mouse_event); }); } @@ -157,7 +157,7 @@ fn mouse_other() { #[test] fn event_other() { testers::read_event(Event::None, |mut context| { - let mut module = create_list(&Config::new(), context.take_todo_file()); + let mut module = create_list(&create_config(), context.take_todo_file()); assert_eq!(context.read_event(&module), Event::None); }); } diff --git a/src/modules/list/tests/remove_lines.rs b/src/modules/list/tests/remove_lines.rs index e773ed9..7b82bc5 100644 --- a/src/modules/list/tests/remove_lines.rs +++ b/src/modules/list/tests/remove_lines.rs @@ -13,7 +13,7 @@ fn normal_mode_remove_line_first() { ], &[Event::from(StandardEvent::Delete)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), @@ -44,7 +44,7 @@ fn normal_mode_remove_line_end() { Event::from(StandardEvent::Delete), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), @@ -74,7 +74,7 @@ fn visual_mode_remove_lines_start_index_first() { Event::from(StandardEvent::Delete), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), @@ -108,7 +108,7 @@ fn visual_mode_remove_lines_end_index_first() { Event::from(StandardEvent::Delete), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), @@ -144,7 +144,7 @@ fn visual_mode_remove_lines_start_index_last() { Event::from(StandardEvent::Delete), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), @@ -178,7 +178,7 @@ fn visual_mode_remove_lines_end_index_last() { Event::from(StandardEvent::Delete), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), diff --git a/src/modules/list/tests/render.rs b/src/modules/list/tests/render.rs index b1cfe18..c78d5eb 100644 --- a/src/modules/list/tests/render.rs +++ b/src/modules/list/tests/render.rs @@ -4,7 +4,7 @@ use crate::{assert_rendered_output, test_helpers::testers}; #[test] fn empty_list() { testers::module(&[], &[], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( Style view_data, @@ -36,7 +36,7 @@ fn full() { ], &[], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( Style view_data, @@ -83,7 +83,7 @@ fn compact() { &[], |mut test_context| { test_context.render_context.update(30, 300); - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( Style view_data, @@ -112,7 +112,7 @@ fn compact() { #[test] fn noop_list() { testers::module(&["break"], &[], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); let mut todo_file = module.todo_file.lock(); todo_file.remove_lines(0, 0); todo_file.add_line(0, Line::parse("noop").unwrap()); @@ -146,7 +146,7 @@ fn pinned_segments() { ], &[Event::from(StandardEvent::ActionDrop)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -173,7 +173,7 @@ fn pinned_segments() { #[test] fn full_with_short_actions() { testers::module(&["pick aaaaaaaa comment 1"], &[], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( Style view_data, diff --git a/src/modules/list/tests/search.rs b/src/modules/list/tests/search.rs index be03087..5608f4e 100644 --- a/src/modules/list/tests/search.rs +++ b/src/modules/list/tests/search.rs @@ -14,7 +14,7 @@ fn start_edit() { &["pick aaaaaaaa comment"], &[Event::from(StandardEvent::SearchStart)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -40,7 +40,7 @@ fn with_match_on_hash() { Event::from('a'), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -61,7 +61,7 @@ fn with_no_match() { &["pick aaaaaaaa comment1"], &[Event::from(StandardEvent::SearchStart), Event::from('x')], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -86,7 +86,7 @@ fn start_with_matches_and_with_term() { Event::from(StandardEvent::SearchFinish), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -111,7 +111,7 @@ fn start_with_no_matches_and_with_term() { Event::from(StandardEvent::SearchFinish), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -135,7 +135,7 @@ fn start_with_no_term() { Event::from(StandardEvent::SearchFinish), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -159,7 +159,7 @@ fn normal_mode_next() { Event::from(StandardEvent::SearchNext), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -188,7 +188,7 @@ fn visual_mode_next() { Event::from(StandardEvent::SearchNext), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -224,7 +224,7 @@ fn normal_mode_next_with_wrap() { Event::from(StandardEvent::SearchNext), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -255,7 +255,7 @@ fn visual_mode_next_with_wrap() { Event::from(StandardEvent::SearchNext), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -288,7 +288,7 @@ fn normal_mode_previous() { Event::from(StandardEvent::SearchPrevious), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -319,7 +319,7 @@ fn visual_mode_previous() { Event::from(StandardEvent::SearchPrevious), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -353,7 +353,7 @@ fn normal_mode_previous_with_wrap() { Event::from(StandardEvent::SearchPrevious), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -382,7 +382,7 @@ fn visual_mode_previous_with_wrap() { Event::from(StandardEvent::SearchPrevious), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -413,7 +413,7 @@ fn cancel() { Event::from(StandardEvent::SearchStart), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -445,7 +445,7 @@ fn set_search_start_hint() { Event::from(StandardEvent::SearchFinish), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -470,7 +470,7 @@ fn highlight_multiple() { &["pick 12345678 xaxxaxxx"], &[Event::from(StandardEvent::SearchStart), Event::from('x')], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -491,7 +491,7 @@ fn skip_no_content() { &["break"], &[Event::from(StandardEvent::SearchStart), Event::from('x')], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -516,7 +516,7 @@ fn handle_other_event() { Event::from(StandardEvent::Abort), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); let mut results: Vec<_> = test_context.handle_all_events(&mut module); assert_results!( results.remove(results.len() - 1), diff --git a/src/modules/list/tests/show_commit.rs b/src/modules/list/tests/show_commit.rs index 2caac69..e9ee1c1 100644 --- a/src/modules/list/tests/show_commit.rs +++ b/src/modules/list/tests/show_commit.rs @@ -7,7 +7,7 @@ fn when_hash_available() { &["pick aaa c1"], &[Event::from(StandardEvent::ShowCommit)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::ShowCommit)), @@ -20,7 +20,7 @@ fn when_hash_available() { #[test] fn when_no_selected_line() { testers::module(&[], &[Event::from(StandardEvent::ShowCommit)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::ShowCommit)) @@ -34,7 +34,7 @@ fn do_not_when_hash_not_available() { &["exec echo foo"], &[Event::from(StandardEvent::ShowCommit)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); assert_results!( test_context.handle_event(&mut module), Artifact::Event(Event::from(StandardEvent::ShowCommit)) diff --git a/src/modules/list/tests/swap_lines.rs b/src/modules/list/tests/swap_lines.rs index 43ccbc3..b84d28a 100644 --- a/src/modules/list/tests/swap_lines.rs +++ b/src/modules/list/tests/swap_lines.rs @@ -7,7 +7,7 @@ fn normal_mode_change_swap_down() { &["pick aaa c1", "pick aaa c2", "pick aaa c3"], &[Event::from(StandardEvent::SwapSelectedDown)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -38,7 +38,7 @@ fn visual_mode_swap_down_from_top_to_bottom_selection() { Event::from(StandardEvent::SwapSelectedDown), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -73,7 +73,7 @@ fn visual_mode_swap_down_from_bottom_to_top_selection() { Event::from(StandardEvent::SwapSelectedDown), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -109,7 +109,7 @@ fn visual_mode_swap_down_to_limit_from_bottom_to_top_selection() { Event::from(StandardEvent::SwapSelectedDown), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -143,7 +143,7 @@ fn visual_mode_swap_down_to_limit_from_top_to_bottom_selection() { Event::from(StandardEvent::SwapSelectedDown), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -168,7 +168,7 @@ fn normal_mode_change_swap_up() { Event::from(StandardEvent::SwapSelectedUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -199,7 +199,7 @@ fn visual_mode_swap_up_from_top_to_bottom_selection() { Event::from(StandardEvent::SwapSelectedUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -234,7 +234,7 @@ fn visual_mode_swap_up_from_bottom_to_top_selection() { Event::from(StandardEvent::SwapSelectedUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -268,7 +268,7 @@ fn visual_mode_swap_up_to_limit_from_top_to_bottom_selection() { Event::from(StandardEvent::SwapSelectedUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -304,7 +304,7 @@ fn visual_mode_swap_up_to_limit_from_bottom_to_top_selection() { Event::from(StandardEvent::SwapSelectedUp), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( diff --git a/src/modules/list/tests/toggle_break.rs b/src/modules/list/tests/toggle_break.rs index 086c17a..ac5dd1b 100644 --- a/src/modules/list/tests/toggle_break.rs +++ b/src/modules/list/tests/toggle_break.rs @@ -12,7 +12,7 @@ fn change_toggle_break_add() { &["pick aaa c1"], &[Event::from(StandardEvent::ActionBreak)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -33,7 +33,7 @@ fn change_toggle_break_remove() { Event::from(StandardEvent::ActionBreak), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -50,7 +50,7 @@ fn change_toggle_break_above_existing() { &["pick aaa c1", "break"], &[Event::from(StandardEvent::ActionBreak)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( diff --git a/src/modules/list/tests/toggle_option.rs b/src/modules/list/tests/toggle_option.rs index c358ad4..c4e5eb7 100644 --- a/src/modules/list/tests/toggle_option.rs +++ b/src/modules/list/tests/toggle_option.rs @@ -9,7 +9,7 @@ fn on_fixup_keep_message() { &["fixup aaa c1"], &[Event::from(StandardEvent::FixupKeepMessage)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.activate(&mut module, State::List); _ = test_context.handle_all_events(&mut module); let todo_file = module.todo_file.lock(); @@ -25,7 +25,7 @@ fn on_fixup_keep_message_with_editor() { &["fixup aaa c1"], &[Event::from(StandardEvent::FixupKeepMessageWithEditor)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.activate(&mut module, State::List); _ = test_context.handle_all_events(&mut module); let todo_file = module.todo_file.lock(); @@ -41,7 +41,7 @@ fn after_select_line() { &["fixup aaa c1", "fixup aaa c2", "fixup aaa c3"], &[Event::from(StandardEvent::MoveCursorDown), Event::from('u')], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.activate(&mut module, State::List); _ = test_context.handle_all_events(&mut module); assert_none!(module.todo_file.lock().get_line(0).unwrap().option()); diff --git a/src/modules/list/tests/undo_redo.rs b/src/modules/list/tests/undo_redo.rs index e81a496..2aaaf92 100644 --- a/src/modules/list/tests/undo_redo.rs +++ b/src/modules/list/tests/undo_redo.rs @@ -7,7 +7,7 @@ fn normal_mode_undo() { &["pick aaa c1"], &[Event::from(StandardEvent::ActionDrop), Event::from(StandardEvent::Undo)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_event(&mut module); assert_results!( test_context.handle_event(&mut module), @@ -34,7 +34,7 @@ fn normal_mode_undo_visual_mode_change() { Event::from(StandardEvent::Undo), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), @@ -56,7 +56,7 @@ fn normal_mode_redo() { Event::from(StandardEvent::Redo), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_event(&mut module); _ = test_context.handle_event(&mut module); assert_results!( @@ -84,7 +84,7 @@ fn normal_mode_redo_visual_mode_change() { Event::from(StandardEvent::Redo), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), @@ -107,7 +107,7 @@ fn visual_mode_undo() { Event::from(StandardEvent::Undo), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_n_events(&mut module, 3); assert_results!( test_context.handle_event(&mut module), @@ -133,7 +133,7 @@ fn visual_mode_undo_normal_mode_change() { Event::from(StandardEvent::Undo), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_n_events(&mut module, 3); assert_results!( test_context.handle_event(&mut module), @@ -161,7 +161,7 @@ fn visual_mode_redo() { Event::from(StandardEvent::Redo), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), @@ -184,7 +184,7 @@ fn visual_mode_redo_normal_mode_change() { Event::from(StandardEvent::Redo), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); assert_rendered_output!( Body test_context.build_view_data(&mut module), diff --git a/src/modules/list/tests/visual_mode.rs b/src/modules/list/tests/visual_mode.rs index 524b08e..ffebd26 100644 --- a/src/modules/list/tests/visual_mode.rs +++ b/src/modules/list/tests/visual_mode.rs @@ -19,7 +19,7 @@ fn start() { &["pick aaa c1", "pick aaa c2", "pick aaa c3"], &[Event::from(StandardEvent::ToggleVisualMode)], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_all_events(&mut module); let view_data = test_context.build_view_data(&mut module); assert_rendered_output!( @@ -42,7 +42,7 @@ fn start_cursor_down_one() { Event::from(StandardEvent::MoveCursorDown), ], |mut test_context| { - let mut module = create_list(&Config::new(), test_context.take_todo_file()); + let mut module = create_list(&create_config(), test_context.take_todo_file()); _ = test_context.handle_