mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-04 05:28:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

tests: use different commit per branch in jj git push tests

Browse source 
I think I meant for this test to use different commits but because
they have the same content and metadata, they ended up with the same
hash.
This commit is contained in:
Martin von Zweigbergk 2022-09-26 10:37:49 -07:00 committed by Martin von Zweigbergk
parent c4b44500e4
commit 2d2ed53a34
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/test_git_push.rs
View file

@ -31,7 +31,7 @@ fn set_up() -> (TestEnvironment, PathBuf) {
Some("refs/heads/branch1"),
&signature,
&signature,
"description",
"description 1",
&empty_tree,
&[],
)
@ -41,7 +41,7 @@ fn set_up() -> (TestEnvironment, PathBuf) {
Some("refs/heads/branch2"),
&signature,
&signature,
"description",
"description 2",
&empty_tree,
&[],
)
@ -89,29 +89,29 @@ fn test_git_push_current_branch() {
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list"]);
insta::assert_snapshot!(stdout, @r###"
branch1: 5d0d85ed3da7 modified branch1 commit
@origin (ahead by 1 commits, behind by 1 commits): 545acdb23f70 description
@origin (ahead by 1 commits, behind by 1 commits): a3ccc578ea7b description 1
branch2: 7840c9885676 foo
@origin (ahead by 1 commits, behind by 1 commits): 545acdb23f70 description
@origin (ahead by 1 commits, behind by 1 commits): 7fd4b07286b3 description 2
my-branch: 7840c9885676 foo
"###);
// First dry-run. `branch1` should not get pushed.
let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push", "--dry-run"]);
insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin:
Move branch branch2 from 545acdb23f70 to 7840c9885676
Move branch branch2 from 7fd4b07286b3 to 7840c9885676
Add branch my-branch to 7840c9885676
Dry-run requested, not pushing.
"###);
let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push"]);
insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin:
Move branch branch2 from 545acdb23f70 to 7840c9885676
Move branch branch2 from 7fd4b07286b3 to 7840c9885676
Add branch my-branch to 7840c9885676
"###);
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list"]);
insta::assert_snapshot!(stdout, @r###"
branch1: 5d0d85ed3da7 modified branch1 commit
@origin (ahead by 1 commits, behind by 1 commits): 545acdb23f70 description
@origin (ahead by 1 commits, behind by 1 commits): a3ccc578ea7b description 1
branch2: 7840c9885676 foo
my-branch: 7840c9885676 foo
"###);
@ -141,25 +141,25 @@ fn test_git_push_all() {
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list"]);
insta::assert_snapshot!(stdout, @r###"
branch1 (deleted)
@origin: 545acdb23f70 description
@origin: a3ccc578ea7b description 1
branch2: 7840c9885676 foo
@origin (ahead by 1 commits, behind by 1 commits): 545acdb23f70 description
@origin (ahead by 1 commits, behind by 1 commits): 7fd4b07286b3 description 2
my-branch: 7840c9885676 foo
"###);
// First dry-run
let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push", "--all", "--dry-run"]);
insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin:
Delete branch branch1 from 545acdb23f70
Move branch branch2 from 545acdb23f70 to 7840c9885676
Delete branch branch1 from a3ccc578ea7b
Move branch branch2 from 7fd4b07286b3 to 7840c9885676
Add branch my-branch to 7840c9885676
Dry-run requested, not pushing.
"###);
let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push", "--all"]);
insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin:
Delete branch branch1 from 545acdb23f70
Move branch branch2 from 545acdb23f70 to 7840c9885676
Delete branch branch1 from a3ccc578ea7b
Move branch branch2 from 7fd4b07286b3 to 7840c9885676
Add branch my-branch to 7840c9885676
"###);
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list"]);