mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-24 12:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

describe: add tests for "ignore-rest"

Browse source
This commit is contained in:
Bryce Berger 2024-12-20 08:47:05 -05:00
parent d4b5175dd2
commit e624a7f071
No known key found for this signature in database
GPG key ID: 58CA4F9FEF8F4296
1 changed files with 86 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
cli/tests/test_describe_command.rs
View file

@ -386,6 +386,92 @@ fn test_describe_multiple_commits() {
assert!(stderr.contains("exited with an error"));
}
#[test]
fn test_describe_scissors() {
let mut test_env = TestEnvironment::default();
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
let repo_path = test_env.env_root().join("repo");
let edit_script = test_env.set_up_fake_editor();
// Initial setup
test_env.jj_cmd_ok(&repo_path, &["new"]);
test_env.jj_cmd_ok(&repo_path, &["new"]);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
@ c6349e79bbfd
○ 65b6b74e0897
○ 230dd059e1b0
◆ 000000000000
"###);
// ignore everything after the first scissor line
std::fs::write(
&edit_script,
indoc! {"
write
description from editor
content of message from editor
JJ: ignore-rest
content after ignore line should not be included
JJ: ignore-rest
ignore everything until EOF or next description
"},
)
.unwrap();
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["describe"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r#"
Working copy now at: kkmpptxz 99295466 (empty) description from editor
Parent commit : rlvkpnrz 65b6b74e (empty) (no description set)
"#);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r#"
@ 992954665601 description from editor
│
│ content of message from editor
○ 65b6b74e0897
○ 230dd059e1b0
◆ 000000000000
"#);
// if editing multiple commits, should parse the "JJ: describe" lines first
// (don't need a pair of scissors)
std::fs::write(
&edit_script,
indoc! {"
write
JJ: describe 65b6b74e0897 -------
description from editor for @-
JJ: ignore-rest
content after scissors should not be included
JJ: describe 230dd059e1b0 -------
description from editor for @--
JJ: ignore-rest
each commit should skip their own scissors
"},
)
.unwrap();
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["describe", "@-", "@--"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r#"
Updated 2 commits
Rebased 1 descendant commits
Working copy now at: kkmpptxz 03320e8f (empty) description from editor
Parent commit : rlvkpnrz 521d7685 (empty) description from editor for @-
"#);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r#"
@ 03320e8f9efb description from editor
│
│ content of message from editor
○ 521d7685230b description from editor for @-
○ 30015f8c395a description from editor for @--
◆ 000000000000
"#);
}
#[test]
fn test_multiple_message_args() {
let test_env = TestEnvironment::default();