diff options
| author | 6543 | 2020-06-07 22:20:53 +0200 |
|---|---|---|
| committer | GitHub | 2020-06-07 23:20:53 +0300 |
| commit | 78f0b5b92bd8739d6851fe00a12fdffda5f6e0dd (patch) | |
| tree | 929a9a83a76297760cb8db714d0c7e991d53eaa8 /integrations | |
| parent | 20951c5c215bb76385eb70e256e6858c1d53aa05 (diff) | |
Add option to API to update PullRequest base branch (#11666) (#11796)
* EditPull: add option to change base
Close #11552
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/api_pull_test.go | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/integrations/api_pull_test.go b/integrations/api_pull_test.go index 9e22be575..61daf917f 100644 --- a/integrations/api_pull_test.go +++ b/integrations/api_pull_test.go @@ -58,7 +58,7 @@ func TestAPIMergePullWIP(t *testing.T) { session.MakeRequest(t, req, http.StatusMethodNotAllowed) } -func TestAPICreatePullSuccess1(t *testing.T) { +func TestAPICreatePullSuccess(t *testing.T) { defer prepareTestEnv(t)() repo10 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 10}).(*models.Repository) // repo10 have code, pulls units. @@ -78,7 +78,7 @@ func TestAPICreatePullSuccess1(t *testing.T) { session.MakeRequest(t, req, 201) } -func TestAPICreatePullSuccess2(t *testing.T) { +func TestAPIEditPull(t *testing.T) { defer prepareTestEnv(t)() repo10 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 10}).(*models.Repository) owner10 := models.AssertExistsAndLoadBean(t, &models.User{ID: repo10.OwnerID}).(*models.User) @@ -90,6 +90,21 @@ func TestAPICreatePullSuccess2(t *testing.T) { Base: "master", Title: "create a success pr", }) + pull := new(api.PullRequest) + resp := session.MakeRequest(t, req, 201) + DecodeJSON(t, resp, pull) + assert.EqualValues(t, "master", pull.Base.Name) + + req = NewRequestWithJSON(t, http.MethodPatch, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d?token=%s", owner10.Name, repo10.Name, pull.Index, token), &api.EditPullRequestOption{ + Base: "feature/1", + Title: "edit a this pr", + }) + resp = session.MakeRequest(t, req, 201) + DecodeJSON(t, resp, pull) + assert.EqualValues(t, "feature/1", pull.Base.Name) - session.MakeRequest(t, req, 201) + req = NewRequestWithJSON(t, http.MethodPatch, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d?token=%s", owner10.Name, repo10.Name, pull.Index, token), &api.EditPullRequestOption{ + Base: "not-exist", + }) + session.MakeRequest(t, req, 404) } |