Fix pull request compare link (#1832)

* Fix pull request compare link

* Integration test
This commit is contained in:
Ethan Koenig 2017-05-31 10:47:42 -04:00 committed by Bo-Yi Wu
parent bfb44f8854
commit 5554165a0c
3 changed files with 41 additions and 2 deletions

View file

@ -0,0 +1,31 @@
// 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"
"testing"
"github.com/stretchr/testify/assert"
)
func TestPullCompare(t *testing.T) {
prepareTestEnv(t)
session := loginUser(t, "user2", "password")
req, err := http.NewRequest("GET", "/user2/repo1/pulls", nil)
assert.NoError(t, err)
resp := session.MakeRequest(t, req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
htmlDoc, err := NewHtmlParser(resp.Body)
assert.NoError(t, err)
link, exists := htmlDoc.doc.Find(".navbar").Find(".ui.green.button").Attr("href")
assert.True(t, exists, "The template has changed")
req, err = http.NewRequest("GET", link, nil)
assert.NoError(t, err)
resp = session.MakeRequest(t, req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
}

View file

@ -17,7 +17,15 @@
-
id: 3
repo_id: 1
type: 3
index: 0
config: "{}"
created_unix: 946684810
-
id: 4
repo_id: 1
type: 7
index: 0
config: "{}"
created_unix: 946684810
created_unix: 946684810

View file

@ -10,7 +10,7 @@
<div class="ui secondary menu">
{{if .PullRequestCtx.Allowed}}
<div class="fitted item">
<a href="{{.BaseRepo.Link}}/compare/{{.BaseRepo.DefaultBranch}}...{{.Username}}:{{.BranchName}}">
<a href="{{.BaseRepo.Link}}/compare/{{.BaseRepo.DefaultBranch}}...{{.SignedUser.Name}}:{{.BranchName}}">
<button class="ui green small button"><i class="octicon octicon-git-compare"></i></button>
</a>
</div>