mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-04 18:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

tests: avoid about-to-be-deleted open template keyword

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-11-04 22:45:51 -07:00 committed by Martin von Zweigbergk
parent 5a4c463dc0
commit a6dd84dc5c
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/test_edit_command.rs
View file

@ -31,16 +31,16 @@ fn test_edit() {
// Errors out without argument // Errors out without argument
test_env.jj_cmd_cli_error(&repo_path, &["edit"]); test_env.jj_cmd_cli_error(&repo_path, &["edit"]);
// Can edit a closed commit // Makes the specified commit the working-copy commit
let stdout = test_env.jj_cmd_success(&repo_path, &["edit", "@-"]); let stdout = test_env.jj_cmd_success(&repo_path, &["edit", "@-"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
Working copy now at: 5c9d6c787f29 first Working copy now at: 5c9d6c787f29 first
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
"###); "###);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
o 37ed5225d0fd open second o 37ed5225d0fd second
@ 5c9d6c787f29 closed first @ 5c9d6c787f29 first
o 000000000000 closed (no description set) o 000000000000 (no description set)
"###); "###);
insta::assert_snapshot!(read_file(&repo_path.join("file1")), @"0"); insta::assert_snapshot!(read_file(&repo_path.join("file1")), @"0");
@ -48,9 +48,9 @@ fn test_edit() {
std::fs::write(repo_path.join("file2"), "0").unwrap(); std::fs::write(repo_path.join("file2"), "0").unwrap();
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
Rebased 1 descendant commits onto updated working copy Rebased 1 descendant commits onto updated working copy
o 57e61f6b2ce1 open second o 57e61f6b2ce1 second
@ f1b9706b17d0 closed first @ f1b9706b17d0 first
o 000000000000 closed (no description set) o 000000000000 (no description set)
"###); "###);
} }
@ -59,14 +59,7 @@ fn read_file(path: &Path) -> String {
} }
fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String { fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
test_env.jj_cmd_success( test_env.jj_cmd_success(cwd, &["log", "-T", r#"commit_id.short() " " description"#])
cwd,
&[
"log",
"-T",
r#"commit_id.short() " " if(open, "open", "closed") " " description"#,
],
)
} }
#[test] #[test]