diff options
Diffstat (limited to 'src/options/get.rs')
| -rw-r--r-- | src/options/get.rs | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/options/get.rs b/src/options/get.rs index f19c3293..a36987ca 100644 --- a/src/options/get.rs +++ b/src/options/get.rs @@ -117,8 +117,13 @@ pub mod tests { use crate::tests::integration_test_utils::integration_test_utils; + // TODO: the followig tests are collapsed into one since they all set the same env var and thus + // could affect each other if allowed to run concurrently. + #[test] - fn test_simple_string_env_var_overrides_git_config() { + fn test_env_var_overrides_git_config() { + // ---------------------------------------------------------------------------------------- + // simple string let git_config_contents = b" [delta] plus-style = blue @@ -133,7 +138,7 @@ pub mod tests { assert_eq!(opt.plus_style, "blue"); env::set_var("GIT_CONFIG_PARAMETERS", "'delta.plus-style=green'"); - let opt = integration_test_utils::make_options_from_args_and_git_config( + let opt = integration_test_utils::make_options_from_args_and_git_config_honoring_env_var( &[], Some(git_config_contents), Some(git_config_path), @@ -141,10 +146,9 @@ pub mod tests { assert_eq!(opt.plus_style, "green"); remove_file(git_config_path).unwrap(); - } - #[test] - fn test_complex_string_env_var_overrides_git_config() { + // ---------------------------------------------------------------------------------------- + // complex string let git_config_contents = br##" [delta] minus-style = red bold ul "#ffeeee" @@ -162,7 +166,7 @@ pub mod tests { "GIT_CONFIG_PARAMETERS", r##"'delta.minus-style=magenta italic ol "#aabbcc"'"##, ); - let opt = integration_test_utils::make_options_from_args_and_git_config( + let opt = integration_test_utils::make_options_from_args_and_git_config_honoring_env_var( &[], Some(git_config_contents), Some(git_config_path), @@ -170,10 +174,9 @@ pub mod tests { assert_eq!(opt.minus_style, r##"magenta italic ol "#aabbcc""##,); remove_file(git_config_path).unwrap(); - } - #[test] - fn test_option_string_env_var_overrides_git_config() { + // ---------------------------------------------------------------------------------------- + // option string let git_config_contents = b" [delta] plus-style = blue @@ -188,7 +191,7 @@ pub mod tests { assert_eq!(opt.plus_style, "blue"); env::set_var("GIT_CONFIG_PARAMETERS", "'delta.plus-style=green'"); - let opt = integration_test_utils::make_options_from_args_and_git_config( + let opt = integration_test_utils::make_options_from_args_and_git_config_honoring_env_var( &[], Some(git_config_contents), Some(git_config_path), @@ -196,10 +199,9 @@ pub mod tests { assert_eq!(opt.plus_style, "green"); remove_file(git_config_path).unwrap(); - } - #[test] - fn test_bool_env_var_overrides_git_config() { + // ---------------------------------------------------------------------------------------- + // bool let git_config_contents = b" [delta] side-by-side = true @@ -214,7 +216,7 @@ pub mod tests { assert_eq!(opt.side_by_side, true); env::set_var("GIT_CONFIG_PARAMETERS", "'delta.side-by-side=false'"); - let opt = integration_test_utils::make_options_from_args_and_git_config( + let opt = integration_test_utils::make_options_from_args_and_git_config_honoring_env_var( &[], Some(git_config_contents), Some(git_config_path), @@ -222,10 +224,9 @@ pub mod tests { assert_eq!(opt.side_by_side, false); remove_file(git_config_path).unwrap(); - } - #[test] - fn test_int_env_var_overrides_git_config() { + // ---------------------------------------------------------------------------------------- + // int let git_config_contents = b" [delta] max-line-length = 1 @@ -240,7 +241,7 @@ pub mod tests { assert_eq!(opt.max_line_length, 1); env::set_var("GIT_CONFIG_PARAMETERS", "'delta.max-line-length=2'"); - let opt = integration_test_utils::make_options_from_args_and_git_config( + let opt = integration_test_utils::make_options_from_args_and_git_config_honoring_env_var( &[], Some(git_config_contents), Some(git_config_path), @@ -248,17 +249,16 @@ pub mod tests { assert_eq!(opt.max_line_length, 2); remove_file(git_config_path).unwrap(); - } - #[test] - fn test_float_env_var_overrides_git_config() { + // ---------------------------------------------------------------------------------------- + // float let git_config_contents = b" [delta] max-line-distance = 0.6 "; let git_config_path = "delta__test_float_env_var_overrides_git_config.gitconfig"; - let opt = integration_test_utils::make_options_from_args_and_git_config( + let opt = integration_test_utils::make_options_from_args_and_git_config_honoring_env_var( &[], Some(git_config_contents), Some(git_config_path), @@ -266,7 +266,7 @@ pub mod tests { assert_eq!(opt.max_line_distance, 0.6); env::set_var("GIT_CONFIG_PARAMETERS", "'delta.max-line-distance=0.7'"); - let opt = integration_test_utils::make_options_from_args_and_git_config( + let opt = integration_test_utils::make_options_from_args_and_git_config_honoring_env_var( &[], Some(git_config_contents), Some(git_config_path), |