STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add test for empty BranchConfig in prSelectorForCurrentBranch

Browse source
This commit is contained in:
Tyler McGoffin 2025-01-09 09:01:14 -08:00
parent 15ac566222
commit d4f7576e8b
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/cmd/pr/status/status.go
View file

@ -214,8 +214,8 @@ func prSelectorForCurrentBranch(branchConfig git.BranchConfig, baseRepo ghrepo.I
branchOwner = r.RepoOwner()
}
selector := prHeadRef
if branchOwner != "" {
selector := prHeadRef
if strings.HasPrefix(branchConfig.MergeRef, "refs/heads/") {
selector = strings.TrimPrefix(branchConfig.MergeRef, "refs/heads/")
}
@ -223,9 +223,10 @@ func prSelectorForCurrentBranch(branchConfig git.BranchConfig, baseRepo ghrepo.I
if !strings.EqualFold(branchOwner, baseRepo.RepoOwner()) {
selector = fmt.Sprintf("%s:%s", branchOwner, selector)
}
return 0, selector, nil
}
return 0, selector, nil
return 0, prHeadRef, nil
}
func totalApprovals(pr *api.PullRequest) int {

8
pkg/cmd/pr/status/status_test.go
View file

@ -387,6 +387,14 @@ func Test_prSelectorForCurrentBranch(t *testing.T) {
wantSelector string
wantError error
}{
{
name: "Empty branch config",
branchConfig: git.BranchConfig{},
prHeadRef: "Frederick888/main",
wantPrNumber: 0,
wantSelector: "Frederick888/main",
wantError: nil,
},
{
name: "The branch is configured to merge a special PR head ref",
branchConfig: git.BranchConfig{