summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Oram <dev@mitmaro.ca>2024-02-15 09:59:46 -0330
committerTim Oram <dev@mitmaro.ca>2024-02-15 20:27:06 -0330
commit172cc18aadf7c30ac73bf05c46560d4e54e51e90 (patch)
tree597249189ccda5f0bf3d9fedded766c706e37305
parent8c49085cbd27a0e6a124ea9ab63526b951e07b19 (diff)
Create test helper for Config::new
-rw-r--r--src/application.rs13
-rw-r--r--src/config.rs14
-rw-r--r--src/module/modules.rs4
-rw-r--r--src/modules/list/tests.rs4
-rw-r--r--src/modules/list/tests/abort_and_rebase.rs16
-rw-r--r--src/modules/list/tests/change_action.rs24
-rw-r--r--src/modules/list/tests/edit_mode.rs10
-rw-r--r--src/modules/list/tests/external_editor.rs6
-rw-r--r--src/modules/list/tests/help.rs8
-rw-r--r--src/modules/list/tests/insert_line.rs2
-rw-r--r--src/modules/list/tests/movement.rs38
-rw-r--r--src/modules/list/tests/normal_mode.rs6
-rw-r--r--src/modules/list/tests/read_event.rs24
-rw-r--r--src/modules/list/tests/remove_lines.rs12
-rw-r--r--src/modules/list/tests/render.rs12
-rw-r--r--src/modules/list/tests/search.rs38
-rw-r--r--src/modules/list/tests/show_commit.rs6
-rw-r--r--src/modules/list/tests/swap_lines.rs20
-rw-r--r--src/modules/list/tests/toggle_break.rs6
-rw-r--r--src/modules/list/tests/toggle_option.rs6
-rw-r--r--src/modules/list/tests/undo_redo.rs16
-rw-r--r--src/modules/list/tests/visual_mode.rs18
-rw-r--r--src/modules/show_commit/tests.rs83
-rw-r--r--src/test_helpers.rs2
-rw-r--r--src/test_helpers/create_config.rs5
25 files changed, 198 insertions, 195 deletions
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<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(
@@ -138,11 +131,6 @@ mod tests {
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| {
assert_ok!(Config::try_from(&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<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);
});
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 @@