mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 11:28:24 +00:00 
			
		
		
		
	* Fix indention Signed-off-by: kolaente <k@knt.li> * Add option to merge a pr right now without waiting for the checks to succeed Signed-off-by: kolaente <k@knt.li> * Fix lint Signed-off-by: kolaente <k@knt.li> * Add scheduled pr merge to tables used for testing Signed-off-by: kolaente <k@knt.li> * Add status param to make GetPullRequestByHeadBranch reusable Signed-off-by: kolaente <k@knt.li> * Move "Merge now" to a seperate button to make the ui clearer Signed-off-by: kolaente <k@knt.li> * Update models/scheduled_pull_request_merge.go Co-authored-by: 赵智超 <1012112796@qq.com> * Update web_src/js/index.js Co-authored-by: 赵智超 <1012112796@qq.com> * Update web_src/js/index.js Co-authored-by: 赵智超 <1012112796@qq.com> * Re-add migration after merge * Fix frontend lint * Fix version compare * Add vendored dependencies * Add basic tets * Make sure the api route is capable of scheduling PRs for merging * Fix comparing version * make vendor * adopt refactor * apply suggestion: User -> Doer * init var once * Fix Test * Update templates/repo/issue/view_content/comments.tmpl * adopt * nits * next * code format * lint * use same name schema; rm CreateUnScheduledPRToAutoMergeComment * API: can not create schedule twice * Add TestGetBranchNamesForSha * nits * new go routine for each pull to merge * Update models/pull.go Co-authored-by: a1012112796 <1012112796@qq.com> * Update models/scheduled_pull_request_merge.go Co-authored-by: a1012112796 <1012112796@qq.com> * fix & add renaming sugestions * Update services/automerge/pull_auto_merge.go Co-authored-by: a1012112796 <1012112796@qq.com> * fix conflict relicts * apply latest refactors * fix: migration after merge * Update models/error.go Co-authored-by: delvh <dev.lh@web.de> * Update options/locale/locale_en-US.ini Co-authored-by: delvh <dev.lh@web.de> * Update options/locale/locale_en-US.ini Co-authored-by: delvh <dev.lh@web.de> * adapt latest refactors * fix test * use more context * skip potential edgecases * document func usage * GetBranchNamesForSha() -> GetRefsBySha() * start refactoring * ajust to new changes * nit * docu nit * the great check move * move checks for branchprotection into own package * resolve todo now ... * move & rename * unexport if posible * fix * check if merge is allowed before merge on scheduled pull * debugg * wording * improve SetDefaults & nits * NotAllowedToMerge -> DisallowedToMerge * fix test * merge files * use package "errors" * merge files * add string names * other implementation for gogit * adapt refactor * more context for models/pull.go * GetUserRepoPermission use context * more ctx * use context for loading pull head/base-repo * more ctx * more ctx * models.LoadIssueCtx() * models.LoadIssueCtx() * Handle pull_service.Merge in one DB transaction * add TODOs * next * next * next * more ctx * more ctx * Start refactoring structure of old pull code ... * move code into new packages * shorter names ... and finish **restructure** * Update models/branches.go Co-authored-by: zeripath <art27@cantab.net> * finish UpdateProtectBranch * more and fix * update datum * template: use "svg" helper * rename prQueue 2 prPatchCheckerQueue * handle automerge in queue * lock pull on git&db actions ... * lock pull on git&db actions ... * add TODO notes * the regex * transaction in tests * GetRepositoryByIDCtx * shorter table name and lint fix * close transaction bevore notify * Update models/pull.go * next * CheckPullMergable check all branch protections! * Update routers/web/repo/pull.go * CheckPullMergable check all branch protections! * Revert "PullService lock via pullID (#19520)" (for now...) This reverts commit 6cde7c9159a5ea75a10356feb7b8c7ad4c434a9a. * Update services/pull/check.go * Use for a repo action one database transaction * Apply suggestions from code review * Apply suggestions from code review Co-authored-by: delvh <dev.lh@web.de> * Update services/issue/status.go Co-authored-by: delvh <dev.lh@web.de> * Update services/issue/status.go Co-authored-by: delvh <dev.lh@web.de> * use db.WithTx() * gofmt * make pr.GetDefaultMergeMessage() context aware * make MergePullRequestForm.SetDefaults context aware * use db.WithTx() * pull.SetMerged only with context * fix deadlock in `test-sqlite\#TestAPIBranchProtection` * dont forget templates * db.WithTx allow to set the parentCtx * handle db transaction in service packages but not router * issue_service.ChangeStatus just had caused another deadlock :/ it has to do something with how notification package is handled * if we merge a pull in one database transaktion, we get a lock, because merge infoce internal api that cant handle open db sessions to the same repo * ajust to current master * Apply suggestions from code review Co-authored-by: delvh <dev.lh@web.de> * dont open db transaction in router * make generate-swagger * one _success less * wording nit * rm * adapt * remove not needed test files * rm less diff & use attr in JS * ... * Update services/repository/files/commit.go Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * ajust db schema for PullAutoMerge * skip broken pull refs * more context in error messages * remove webUI part for another pull * remove more WebUI only parts * API: add CancleAutoMergePR * Apply suggestions from code review Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * fix lint * Apply suggestions from code review * cancle -> cancel Co-authored-by: delvh <dev.lh@web.de> * change queue identifyer * fix swagger * prevent nil issue * fix and dont drop error * as per @zeripath * Update integrations/git_test.go Co-authored-by: delvh <dev.lh@web.de> * Update integrations/git_test.go Co-authored-by: delvh <dev.lh@web.de> * more declarative integration tests (dedup code) * use assert.False/True helper Co-authored-by: 赵智超 <1012112796@qq.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
		
			
				
	
	
		
			132 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			132 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // 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.
 | |
