diff --git a/src/tests/test_config_path.rs b/src/tests/test_config_path.rs index 9f9c490a3..ba8db8529 100644 --- a/src/tests/test_config_path.rs +++ b/src/tests/test_config_path.rs @@ -1,4 +1,5 @@ use nu_test_support::nu; +use pretty_assertions::assert_eq; use std::fs; use std::path::Path; diff --git a/src/tests/test_custom_commands.rs b/src/tests/test_custom_commands.rs index d29a9d747..b9b8cbe6c 100644 --- a/src/tests/test_custom_commands.rs +++ b/src/tests/test_custom_commands.rs @@ -1,5 +1,6 @@ use crate::tests::{fail_test, run_test, run_test_contains, TestResult}; use nu_test_support::nu; +use pretty_assertions::assert_eq; #[test] fn no_scope_leak1() -> TestResult { diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs index 492257a41..36370e4b8 100644 --- a/tests/const_/mod.rs +++ b/tests/const_/mod.rs @@ -1,4 +1,5 @@ use nu_test_support::{nu, pipeline}; +use pretty_assertions::assert_eq; #[test] fn const_bool() { diff --git a/tests/hooks/mod.rs b/tests/hooks/mod.rs index 0ef82e9d1..622a3483b 100644 --- a/tests/hooks/mod.rs +++ b/tests/hooks/mod.rs @@ -1,4 +1,5 @@ use nu_test_support::{nu, nu_repl_code}; +use pretty_assertions::assert_eq; fn env_change_hook_code_list(name: &str, code_list: &[&str]) -> String { let mut list = String::new(); diff --git a/tests/modules/mod.rs b/tests/modules/mod.rs index 9ba621926..ed2db7eda 100644 --- a/tests/modules/mod.rs +++ b/tests/modules/mod.rs @@ -1,6 +1,7 @@ use nu_test_support::fs::Stub::FileWithContentToBeTrimmed; use nu_test_support::playground::Playground; use nu_test_support::{nu, pipeline}; +use pretty_assertions::assert_eq; #[test] fn module_private_import_decl() { diff --git a/tests/overlays/mod.rs b/tests/overlays/mod.rs index 94b86832e..088263bc3 100644 --- a/tests/overlays/mod.rs +++ b/tests/overlays/mod.rs @@ -1,6 +1,7 @@ use nu_test_support::fs::Stub::FileWithContentToBeTrimmed; use nu_test_support::playground::Playground; use nu_test_support::{nu, nu_repl_code, pipeline}; +use pretty_assertions::assert_eq; #[test] fn add_overlay() { diff --git a/tests/parsing/mod.rs b/tests/parsing/mod.rs index ad5fc0dc1..48b805342 100644 --- a/tests/parsing/mod.rs +++ b/tests/parsing/mod.rs @@ -1,6 +1,7 @@ use nu_test_support::fs::Stub::FileWithContentToBeTrimmed; use nu_test_support::playground::Playground; use nu_test_support::{nu, pipeline}; +use pretty_assertions::assert_eq; #[test] fn source_file_relative_to_file() { diff --git a/tests/path/canonicalize.rs b/tests/path/canonicalize.rs index 73c72a473..90d9dee73 100644 --- a/tests/path/canonicalize.rs +++ b/tests/path/canonicalize.rs @@ -1,9 +1,8 @@ -use std::path::Path; - +use nu_path::canonicalize_with; use nu_test_support::fs::Stub::EmptyFile; use nu_test_support::playground::Playground; - -use nu_path::canonicalize_with; +use pretty_assertions::assert_eq; +use std::path::Path; #[test] fn canonicalize_path() { diff --git a/tests/path/expand_path.rs b/tests/path/expand_path.rs index 799c7769a..d133f90f8 100644 --- a/tests/path/expand_path.rs +++ b/tests/path/expand_path.rs @@ -1,8 +1,7 @@ -use std::path::PathBuf; - -use nu_test_support::playground::Playground; - use nu_path::expand_path_with; +use nu_test_support::playground::Playground; +use pretty_assertions::assert_eq; +use std::path::PathBuf; #[cfg(not(windows))] #[test] diff --git a/tests/plugins/core_inc.rs b/tests/plugins/core_inc.rs index 8c38a3597..b50ad2cc0 100644 --- a/tests/plugins/core_inc.rs +++ b/tests/plugins/core_inc.rs @@ -1,6 +1,7 @@ use nu_test_support::fs::Stub::FileWithContent; use nu_test_support::nu_with_plugins; use nu_test_support::playground::Playground; +use pretty_assertions::assert_eq; #[test] fn chooses_highest_increment_if_given_more_than_one() { diff --git a/tests/plugins/custom_values.rs b/tests/plugins/custom_values.rs index 86d48a3a2..e636295d6 100644 --- a/tests/plugins/custom_values.rs +++ b/tests/plugins/custom_values.rs @@ -1,4 +1,5 @@ use nu_test_support::nu_with_plugins; +use pretty_assertions::assert_eq; #[test] fn can_get_custom_value_from_plugin_and_instantly_collapse_it() { diff --git a/tests/plugins/formats/eml.rs b/tests/plugins/formats/eml.rs index 91959b02a..0a5c67747 100644 --- a/tests/plugins/formats/eml.rs +++ b/tests/plugins/formats/eml.rs @@ -1,4 +1,5 @@ use nu_test_support::nu_with_plugins; +use pretty_assertions::assert_eq; const TEST_CWD: &str = "tests/fixtures/formats"; diff --git a/tests/plugins/formats/ics.rs b/tests/plugins/formats/ics.rs index 8259ff945..cdc1876aa 100644 --- a/tests/plugins/formats/ics.rs +++ b/tests/plugins/formats/ics.rs @@ -1,6 +1,7 @@ use nu_test_support::fs::Stub::FileWithContentToBeTrimmed; use nu_test_support::nu_with_plugins; use nu_test_support::playground::Playground; +use pretty_assertions::assert_eq; #[test] fn infers_types() { diff --git a/tests/plugins/formats/ini.rs b/tests/plugins/formats/ini.rs index 007897e06..c6220253b 100644 --- a/tests/plugins/formats/ini.rs +++ b/tests/plugins/formats/ini.rs @@ -1,6 +1,7 @@ use nu_test_support::fs::Stub::FileWithContentToBeTrimmed; use nu_test_support::nu_with_plugins; use nu_test_support::playground::Playground; +use pretty_assertions::assert_eq; const TEST_CWD: &str = "tests/fixtures/formats"; diff --git a/tests/plugins/formats/vcf.rs b/tests/plugins/formats/vcf.rs index e59ea6488..81b65a6ab 100644 --- a/tests/plugins/formats/vcf.rs +++ b/tests/plugins/formats/vcf.rs @@ -1,6 +1,7 @@ use nu_test_support::fs::Stub::FileWithContentToBeTrimmed; use nu_test_support::nu_with_plugins; use nu_test_support::playground::Playground; +use pretty_assertions::assert_eq; #[test] fn infers_types() { diff --git a/tests/scope/mod.rs b/tests/scope/mod.rs index 668b445d7..c21787ed0 100644 --- a/tests/scope/mod.rs +++ b/tests/scope/mod.rs @@ -1,4 +1,5 @@ use nu_test_support::nu; +use pretty_assertions::assert_eq; #[ignore = "TODO: This shows old-style aliases. New aliases are under commands"] #[test] diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs index c73556d00..81e63886e 100644 --- a/tests/shell/environment/env.rs +++ b/tests/shell/environment/env.rs @@ -4,7 +4,7 @@ use nu_test_support::fs::Stub::FileWithContent; use nu_test_support::nu; use nu_test_support::playground::Playground; use nu_test_support::{nu_repl_code, pipeline}; - +use pretty_assertions::assert_eq; use serial_test::serial; #[test] diff --git a/tests/shell/environment/nu_env.rs b/tests/shell/environment/nu_env.rs index ca5e9e2a5..fe7379c39 100644 --- a/tests/shell/environment/nu_env.rs +++ b/tests/shell/environment/nu_env.rs @@ -3,6 +3,7 @@ use super::support::Trusted; use nu_test_support::fs::Stub::FileWithContent; use nu_test_support::playground::Playground; use nu_test_support::{nu, pipeline}; +use pretty_assertions::assert_eq; use serial_test::serial; diff --git a/tests/shell/mod.rs b/tests/shell/mod.rs index 7fb32a8ba..56e3e316e 100644 --- a/tests/shell/mod.rs +++ b/tests/shell/mod.rs @@ -1,6 +1,7 @@ use nu_test_support::fs::Stub::FileWithContentToBeTrimmed; use nu_test_support::playground::Playground; use nu_test_support::{nu, nu_repl_code, pipeline}; +use pretty_assertions::assert_eq; #[cfg(feature = "which-support")] mod environment; diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs index fd50fceb9..2ae5dc67b 100644 --- a/tests/shell/pipeline/commands/external.rs +++ b/tests/shell/pipeline/commands/external.rs @@ -1,4 +1,5 @@ use nu_test_support::nu; +use pretty_assertions::assert_eq; #[cfg(feature = "which-support")] #[test] diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs index 73cebd923..589a5c963 100644 --- a/tests/shell/pipeline/commands/internal.rs +++ b/tests/shell/pipeline/commands/internal.rs @@ -2,6 +2,7 @@ use nu_test_support::fs::Stub::FileWithContentToBeTrimmed; use nu_test_support::nu; use nu_test_support::pipeline; use nu_test_support::playground::Playground; +use pretty_assertions::assert_eq; #[test] fn takes_rows_of_nu_value_strings_and_pipes_it_to_stdin_of_external() { diff --git a/tests/shell/pipeline/mod.rs b/tests/shell/pipeline/mod.rs index e8fb3af05..5fea3c97b 100644 --- a/tests/shell/pipeline/mod.rs +++ b/tests/shell/pipeline/mod.rs @@ -1,6 +1,7 @@ mod commands; use nu_test_support::nu; +use pretty_assertions::assert_eq; #[test] fn doesnt_break_on_utf8() {