2019-04-02 22:54:29 +03:00
// Copyright 2019 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.
2022-09-02 22:18:23 +03:00
package integration
2019-04-02 22:54:29 +03:00
import (
"fmt"
"net/http"
2019-05-11 18:29:17 +03:00
"net/url"
2019-04-02 22:54:29 +03:00
"path"
2019-08-20 20:43:00 +03:00
"strings"
2019-04-02 22:54:29 +03:00
"testing"
2019-05-11 13:21:34 +03:00
api "code.gitea.io/gitea/modules/structs"
2019-04-02 22:54:29 +03:00
"github.com/stretchr/testify/assert"
)
func TestPullCreate_CommitStatus ( t * testing . T ) {
2019-05-11 18:29:17 +03:00
onGiteaRun ( t , func ( t * testing . T , u * url . URL ) {
session := loginUser ( t , "user1" )
testRepoFork ( t , session , "user2" , "repo1" , "user1" , "repo1" )
testEditFileToNewBranch ( t , session , "user1" , "repo1" , "master" , "status1" , "README.md" , "status1" )
url := path . Join ( "user1" , "repo1" , "compare" , "master...status1" )
req := NewRequestWithValues ( t , "POST" , url ,
map [ string ] string {
"_csrf" : GetCSRF ( t , session , url ) ,
"title" : "pull request from status1" ,
2019-04-02 22:54:29 +03:00
} ,
)
2022-03-23 07:54:07 +03:00
session . MakeRequest ( t , req , http . StatusSeeOther )
2019-04-02 22:54:29 +03:00
2019-05-11 18:29:17 +03:00
req = NewRequest ( t , "GET" , "/user1/repo1/pulls" )
resp := session . MakeRequest ( t , req , http . StatusOK )
2021-11-18 04:33:06 +03:00
NewHTMLParser ( t , resp . Body )
2019-05-11 18:29:17 +03:00
// Request repository commits page
req = NewRequest ( t , "GET" , "/user1/repo1/pulls/1/commits" )
2019-04-02 22:54:29 +03:00
resp = session . MakeRequest ( t , req , http . StatusOK )
2021-11-18 04:33:06 +03:00
doc := NewHTMLParser ( t , resp . Body )
2019-04-02 22:54:29 +03:00
2019-05-11 18:29:17 +03:00
// Get first commit URL
commitURL , exists := doc . doc . Find ( "#commits-table tbody tr td.sha a" ) . Last ( ) . Attr ( "href" )
2019-04-02 22:54:29 +03:00
assert . True ( t , exists )
assert . NotEmpty ( t , commitURL )
2019-05-11 18:29:17 +03:00
commitID := path . Base ( commitURL )
2020-01-22 06:46:04 +03:00
statusList := [ ] api . CommitStatusState {
api . CommitStatusPending ,
api . CommitStatusError ,
api . CommitStatusFailure ,
api . CommitStatusWarning ,
api . CommitStatusSuccess ,
2019-05-11 18:29:17 +03:00
}
2020-01-22 06:46:04 +03:00
statesIcons := map [ api . CommitStatusState ] string {
2022-08-10 00:55:29 +03:00
api . CommitStatusPending : "octicon-dot-fill" ,
api . CommitStatusSuccess : "octicon-check" ,
api . CommitStatusError : "gitea-exclamation" ,
api . CommitStatusFailure : "octicon-x" ,
api . CommitStatusWarning : "gitea-exclamation" ,
2019-05-11 18:29:17 +03:00
}
2022-05-07 20:05:52 +03:00
testCtx := NewAPITestContext ( t , "user1" , "repo1" )
2019-05-11 18:29:17 +03:00
// Update commit status, and check if icon is updated as well
for _ , status := range statusList {
// Call API to add status for commit
2022-05-07 20:05:52 +03:00
t . Run ( "CreateStatus" , doAPICreateCommitStatus ( testCtx , commitID , status ) )
2019-05-11 18:29:17 +03:00
req = NewRequestf ( t , "GET" , "/user1/repo1/pulls/1/commits" )
resp = session . MakeRequest ( t , req , http . StatusOK )
doc = NewHTMLParser ( t , resp . Body )
commitURL , exists = doc . doc . Find ( "#commits-table tbody tr td.sha a" ) . Last ( ) . Attr ( "href" )
assert . True ( t , exists )
assert . NotEmpty ( t , commitURL )
assert . EqualValues ( t , commitID , path . Base ( commitURL ) )
2022-08-10 00:55:29 +03:00
cls , ok := doc . doc . Find ( "#commits-table tbody tr td.message .commit-status" ) . Last ( ) . Attr ( "class" )
2019-05-11 18:29:17 +03:00
assert . True ( t , ok )
2022-08-10 00:55:29 +03:00
assert . Contains ( t , cls , statesIcons [ status ] )
2019-05-11 18:29:17 +03:00
}
} )
2019-04-02 22:54:29 +03:00
}
2019-08-20 20:43:00 +03:00
2022-05-07 20:05:52 +03:00
func doAPICreateCommitStatus ( ctx APITestContext , commitID string , status api . CommitStatusState ) func ( * testing . T ) {
return func ( t * testing . T ) {
req := NewRequestWithJSON ( t , http . MethodPost , fmt . Sprintf ( "/api/v1/repos/%s/%s/statuses/%s?token=%s" , ctx . Username , ctx . Reponame , commitID , ctx . Token ) ,
api . CreateStatusOption {
State : status ,
TargetURL : "http://test.ci/" ,
Description : "" ,
Context : "testci" ,
} ,
)
if ctx . ExpectedCode != 0 {
ctx . Session . MakeRequest ( t , req , ctx . ExpectedCode )
return
}
ctx . Session . MakeRequest ( t , req , http . StatusCreated )
}
}
2022-07-13 11:22:51 +03:00
func TestPullCreate_EmptyChangesWithDifferentCommits ( t * testing . T ) {
// Merge must continue if commits SHA are different, even if content is same
Fix various typos (#21103)
Found via `codespell -q 3 -S
./options/locale,./options/license,./public/vendor,./web_src/fomantic -L
actived,allways,attachements,ba,befores,commiter,pullrequest,pullrequests,readby,splitted,te,unknwon`
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2022-09-07 21:40:36 +03:00
// Reason: gitflow and merging master back into develop, where is high possibility, there are no changes
2022-07-13 11:22:51 +03:00
// but just commit saying "Merge branch". And this meta commit can be also tagged,
// so we need to have this meta commit also in develop branch.
2019-08-20 20:43:00 +03:00
onGiteaRun ( t , func ( t * testing . T , u * url . URL ) {
session := loginUser ( t , "user1" )
testRepoFork ( t , session , "user2" , "repo1" , "user1" , "repo1" )
testEditFileToNewBranch ( t , session , "user1" , "repo1" , "master" , "status1" , "README.md" , "status1" )
testEditFileToNewBranch ( t , session , "user1" , "repo1" , "status1" , "status1" , "README.md" , "# repo1\n\nDescription for repo1" )
url := path . Join ( "user1" , "repo1" , "compare" , "master...status1" )
req := NewRequestWithValues ( t , "POST" , url ,
map [ string ] string {
"_csrf" : GetCSRF ( t , session , url ) ,
"title" : "pull request from status1" ,
} ,
)
2022-03-23 07:54:07 +03:00
session . MakeRequest ( t , req , http . StatusSeeOther )
2019-08-20 20:43:00 +03:00
req = NewRequest ( t , "GET" , "/user1/repo1/pulls/1" )
resp := session . MakeRequest ( t , req , http . StatusOK )
doc := NewHTMLParser ( t , resp . Body )
2020-11-15 23:58:16 +03:00
text := strings . TrimSpace ( doc . doc . Find ( ".merge-section" ) . Text ( ) )
2022-07-13 11:22:51 +03:00
assert . Contains ( t , text , "This pull request can be merged automatically." )
} )
}
func TestPullCreate_EmptyChangesWithSameCommits ( t * testing . T ) {
onGiteaRun ( t , func ( t * testing . T , u * url . URL ) {
session := loginUser ( t , "user1" )
testRepoFork ( t , session , "user2" , "repo1" , "user1" , "repo1" )
testCreateBranch ( t , session , "user1" , "repo1" , "branch/master" , "status1" , http . StatusSeeOther )
url := path . Join ( "user1" , "repo1" , "compare" , "master...status1" )
req := NewRequestWithValues ( t , "POST" , url ,
map [ string ] string {
"_csrf" : GetCSRF ( t , session , url ) ,
"title" : "pull request from status1" ,
} ,
)
session . MakeRequest ( t , req , http . StatusSeeOther )
req = NewRequest ( t , "GET" , "/user1/repo1/pulls/1" )
resp := session . MakeRequest ( t , req , http . StatusOK )
doc := NewHTMLParser ( t , resp . Body )
text := strings . TrimSpace ( doc . doc . Find ( ".merge-section" ) . Text ( ) )
assert . Contains ( t , text , "This branch is already included in the target branch. There is nothing to merge." )
2019-08-20 20:43:00 +03:00
} )
}