domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Add API to update pr headBranch (#12419)

Browse source 
* [API] Add update pr headBranch api

Signed-off-by: a1012112796 <1012112796@qq.com>
This commit is contained in:
赵智超 2020-08-05 04:55:22 +08:00 • committed by GitHub
parent e61c09ed73
commit 8a6790b2aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 159 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
integrations/pull_update_test.go
View file

@ -5,7 +5,7 @@
package integrations
import (
"fmt"
"net/http"
"net/url"
"testing"
"time"
@ -19,7 +19,7 @@ import (
"github.com/stretchr/testify/assert"
)
func TestPullUpdate(t *testing.T) {
func TestAPIPullUpdate(t *testing.T) {
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
//Create PR to test
user := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User)
@ -31,17 +31,19 @@ func TestPullUpdate(t *testing.T) {
assert.NoError(t, err)
assert.EqualValues(t, 1, diffCount.Behind)
assert.EqualValues(t, 1, diffCount.Ahead)
assert.NoError(t, pr.LoadBaseRepo())
assert.NoError(t, pr.LoadIssue())
message := fmt.Sprintf("Merge branch '%s' into %s", pr.BaseBranch, pr.HeadBranch)
err = pull_service.Update(pr, user, message)
assert.NoError(t, err)
session := loginUser(t, "user2")
token := getTokenForLoggedInUser(t, session)
req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/pulls/%d/update?token="+token, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Issue.Index)
session.MakeRequest(t, req, http.StatusOK)
//Test GetDiverging after update
diffCount, err = pull_service.GetDiverging(pr)
assert.NoError(t, err)
assert.EqualValues(t, 0, diffCount.Behind)
assert.EqualValues(t, 2, diffCount.Ahead)
})
}