This commit is contained in:
@@ -14,19 +14,19 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
auth_model "code.gitea.io/gitea/models/auth"
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
"code.gitea.io/gitea/models/unittest"
|
||||
"code.gitea.io/gitea/modules/git/gitcmd"
|
||||
api "code.gitea.io/gitea/modules/structs"
|
||||
"code.gitea.io/gitea/modules/test"
|
||||
"code.gitea.io/gitea/tests"
|
||||
auth_model "gitea.dev/models/auth"
|
||||
repo_model "gitea.dev/models/repo"
|
||||
"gitea.dev/models/unittest"
|
||||
"gitea.dev/modules/git/gitcmd"
|
||||
api "gitea.dev/modules/structs"
|
||||
"gitea.dev/modules/test"
|
||||
"gitea.dev/tests"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func testPullCreate(t *testing.T, session *TestSession, user, repo string, toSelf bool, targetBranch, sourceBranch, title string) *httptest.ResponseRecorder {
|
||||
req := NewRequest(t, "GET", path.Join(user, repo))
|
||||
req := NewRequest(t, "GET", "/"+path.Join(user, repo))
|
||||
resp := session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
// Click the PR button to create a pull
|
||||
@@ -189,7 +189,8 @@ func testDeleteRepository(t *testing.T, session *TestSession, ownerName, repoNam
|
||||
req := NewRequestWithValues(t, "POST", relURL+"?action=delete", map[string]string{
|
||||
"repo_name": repoName,
|
||||
})
|
||||
session.MakeRequest(t, req, http.StatusSeeOther)
|
||||
resp := session.MakeRequest(t, req, http.StatusOK)
|
||||
assert.NotNil(t, test.ParseJSONRedirect(resp.Body.Bytes()).Redirect)
|
||||
}
|
||||
|
||||
func TestPullBranchDelete(t *testing.T) {
|
||||
@@ -288,8 +289,7 @@ func TestCreatePullRequestFromNestedOrgForks(t *testing.T) {
|
||||
Readme: "Default",
|
||||
}).AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, http.StatusCreated)
|
||||
var baseRepo api.Repository
|
||||
DecodeJSON(t, resp, &baseRepo)
|
||||
baseRepo := DecodeJSON(t, resp, &api.Repository{})
|
||||
assert.Equal(t, "main", baseRepo.DefaultBranch)
|
||||
|
||||
forkIntoOrg := func(srcOrg, dstOrg string) api.Repository {
|
||||
@@ -297,13 +297,12 @@ func TestCreatePullRequestFromNestedOrgForks(t *testing.T) {
|
||||
Organization: new(dstOrg),
|
||||
}).AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, http.StatusAccepted)
|
||||
var forkRepo api.Repository
|
||||
DecodeJSON(t, resp, &forkRepo)
|
||||
forkRepo := DecodeJSON(t, resp, &api.Repository{})
|
||||
assert.NotNil(t, forkRepo.Owner)
|
||||
if forkRepo.Owner != nil {
|
||||
assert.Equal(t, dstOrg, forkRepo.Owner.UserName)
|
||||
}
|
||||
return forkRepo
|
||||
return *forkRepo
|
||||
}
|
||||
|
||||
forkIntoOrg(baseOrg, midForkOrg)
|
||||
@@ -326,8 +325,7 @@ func TestCreatePullRequestFromNestedOrgForks(t *testing.T) {
|
||||
}
|
||||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/pulls", baseOrg, repoName), prPayload).AddTokenAuth(token)
|
||||
resp = MakeRequest(t, req, http.StatusCreated)
|
||||
var pr api.PullRequest
|
||||
DecodeJSON(t, resp, &pr)
|
||||
pr := DecodeJSON(t, resp, &api.PullRequest{})
|
||||
assert.Equal(t, prPayload["title"], pr.Title)
|
||||
if assert.NotNil(t, pr.Head) {
|
||||
assert.Equal(t, patchBranch, pr.Head.Ref)
|
||||
|
||||
Reference in New Issue
Block a user