From fedf5166f0c57db14b9e43747121e4b7845b63dd Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 20 Aug 2024 06:25:17 +0100 Subject: feat: set proposal branch prefix to `pr/` from `prs/`. whilst plural reflects usage of `heads` and `tags` in git refs, singular is shorter and more reflective of usage of branch prefixes such as `feature/` `fix/` --- tests/git_remote_helper.rs | 4 ++-- tests/list.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs index cce8e42..a44b141 100644 --- a/tests/git_remote_helper.rs +++ b/tests/git_remote_helper.rs @@ -2173,7 +2173,7 @@ mod push { r55.events = events.clone(); let before = r55.events.iter().cloned().collect::>(); - let branch_name = "prs/my-new-proposal"; + let branch_name = "pr/my-new-proposal"; let cli_tester_handle = std::thread::spawn(move || -> Result { let mut git_repo = clone_git_repo_with_nostr_url()?; @@ -2250,7 +2250,7 @@ mod push { .find(|t| t.as_vec()[0].eq("branch-name")) .unwrap() .as_vec()[1], - branch_name.replace("prs/", ""), + branch_name.replace("pr/", ""), ); let second_patch = new_events diff --git a/tests/list.rs b/tests/list.rs index ce90ee4..c145fa4 100644 --- a/tests/list.rs +++ b/tests/list.rs @@ -197,7 +197,7 @@ mod when_main_branch_is_uptodate { )?; c.succeeds_with(0, false, None)?; p.expect(&format!( - "checked out proposal as 'prs/{}(", + "checked out proposal as 'pr/{}(", FEATURE_BRANCH_NAME_1, ))?; p.expect_end_eventually_with(")' branch\r\n")?; @@ -319,7 +319,7 @@ mod when_main_branch_is_uptodate { )?; c.succeeds_with(0, false, Some(0))?; p.expect(&format!( - "checked out proposal as 'prs/{}(", + "checked out proposal as 'pr/{}(", FEATURE_BRANCH_NAME_3, ))?; p.expect_end_eventually_with(")' branch\r\n")?; @@ -526,7 +526,7 @@ mod when_main_branch_is_uptodate { )?; c.succeeds_with(0, false, Some(0))?; p.expect(&format!( - "checked out proposal as 'prs/{}(", + "checked out proposal as 'pr/{}(", FEATURE_BRANCH_NAME_4, ))?; p.expect_end_eventually_with(")' branch\r\n")?; @@ -773,7 +773,7 @@ mod when_main_branch_is_uptodate { )?; c.succeeds_with(0, false, Some(0))?; p.expect(&format!( - "checked out proposal as 'prs/{}(", + "checked out proposal as 'pr/{}(", FEATURE_BRANCH_NAME_1, ))?; p.expect_end_eventually_with(")' branch\r\n")?; -- cgit v1.2.3