Create test helper for Config::new

Author: MitMaro

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"));

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<Self, ConfigError> {
+	pub(crate) fn new_with_config(git_config: Option<&crate::git::Config>) -> Result<Self, ConfigError> {
 		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| {

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<C>(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);
 			});

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);
 	});

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),

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!(

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!(

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());
 		},

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());

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)),