From de89a7ec528fa57702199f94e63b42f827bd2fdf Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Sun, 18 Aug 2024 08:14:29 +0100 Subject: feat(remote): `push` log merge event creation so the user knows that a merge commit event will be issued --- tests/git_remote_helper.rs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/git_remote_helper.rs') 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 { let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]); cli_expect_nostr_fetch(&mut p)?; p.expect(format!("fetching refs list: {}...\r\n\r", source_path).as_str())?; + + p.expect("merge commit ")?; + // shorthand merge commit id appears in this gap + p.expect_eventually(": create nostr proposal status event\r\n")?; p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; -- cgit v1.2.3