Move testutils crate into test_helpers

Author: MitMaro

Cargo.lock

@@ -23,11 +23,6 @@ edition = "2021"
 name = "interactive-rebase-tool"
 path = "src/main.rs"
 
-[workspace]
-members = [
-    "src/packages/testutils",
-]
-
 [dependencies]
 anyhow = "1.0.72"
 bitflags = "2.4.2"
@@ -59,7 +54,6 @@ regex = "1.8.3"
 rstest = "0.18.1"
 serial_test = "2.0.0"
 tempfile = "3.7.0"
-girt-testutils = {version = "2.3.0", path = "src/packages/testutils"}
 
 [build-dependencies]
 chrono = "0.4.26"

Cargo.toml

@@ -123,8 +123,7 @@ impl TryFrom<&crate::git::Config> for Config {
 mod tests {
 	use std::fmt::Debug;
 
-	use ::testutils::assert_err_eq;
-	use claims::assert_ok;
+	use claims::{assert_err_eq, assert_ok};
 	use rstest::rstest;
 
 	use super::*;

src/config.rs

@@ -123,9 +123,8 @@ impl TryFrom<&str> for Color {
 
 #[cfg(test)]
 mod tests {
-	use claims::assert_ok_eq;
+	use claims::{assert_err_eq, assert_ok_eq};
 	use rstest::rstest;
-	use testutils::assert_err_eq;
 
 	use super::*;
 

src/config/color.rs

@@ -81,9 +81,8 @@ impl TryFrom<&Config> for GitConfig {
 mod tests {
 	use std::env::{remove_var, set_var};
 
-	use claims::assert_ok;
+	use claims::{assert_err_eq, assert_ok};
 	use rstest::rstest;
-	use testutils::assert_err_eq;
 
 	use super::*;
 	use crate::{

src/config/git_config.rs

@@ -133,9 +133,8 @@ impl TryFrom<&Config> for Theme {
 
 #[cfg(test)]
 mod tests {
-	use claims::{assert_err, assert_ok};
+	use claims::{assert_err, assert_err_eq, assert_ok};
 	use rstest::rstest;
-	use testutils::assert_err_eq;
 
 	use super::*;
 	use crate::{

src/config/theme.rs

@@ -31,8 +31,7 @@ pub(crate) fn get_bool(config: Option<&Config>, name: &str, default: bool) -> Re
 
 #[cfg(test)]
 mod tests {
-	use claims::assert_ok_eq;
-	use testutils::assert_err_eq;
+	use claims::{assert_err_eq, assert_ok_eq};
 
 	use super::*;
 	use crate::test_helpers::{invalid_utf, with_git_config};

src/config/utils/get_bool.rs

@@ -23,9 +23,8 @@ pub(crate) fn get_diff_ignore_whitespace(
 
 #[cfg(test)]
 mod tests {
-	use claims::assert_ok_eq;
+	use claims::{assert_err_eq, assert_ok_eq};
 	use rstest::rstest;
-	use testutils::assert_err_eq;
 
 	use super::*;
 	use crate::test_helpers::{invalid_utf, with_git_config};

src/config/utils/get_diff_ignore_whitespace.rs

@@ -14,9 +14,8 @@ pub(crate) fn git_diff_renames(git_config: Option<&Config>, name: &str) -> Resul
 
 #[cfg(test)]
 mod tests {
-	use claims::assert_ok_eq;
+	use claims::{assert_err_eq, assert_ok_eq};
 	use rstest::rstest;
-	use testutils::assert_err_eq;
 
 	use super::*;
 	use crate::test_helpers::{invalid_utf, with_git_config};

src/config/utils/get_diff_rename.rs

@@ -18,9 +18,8 @@ pub(crate) fn get_diff_show_whitespace(
 
 #[cfg(test)]
 mod tests {
-	use claims::assert_ok_eq;
+	use claims::{assert_err_eq, assert_ok_eq};
 	use rstest::rstest;
-	use testutils::assert_err_eq;
 
 	use super::*;
 	use crate::test_helpers::{invalid_utf, with_git_config};