From 42e61327718553fae6b98d7d96dd786b1f050e4c Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Fri, 2 Feb 2024 22:03:26 -0800 Subject: [PATCH] test_global_opts: extract --version to its own test --- cli/tests/test_global_opts.rs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/cli/tests/test_global_opts.rs b/cli/tests/test_global_opts.rs index 20114956b..e656e4dab 100644 --- a/cli/tests/test_global_opts.rs +++ b/cli/tests/test_global_opts.rs @@ -42,6 +42,19 @@ fn test_non_utf8_arg() { "###); } +#[test] +fn test_version() { + let test_env = TestEnvironment::default(); + + let stdout = test_env.jj_cmd_success(test_env.env_root(), &["--version"]); + let sanitized = stdout.replace(|c: char| c.is_ascii_hexdigit(), "?"); + assert!( + sanitized == "jj ?.??.?\n" + || sanitized == "jj ?.??.?-????????????????????????????????????????\n", + "{sanitized}" + ); +} + #[test] fn test_no_subcommand() { let test_env = TestEnvironment::default(); @@ -65,14 +78,6 @@ fn test_no_subcommand() { let stdout = test_env.jj_cmd_success(test_env.env_root(), &["--help"]); insta::assert_snapshot!(stdout.lines().next().unwrap(), @"Jujutsu (An experimental VCS)"); - let stdout = test_env.jj_cmd_success(test_env.env_root(), &["--version"]); - let sanitized = stdout.replace(|c: char| c.is_ascii_hexdigit(), "?"); - assert!( - sanitized == "jj ?.??.?\n" - || sanitized == "jj ?.??.?-????????????????????????????????????????\n", - "{sanitized}" - ); - let stdout = test_env.jj_cmd_success(test_env.env_root(), &["-R", "repo"]); assert_eq!(stdout, test_env.jj_cmd_success(&repo_path, &["log"]));