upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2024-08-18 08:14:29 +0100
committerDanConwayDev <DanConwayDev@protonmail.com>2024-08-18 08:14:29 +0100
commitde89a7ec528fa57702199f94e63b42f827bd2fdf (patch)
tree88c4e0a861d45793f42cbecd5966dac63f2068e5 /tests
parent948c8595acea9a783a38002371c40185868ce923 (diff)
feat(remote): `push` log merge event creation
so the user knows that a merge commit event will be issued
Diffstat (limited to 'tests')
-rw-r--r--tests/git_remote_helper.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs
index 98637e8..cce8e42 100644
--- a/tests/git_remote_helper.rs
+++ b/tests/git_remote_helper.rs
@@ -1753,6 +1753,10 @@ mod push {
1753 let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); 1753 let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]);
1754 cli_expect_nostr_fetch(&mut p)?; 1754 cli_expect_nostr_fetch(&mut p)?;
1755 p.expect(format!("fetching refs list: {}...\r\n\r", source_path).as_str())?; 1755 p.expect(format!("fetching refs list: {}...\r\n\r", source_path).as_str())?;
1756
1757 p.expect("merge commit ")?;
1758 // shorthand merge commit id appears in this gap
1759 p.expect_eventually(": create nostr proposal status event\r\n")?;
1756 p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; 1760 p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?;
1757 let output = p.expect_end_eventually()?; 1761 let output = p.expect_end_eventually()?;
1758 1762