| package integrations
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 	"net/http"
 | |
| 	"net/url"
 | |
| 	"path"
 | |
| 	"strings"
 | |
| 	"testing"
 | |
| 
 | |
| 	api "code.gitea.io/gitea/modules/structs"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func TestPullCreate_CommitStatus(t *testing.T) {
 | |
| 	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",
 | |
| 			},
 | |
| 		)
 | |
| 		session.MakeRequest(t, req, http.StatusSeeOther)
 | |
| 
 | |
| 		req = NewRequest(t, "GET", "/user1/repo1/pulls")
 | |
| 		resp := session.MakeRequest(t, req, http.StatusOK)
 | |
| 		NewHTMLParser(t, resp.Body)
 | |
| 
 | |
| 		// Request repository commits page
 | |
| 		req = NewRequest(t, "GET", "/user1/repo1/pulls/1/commits")
 | |
| 		resp = session.MakeRequest(t, req, http.StatusOK)
 | |
| 		doc := NewHTMLParser(t, resp.Body)
 | |
| 
 | |
| 		// Get first commit URL
 | |
| 		commitURL, exists := doc.doc.Find("#commits-table tbody tr td.sha a").Last().Attr("href")
 | |
| 		assert.True(t, exists)
 | |
| 		assert.NotEmpty(t, commitURL)
 | |
| 
 | |
| 		commitID := path.Base(commitURL)
 | |
| 
 | |
| 		statusList := []api.CommitStatusState{
 | |
| 			api.CommitStatusPending,
 | |
| 			api.CommitStatusError,
 | |
| 			api.CommitStatusFailure,
 | |
| 			api.CommitStatusWarning,
 | |
| 			api.CommitStatusSuccess,
 | |
| 		}
 | |
| 
 | |
| 		statesIcons := map[api.CommitStatusState]string{
 | |
| 			api.CommitStatusPending: "circle icon yellow",
 | |
| 			api.CommitStatusSuccess: "check icon green",
 | |
| 			api.CommitStatusError:   "warning icon red",
 | |
| 			api.CommitStatusFailure: "remove icon red",
 | |
| 			api.CommitStatusWarning: "warning sign icon yellow",
 | |
| 		}
 | |
| 
 | |
| 		testCtx := NewAPITestContext(t, "user1", "repo1")
 | |
| 
 | |
| 		// Update commit status, and check if icon is updated as well
 | |
| 		for _, status := range statusList {
 | |
| 
 | |
| 			// Call API to add status for commit
 | |
| 			t.Run("CreateStatus", doAPICreateCommitStatus(testCtx, commitID, status))
 | |
| 
 | |
| 			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))
 | |
| 
 | |
| 			cls, ok := doc.doc.Find("#commits-table tbody tr td.message i.commit-status").Last().Attr("class")
 | |
| 			assert.True(t, ok)
 | |
| 			assert.EqualValues(t, "commit-status "+statesIcons[status], cls)
 | |
| 		}
 | |
| 	})
 | |
| }
 | |
| 
 | |
| 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)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestPullCreate_EmptyChangesWithCommits(t *testing.T) {
 | |
| 	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",
 | |
| 			},
 | |
| 		)
 | |
| 		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 equal with the target branch.")
 | |
| 	})
 | |
| }
 |