0a5dc640a1
* Make branch deletion URL more like GitHub's, fixes #1397 * Add PR branch deletion integration test * Do not allow deleting protected branch * Change http error code to 403 if user has no write rights to repository * Add check to not panic if forked repository has alrady been deleted
104 lines
3.5 KiB
Go
104 lines
3.5 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package integrations
|
|
|
|
import (
|
|
"net/http"
|
|
"path"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum string) *TestResponse {
|
|
req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum))
|
|
resp := session.MakeRequest(t, req)
|
|
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
|
|
|
|
// Click the little green button to craete a pull
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
link, exists := htmlDoc.doc.Find("form.ui.form>button.ui.green.button").Parent().Attr("action")
|
|
assert.True(t, exists, "The template has changed")
|
|
req = NewRequestWithValues(t, "POST", link, map[string]string{
|
|
"_csrf": htmlDoc.GetCSRF(),
|
|
})
|
|
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
|
|
resp = session.MakeRequest(t, req)
|
|
assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
|
|
|
|
return resp
|
|
}
|
|
|
|
func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum string) *TestResponse {
|
|
req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum))
|
|
resp := session.MakeRequest(t, req)
|
|
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
|
|
|
|
// Click the little green button to craete a pull
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
link, exists := htmlDoc.doc.Find(".comments .merge .delete-button").Attr("data-url")
|
|
assert.True(t, exists, "The template has changed")
|
|
req = NewRequestWithValues(t, "POST", link, map[string]string{
|
|
"_csrf": htmlDoc.GetCSRF(),
|
|
})
|
|
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
|
|
resp = session.MakeRequest(t, req)
|
|
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
|
|
|
|
return resp
|
|
}
|
|
|
|
func TestPullMerge(t *testing.T) {
|
|
prepareTestEnv(t)
|
|
session := loginUser(t, "user1")
|
|
testRepoFork(t, session)
|
|
testEditFile(t, session, "user1", "repo1", "master", "README.md")
|
|
|
|
resp := testPullCreate(t, session, "user1", "repo1", "master")
|
|
redirectedURL := resp.Headers["Location"]
|
|
assert.NotEmpty(t, redirectedURL, "Redirected URL is not found")
|
|
|
|
elem := strings.Split(redirectedURL[0], "/")
|
|
assert.EqualValues(t, "pulls", elem[3])
|
|
testPullMerge(t, session, elem[1], elem[2], elem[4])
|
|
}
|
|
|
|
func TestPullCleanUpAfterMerge(t *testing.T) {
|
|
prepareTestEnv(t)
|
|
session := loginUser(t, "user1")
|
|
testRepoFork(t, session)
|
|
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md")
|
|
|
|
resp := testPullCreate(t, session, "user1", "repo1", "feature/test")
|
|
redirectedURL := resp.Headers["Location"]
|
|
assert.NotEmpty(t, redirectedURL, "Redirected URL is not found")
|
|
|
|
elem := strings.Split(redirectedURL[0], "/")
|
|
assert.EqualValues(t, "pulls", elem[3])
|
|
testPullMerge(t, session, elem[1], elem[2], elem[4])
|
|
|
|
// Check PR branch deletion
|
|
resp = testPullCleanUp(t, session, elem[1], elem[2], elem[4])
|
|
respJSON := struct {
|
|
Redirect string
|
|
}{}
|
|
DecodeJSON(t, resp, &respJSON)
|
|
|
|
assert.NotEmpty(t, respJSON.Redirect, "Redirected URL is not found")
|
|
|
|
elem = strings.Split(respJSON.Redirect, "/")
|
|
assert.EqualValues(t, "pulls", elem[3])
|
|
|
|
// Check branch deletion result
|
|
req := NewRequest(t, "GET", respJSON.Redirect)
|
|
resp = session.MakeRequest(t, req)
|
|
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
|
|
|
|
assert.EqualValues(t, "user1/feature/test has been deleted.", resultMsg)
|
|
}
|