forks/forgejo
1
0
Fork 0
Code Releases Activity

[TESTS] testPullCreate do not assume the default branch is master

Browse source
This commit is contained in:
Earl Warren 2024-03-20 06:07:02 +01:00
parent d3d0c4cbe7
commit 19d7ff9c9e
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/integration/pull_create_test.go
View file

@ -10,6 +10,7 @@ import (
"net/http/httptest"
"net/url"
"path"
"regexp"
"strings"
"testing"
@ -42,14 +43,16 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo string, toSel
link = strings.Replace(link, targetUser, user, 1)
}
if targetBranch != "master" {
link = strings.Replace(link, "master...", targetBranch+"...", 1)
// get main out of /user/project/main...some:other/branch
defaultBranch := regexp.MustCompile(`^.*/(.*)\.\.\.`).FindStringSubmatch(link)[1]
if targetBranch != defaultBranch {
link = strings.Replace(link, defaultBranch+"...", targetBranch+"...", 1)
}
if sourceBranch != "master" {
if sourceBranch != defaultBranch {
if targetUser == user {
link = strings.Replace(link, "...master", "..."+sourceBranch, 1)
link = strings.Replace(link, "..."+defaultBranch, "..."+sourceBranch, 1)
} else {
link = strings.Replace(link, ":master", ":"+sourceBranch, 1)
link = strings.Replace(link, ":"+defaultBranch, ":"+sourceBranch, 1)
}
}