mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 00:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

obslog: update test to show multiple squashes

Browse source
This commit is contained in:
Scott Taylor 2024-07-14 13:53:45 -05:00 committed by Scott Taylor
parent df021083c9
commit fcf1ca95f2
1 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
cli/tests/test_obslog_command.rs
View file

@ -235,31 +235,53 @@ fn test_obslog_squash() {
std::fs::write(repo_path.join("file1"), "foo\nbar\n").unwrap(); std::fs::write(repo_path.join("file1"), "foo\nbar\n").unwrap();
let edit_script = test_env.set_up_fake_editor(); let edit_script = test_env.set_up_fake_editor();
std::fs::write(edit_script, "write\nsquashed").unwrap(); std::fs::write(&edit_script, "write\nsquashed 1").unwrap();
test_env.jj_cmd_ok(&repo_path, &["squash"]);
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "third"]);
std::fs::write(repo_path.join("file1"), "foo\nbar\nbaz\n").unwrap();
std::fs::write(&edit_script, "write\nsquashed 2").unwrap();
test_env.jj_cmd_ok(&repo_path, &["squash"]); test_env.jj_cmd_ok(&repo_path, &["squash"]);
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "-p", "-r", "@-"]); let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "-p", "-r", "@-"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
◉ qpvuntsm test.user@example.com 2001-02-03 08:05:10 68647e34 ◉ qpvuntsm test.user@example.com 2001-02-03 08:05:12 1408a0a7
├─╮ squashed ├─╮ squashed 2
│ │ Modified regular file file1: │ │ Modified regular file file1:
│ │ 1 1: foo │ │ 1 1: foo
│ │ 2: bar │ │ 2 2: bar
◉ │ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 766420db │ │ 3: baz
│ │ first ◉ │ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:10 e3c2a446
│ │ Added regular file file1: ├───╮ squashed 1
│ │ 1: foo │ │ │ Modified regular file file1:
◉ │ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 fa15625b │ │ │ 1 1: foo
│ │ (empty) first │ │ │ 2: bar
◉ │ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 ◉ │ │ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 766420db
│ (empty) (no description set) │ │ │ first
◉ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:10 46acd22a │ │ │ Added regular file file1:
│ second │ │ │ 1: foo
◉ │ │ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 fa15625b
│ │ │ (empty) first
◉ │ │ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
│ │ (empty) (no description set)
│ ◉ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:10 46acd22a
│ │ second
│ │ Modified regular file file1:
│ │ 1 1: foo
│ │ 2: bar
│ ◉ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:09 cba41deb
│ (empty) second
◉ zsuskuln hidden test.user@example.com 2001-02-03 08:05:12 7015a42c
│ third
│ Modified regular file file1: │ Modified regular file file1:
│ 1 1: foo │ 1 1: foo
│ 2: bar │ 2 2: bar
◉ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:09 cba41deb │ 3: baz
(empty) second ◉ zsuskuln hidden test.user@example.com 2001-02-03 08:05:11 66645763
│ (empty) third
◉ zsuskuln hidden test.user@example.com 2001-02-03 08:05:10 1c7afcb4
(empty) (no description set)
"###); "###);
} }