diff options
| author | Lauris BH <lauris@nix.lv> | 2017-06-21 04:00:03 +0300 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-06-21 09:00:03 +0800 |
| commit | 0a5dc640a12d1c0475052b73a721056b53460275 (patch) | |
| tree | 0296d1ac30ae82269eed06daed3eb1d9bc468c2d /integrations/pull_create_test.go | |
| parent | 6db387a21e245dc4aa7f009ca60574e42d934ffb (diff) | |
| download | gitea-0a5dc640a12d1c0475052b73a721056b53460275.tar.gz gitea-0a5dc640a12d1c0475052b73a721056b53460275.zip | |
Make branch deletion URL more like GitHub's, fixes #1397 (#1994)
* 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
Diffstat (limited to 'integrations/pull_create_test.go')
| -rw-r--r-- | integrations/pull_create_test.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/integrations/pull_create_test.go b/integrations/pull_create_test.go index 91f682fbda..9e9ba9eb3a 100644 --- a/integrations/pull_create_test.go +++ b/integrations/pull_create_test.go @@ -7,6 +7,7 @@ package integrations import ( "net/http" "path" + "strings" "testing" "github.com/stretchr/testify/assert" @@ -21,6 +22,9 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo, branch strin htmlDoc := NewHTMLParser(t, resp.Body) link, exists := htmlDoc.doc.Find("button.ui.green.small.button").Parent().Attr("href") assert.True(t, exists, "The template has changed") + if branch != "master" { + link = strings.Replace(link, ":master", ":"+branch, 1) + } req = NewRequest(t, "GET", link) resp = session.MakeRequest(t, req) |