diff options
Diffstat (limited to 'tests/git_remote_nostr/push.rs')
| -rw-r--r-- | tests/git_remote_nostr/push.rs | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs index 30602c9..4e44642 100644 --- a/tests/git_remote_nostr/push.rs +++ b/tests/git_remote_nostr/push.rs | |||
| @@ -925,10 +925,12 @@ async fn proposal_three_way_merge_commit_pushed_to_main_leads_to_status_event_is | |||
| 925 | std::fs::write(git_repo.dir.join("new.md"), "some content")?; | 925 | std::fs::write(git_repo.dir.join("new.md"), "some content")?; |
| 926 | git_repo.stage_and_commit("new.md")?; | 926 | git_repo.stage_and_commit("new.md")?; |
| 927 | 927 | ||
| 928 | CliTester::new_git_with_remote_helper_from_dir( | 928 | CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, [ |
| 929 | &git_repo.dir, | 929 | "merge", |
| 930 | ["merge", &branch_name, "-m", "proposal merge commit message"], | 930 | &branch_name, |
| 931 | ) | 931 | "-m", |
| 932 | "proposal merge commit message", | ||
| 933 | ]) | ||
| 932 | .expect_end_eventually_and_print()?; | 934 | .expect_end_eventually_and_print()?; |
| 933 | 935 | ||
| 934 | let oid = git_repo.get_tip_of_local_branch("main")?; | 936 | let oid = git_repo.get_tip_of_local_branch("main")?; |
| @@ -1079,10 +1081,12 @@ async fn proposal_fast_forward_merge_commits_pushed_to_main_leads_to_status_even | |||
| 1079 | git_repo.checkout_remote_branch(&branch_name)?; | 1081 | git_repo.checkout_remote_branch(&branch_name)?; |
| 1080 | git_repo.checkout("refs/heads/main")?; | 1082 | git_repo.checkout("refs/heads/main")?; |
| 1081 | 1083 | ||
| 1082 | CliTester::new_git_with_remote_helper_from_dir( | 1084 | CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, [ |
| 1083 | &git_repo.dir, | 1085 | "merge", |
| 1084 | ["merge", &branch_name, "-m", "proposal merge commit message"], | 1086 | &branch_name, |
| 1085 | ) | 1087 | "-m", |
| 1088 | "proposal merge commit message", | ||
| 1089 | ]) | ||
| 1086 | .expect_end_eventually_and_print()?; | 1090 | .expect_end_eventually_and_print()?; |
| 1087 | 1091 | ||
| 1088 | let oid = git_repo.get_tip_of_local_branch("main")?; | 1092 | let oid = git_repo.get_tip_of_local_branch("main")?; |
| @@ -1736,10 +1740,12 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> { | |||
| 1736 | std::fs::write(git_repo.dir.join("new2.md"), "some content")?; | 1740 | std::fs::write(git_repo.dir.join("new2.md"), "some content")?; |
| 1737 | git_repo.stage_and_commit("new2.md")?; | 1741 | git_repo.stage_and_commit("new2.md")?; |
| 1738 | 1742 | ||
| 1739 | let mut p = CliTester::new_git_with_remote_helper_from_dir( | 1743 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, [ |
| 1740 | &git_repo.dir, | 1744 | "push", |
| 1741 | ["push", "-u", "origin", branch_name], | 1745 | "-u", |
| 1742 | ); | 1746 | "origin", |
| 1747 | branch_name, | ||
| 1748 | ]); | ||
| 1743 | cli_expect_nostr_fetch(&mut p)?; | 1749 | cli_expect_nostr_fetch(&mut p)?; |
| 1744 | p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; | 1750 | p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; |
| 1745 | p.expect("list: connecting...\r\n\r\r\r")?; | 1751 | p.expect("list: connecting...\r\n\r\r\r")?; |