Move render testutils to test_helpers

Author: MitMaro

src/components/choice/tests.rs

@@ -4,7 +4,8 @@ use super::*;
 use crate::{
 	assert_rendered_output,
 	input::StandardEvent,
-	view::testutil::{with_view_state, AssertRenderOptions},
+	test_helpers::assertions::assert_rendered_output::AssertRenderOptions,
+	view::testutil::with_view_state,
 };
 
 #[derive(Clone, Debug, PartialEq)]

src/components/confirm/tests.rs

@@ -4,8 +4,7 @@ use super::*;
 use crate::{
 	assert_rendered_output,
 	input::StandardEvent,
-	test_helpers::create_test_keybindings,
-	view::testutil::AssertRenderOptions,
+	test_helpers::{assertions::assert_rendered_output::AssertRenderOptions, create_test_keybindings},
 };
 
 #[test]

src/components/edit/tests.rs

@@ -1,5 +1,5 @@
 use super::*;
-use crate::{assert_rendered_output, view::testutil::AssertRenderOptions};
+use crate::{assert_rendered_output, test_helpers::assertions::assert_rendered_output::AssertRenderOptions};
 
 #[test]
 fn with_before_and_after_build() {

src/components/shared/editable_line.rs

@@ -209,7 +209,8 @@ mod tests {
 	use super::*;
 	use crate::{
 		assert_rendered_output,
-		view::{testutil::AssertRenderOptions, ViewData, ViewLine},
+		test_helpers::assertions::assert_rendered_output::AssertRenderOptions,
+		view::{ViewData, ViewLine},
 	};
 
 	macro_rules! view_data_from_editable_line {

src/modules/confirm_abort.rs

@@ -63,8 +63,8 @@ mod tests {
 		assert_results,
 		input::{KeyCode, StandardEvent},
 		process::Artifact,
+		test_helpers::assertions::assert_rendered_output::AssertRenderOptions,
 		testutil::module_test,
-		view::testutil::AssertRenderOptions,
 	};
 
 	fn create_confirm_abort(todo_file: TodoFile) -> ConfirmAbort {

src/modules/list/tests/search.rs

@@ -5,8 +5,8 @@ use crate::{
 	assert_results,
 	process::Artifact,
 	render_line,
+	test_helpers::assertions::assert_rendered_output::AssertRenderOptions,
 	testutil::module_test,
-	view::testutil::AssertRenderOptions,
 };
 
 #[test]

src/modules/list/tests/toggle_break.rs

@@ -4,7 +4,6 @@ use crate::{
 	assert_rendered_output,
 	testutil::module_test,
 	todo_file::{Action::Pick, ParseError},
-	view::testutil::LinePattern,
 };
 
 #[test]

src/modules/list/tests/visual_mode.rs

@@ -6,8 +6,8 @@ use crate::{
 	input::KeyCode,
 	process::Artifact,
 	render_line,
+	test_helpers::assertions::assert_rendered_output::AssertRenderOptions,
 	testutil::module_test,
-	view::testutil::AssertRenderOptions,
 };
 
 fn render_options() -> AssertRenderOptions {

src/modules/show_commit/tests.rs

@@ -10,11 +10,12 @@ use crate::{
 	process::Artifact,
 	render_line,
 	test_helpers::{
+		assertions::assert_rendered_output::AssertRenderOptions,
 		builders::{CommitBuilder, CommitDiffBuilder, FileStatusBuilder},
 		with_temp_repository,
 	},
 	testutil::module_test,
-	view::{testutil::AssertRenderOptions, ViewLine},
+	view::ViewLine,
 };
 
 fn create_show_commit(config: &Config, repository: Repository, todo_file: TodoFile) -> ShowCommit {

src/test_helpers.rs

@@ -1,3 +1,4 @@
+pub(crate) mod assertions;
 pub(crate) mod builders;
 mod create_commit;
 mod create_event_reader;