fix pull view ui merge section (#7335)
* fix pull view ui merge section * fix tests * fix testsrelease/v1.15
parent
9c6af9d2bb
commit
1772c6b94d
|
@ -159,7 +159,7 @@ func TestCantMergeWorkInProgress(t *testing.T) {
|
|||
req := NewRequest(t, "GET", resp.Header().Get("Location"))
|
||||
resp = session.MakeRequest(t, req, http.StatusOK)
|
||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||
text := strings.TrimSpace(htmlDoc.doc.Find(".merge-section.segment > .text.grey").Text())
|
||||
text := strings.TrimSpace(htmlDoc.doc.Find(".attached.header > .text.grey").Last().Text())
|
||||
assert.NotEmpty(t, text, "Can't find WIP text")
|
||||
|
||||
// remove <strong /> from lang
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
{{else}}red{{end}}"><span class="mega-octicon octicon-git-merge"></span></a>
|
||||
<div class="content">
|
||||
{{template "repo/pulls/status" .}}
|
||||
<div class="ui attached merge-section segment">
|
||||
<div class="ui {{if not $.LatestCommitStatus}}top attached header{{else}}attached merge-section segment{{end}}">
|
||||
{{if .Issue.PullRequest.HasMerged}}
|
||||
<div class="item text purple">
|
||||
{{$.i18n.Tr "repo.pulls.has_merged"}}
|
||||
|
|
Loading…
Reference in New Issue