diff options
Diffstat (limited to 'tests/git_remote_nostr/push.rs')
| -rw-r--r-- | tests/git_remote_nostr/push.rs | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs index 9f5f492..5912543 100644 --- a/tests/git_remote_nostr/push.rs +++ b/tests/git_remote_nostr/push.rs | |||
| @@ -969,12 +969,10 @@ async fn proposal_three_way_merge_commit_pushed_to_main_leads_to_status_event_is | |||
| 969 | std::fs::write(git_repo.dir.join("new.md"), "some content")?; | 969 | std::fs::write(git_repo.dir.join("new.md"), "some content")?; |
| 970 | git_repo.stage_and_commit("new.md")?; | 970 | git_repo.stage_and_commit("new.md")?; |
| 971 | 971 | ||
| 972 | CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, [ | 972 | CliTester::new_git_with_remote_helper_from_dir( |
| 973 | "merge", | 973 | &git_repo.dir, |
| 974 | &branch_name, | 974 | ["merge", &branch_name, "-m", "proposal merge commit message"], |
| 975 | "-m", | 975 | ) |
| 976 | "proposal merge commit message", | ||
| 977 | ]) | ||
| 978 | .expect_end_eventually_and_print()?; | 976 | .expect_end_eventually_and_print()?; |
| 979 | 977 | ||
| 980 | let oid = git_repo.get_tip_of_local_branch("main")?; | 978 | let oid = git_repo.get_tip_of_local_branch("main")?; |
| @@ -1125,12 +1123,10 @@ async fn proposal_fast_forward_merge_commits_pushed_to_main_leads_to_status_even | |||
| 1125 | git_repo.checkout_remote_branch(&branch_name)?; | 1123 | git_repo.checkout_remote_branch(&branch_name)?; |
| 1126 | git_repo.checkout("refs/heads/main")?; | 1124 | git_repo.checkout("refs/heads/main")?; |
| 1127 | 1125 | ||
| 1128 | CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, [ | 1126 | CliTester::new_git_with_remote_helper_from_dir( |
| 1129 | "merge", | 1127 | &git_repo.dir, |
| 1130 | &branch_name, | 1128 | ["merge", &branch_name, "-m", "proposal merge commit message"], |
| 1131 | "-m", | 1129 | ) |
| 1132 | "proposal merge commit message", | ||
| 1133 | ]) | ||
| 1134 | .expect_end_eventually_and_print()?; | 1130 | .expect_end_eventually_and_print()?; |
| 1135 | 1131 | ||
| 1136 | let oid = git_repo.get_tip_of_local_branch("main")?; | 1132 | let oid = git_repo.get_tip_of_local_branch("main")?; |
| @@ -1784,12 +1780,10 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> { | |||
| 1784 | std::fs::write(git_repo.dir.join("new2.md"), "some content")?; | 1780 | std::fs::write(git_repo.dir.join("new2.md"), "some content")?; |
| 1785 | git_repo.stage_and_commit("new2.md")?; | 1781 | git_repo.stage_and_commit("new2.md")?; |
| 1786 | 1782 | ||
| 1787 | let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, [ | 1783 | let mut p = CliTester::new_git_with_remote_helper_from_dir( |
| 1788 | "push", | 1784 | &git_repo.dir, |
| 1789 | "-u", | 1785 | ["push", "-u", "origin", branch_name], |
| 1790 | "origin", | 1786 | ); |
| 1791 | branch_name, | ||
| 1792 | ]); | ||
| 1793 | cli_expect_nostr_fetch(&mut p)?; | 1787 | cli_expect_nostr_fetch(&mut p)?; |
| 1794 | p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; | 1788 | p.expect(format!("fetching {source_path} ref list over filesystem...\r\n").as_str())?; |
| 1795 | p.expect("list: connecting...\r\n\r\r\r")?; | 1789 | p.expect("list: connecting...\r\n\r\r\r")?; |