| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065 |
- // Copyright 2017 The Gitea Authors. All rights reserved.
- // SPDX-License-Identifier: MIT
-
- package integration
-
- import (
- "bytes"
- "fmt"
- "net/http"
- "net/http/httptest"
- "net/url"
- "os"
- "path"
- "path/filepath"
- "strconv"
- "strings"
- "testing"
- "time"
-
- auth_model "code.gitea.io/gitea/models/auth"
- git_model "code.gitea.io/gitea/models/git"
- issues_model "code.gitea.io/gitea/models/issues"
- pull_model "code.gitea.io/gitea/models/pull"
- repo_model "code.gitea.io/gitea/models/repo"
- "code.gitea.io/gitea/models/unittest"
- user_model "code.gitea.io/gitea/models/user"
- "code.gitea.io/gitea/models/webhook"
- "code.gitea.io/gitea/modules/commitstatus"
- "code.gitea.io/gitea/modules/git"
- "code.gitea.io/gitea/modules/git/gitcmd"
- "code.gitea.io/gitea/modules/gitrepo"
- "code.gitea.io/gitea/modules/queue"
- "code.gitea.io/gitea/modules/setting"
- api "code.gitea.io/gitea/modules/structs"
- "code.gitea.io/gitea/modules/test"
- "code.gitea.io/gitea/modules/translation"
- "code.gitea.io/gitea/services/automerge"
- "code.gitea.io/gitea/services/automergequeue"
- pull_service "code.gitea.io/gitea/services/pull"
- repo_service "code.gitea.io/gitea/services/repository"
- commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus"
- files_service "code.gitea.io/gitea/services/repository/files"
-
- "github.com/stretchr/testify/assert"
- )
-
- func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum string, mergeStyle repo_model.MergeStyle, deleteBranch bool) *httptest.ResponseRecorder {
- req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum))
- resp := session.MakeRequest(t, req, http.StatusOK)
-
- htmlDoc := NewHTMLParser(t, resp.Body)
- link := path.Join(user, repo, "pulls", pullnum, "merge")
-
- options := map[string]string{
- "_csrf": htmlDoc.GetCSRF(),
- "do": string(mergeStyle),
- }
-
- if deleteBranch {
- options["delete_branch_after_merge"] = "on"
- }
-
- req = NewRequestWithValues(t, "POST", link, options)
- resp = session.MakeRequest(t, req, http.StatusOK)
-
- respJSON := struct {
- Redirect string
- }{}
- DecodeJSON(t, resp, &respJSON)
-
- assert.Equal(t, fmt.Sprintf("/%s/%s/pulls/%s", user, repo, pullnum), respJSON.Redirect)
-
- return resp
- }
-
- func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum string) *httptest.ResponseRecorder {
- req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum))
- resp := session.MakeRequest(t, req, http.StatusOK)
-
- // Click the little button to create a pull
- htmlDoc := NewHTMLParser(t, resp.Body)
- link, exists := htmlDoc.doc.Find(".timeline-item .delete-button").Attr("data-url")
- assert.True(t, exists, "The template has changed, can not find delete button url")
- req = NewRequestWithValues(t, "POST", link, map[string]string{
- "_csrf": htmlDoc.GetCSRF(),
- })
- resp = session.MakeRequest(t, req, http.StatusOK)
-
- return resp
- }
-
- func TestPullMerge(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- hookTasks, err := webhook.HookTasks(t.Context(), 1, 1) // Retrieve previous hook number
- assert.NoError(t, err)
- hookTasksLenBefore := len(hookTasks)
-
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
-
- resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
-
- elem := strings.Split(test.RedirectURL(resp), "/")
- assert.Equal(t, "pulls", elem[3])
- testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
-
- hookTasks, err = webhook.HookTasks(t.Context(), 1, 1)
- assert.NoError(t, err)
- assert.Len(t, hookTasks, hookTasksLenBefore+1)
- })
- }
-
- func TestPullRebase(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- hookTasks, err := webhook.HookTasks(t.Context(), 1, 1) // Retrieve previous hook number
- assert.NoError(t, err)
- hookTasksLenBefore := len(hookTasks)
-
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
-
- resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
-
- elem := strings.Split(test.RedirectURL(resp), "/")
- assert.Equal(t, "pulls", elem[3])
- testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleRebase, false)
-
- hookTasks, err = webhook.HookTasks(t.Context(), 1, 1)
- assert.NoError(t, err)
- assert.Len(t, hookTasks, hookTasksLenBefore+1)
- })
- }
-
- func TestPullRebaseMerge(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- hookTasks, err := webhook.HookTasks(t.Context(), 1, 1) // Retrieve previous hook number
- assert.NoError(t, err)
- hookTasksLenBefore := len(hookTasks)
-
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
-
- resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
-
- elem := strings.Split(test.RedirectURL(resp), "/")
- assert.Equal(t, "pulls", elem[3])
- testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleRebaseMerge, false)
-
- hookTasks, err = webhook.HookTasks(t.Context(), 1, 1)
- assert.NoError(t, err)
- assert.Len(t, hookTasks, hookTasksLenBefore+1)
- })
- }
-
- func TestPullSquash(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- hookTasks, err := webhook.HookTasks(t.Context(), 1, 1) // Retrieve previous hook number
- assert.NoError(t, err)
- hookTasksLenBefore := len(hookTasks)
-
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
- testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited!)\n")
-
- resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
-
- elem := strings.Split(test.RedirectURL(resp), "/")
- assert.Equal(t, "pulls", elem[3])
- testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleSquash, false)
-
- hookTasks, err = webhook.HookTasks(t.Context(), 1, 1)
- assert.NoError(t, err)
- assert.Len(t, hookTasks, hookTasksLenBefore+1)
- })
- }
-
- func TestPullCleanUpAfterMerge(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md", "Hello, World (Edited - TestPullCleanUpAfterMerge)\n")
-
- resp := testPullCreate(t, session, "user1", "repo1", false, "master", "feature/test", "This is a pull title")
-
- elem := strings.Split(test.RedirectURL(resp), "/")
- assert.Equal(t, "pulls", elem[3])
- testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
-
- // Check PR branch deletion
- resp = testPullCleanUp(t, session, elem[1], elem[2], elem[4])
- respJSON := struct {
- Redirect string
- }{}
- DecodeJSON(t, resp, &respJSON)
-
- assert.NotEmpty(t, respJSON.Redirect, "Redirected URL is not found")
-
- elem = strings.Split(respJSON.Redirect, "/")
- assert.Equal(t, "pulls", elem[3])
-
- // Check branch deletion result
- req := NewRequest(t, "GET", respJSON.Redirect)
- resp = session.MakeRequest(t, req, http.StatusOK)
-
- htmlDoc := NewHTMLParser(t, resp.Body)
- resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
-
- assert.Equal(t, "Branch \"user1/repo1:feature/test\" has been deleted.", resultMsg)
- })
- }
-
- func TestCantMergeWorkInProgress(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
-
- resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "[wip] This is a pull title")
-
- req := NewRequest(t, "GET", test.RedirectURL(resp))
- resp = session.MakeRequest(t, req, http.StatusOK)
- htmlDoc := NewHTMLParser(t, resp.Body)
- text := strings.TrimSpace(htmlDoc.doc.Find(".merge-section > .item").Last().Text())
- assert.NotEmpty(t, text, "Can't find WIP text")
-
- assert.Contains(t, text, translation.NewLocale("en-US").TrString("repo.pulls.cannot_merge_work_in_progress"), "Unable to find WIP text")
- assert.Contains(t, text, "[wip]", "Unable to find WIP text")
- })
- }
-
- func TestCantMergeConflict(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")
- testEditFileToNewBranch(t, session, "user1", "repo1", "master", "base", "README.md", "Hello, World (Edited Twice)\n")
-
- // Use API to create a conflicting pr
- token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
- req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{
- Head: "conflict",
- Base: "base",
- Title: "create a conflicting pr",
- }).AddTokenAuth(token)
- session.MakeRequest(t, req, http.StatusCreated)
-
- // Now this PR will be marked conflict - or at least a race will do - so drop down to pure code at this point...
- user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{
- Name: "user1",
- })
- repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
- OwnerID: user1.ID,
- Name: "repo1",
- })
-
- pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
- HeadRepoID: repo1.ID,
- BaseRepoID: repo1.ID,
- HeadBranch: "conflict",
- BaseBranch: "base",
- })
-
- gitRepo, err := gitrepo.OpenRepository(t.Context(), repo1)
- assert.NoError(t, err)
-
- err = pull_service.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "CONFLICT", false)
- assert.Error(t, err, "Merge should return an error due to conflict")
- assert.True(t, pull_service.IsErrMergeConflicts(err), "Merge error is not a conflict error")
-
- err = pull_service.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleRebase, "", "CONFLICT", false)
- assert.Error(t, err, "Merge should return an error due to conflict")
- assert.True(t, pull_service.IsErrRebaseConflicts(err), "Merge error is not a conflict error")
- gitRepo.Close()
- })
- }
-
- func TestCantMergeUnrelated(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFileToNewBranch(t, session, "user1", "repo1", "master", "base", "README.md", "Hello, World (Edited Twice)\n")
-
- // Now we want to create a commit on a branch that is totally unrelated to our current head
- // Drop down to pure code at this point
- user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{
- Name: "user1",
- })
- repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
- OwnerID: user1.ID,
- Name: "repo1",
- })
- path := repo_model.RepoPath(user1.Name, repo1.Name)
-
- err := gitcmd.NewCommand("read-tree", "--empty").Run(t.Context(), &gitcmd.RunOpts{Dir: path})
- assert.NoError(t, err)
-
- stdin := strings.NewReader("Unrelated File")
- var stdout strings.Builder
- err = gitcmd.NewCommand("hash-object", "-w", "--stdin").Run(t.Context(), &gitcmd.RunOpts{
- Dir: path,
- Stdin: stdin,
- Stdout: &stdout,
- })
-
- assert.NoError(t, err)
- sha := strings.TrimSpace(stdout.String())
-
- _, _, err = gitcmd.NewCommand("update-index", "--add", "--replace", "--cacheinfo").AddDynamicArguments("100644", sha, "somewher-over-the-rainbow").RunStdString(t.Context(), &gitcmd.RunOpts{Dir: path})
- assert.NoError(t, err)
-
- treeSha, _, err := gitcmd.NewCommand("write-tree").RunStdString(t.Context(), &gitcmd.RunOpts{Dir: path})
- assert.NoError(t, err)
- treeSha = strings.TrimSpace(treeSha)
-
- commitTimeStr := time.Now().Format(time.RFC3339)
- doerSig := user1.NewGitSig()
- env := append(os.Environ(),
- "GIT_AUTHOR_NAME="+doerSig.Name,
- "GIT_AUTHOR_EMAIL="+doerSig.Email,
- "GIT_AUTHOR_DATE="+commitTimeStr,
- "GIT_COMMITTER_NAME="+doerSig.Name,
- "GIT_COMMITTER_EMAIL="+doerSig.Email,
- "GIT_COMMITTER_DATE="+commitTimeStr,
- )
-
- messageBytes := new(bytes.Buffer)
- _, _ = messageBytes.WriteString("Unrelated")
- _, _ = messageBytes.WriteString("\n")
-
- stdout.Reset()
- err = gitcmd.NewCommand("commit-tree").AddDynamicArguments(treeSha).
- Run(t.Context(), &gitcmd.RunOpts{
- Env: env,
- Dir: path,
- Stdin: messageBytes,
- Stdout: &stdout,
- })
- assert.NoError(t, err)
- commitSha := strings.TrimSpace(stdout.String())
-
- _, _, err = gitcmd.NewCommand("branch", "unrelated").AddDynamicArguments(commitSha).RunStdString(t.Context(), &gitcmd.RunOpts{Dir: path})
- assert.NoError(t, err)
-
- testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")
-
- // Use API to create a conflicting pr
- token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
- req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{
- Head: "unrelated",
- Base: "base",
- Title: "create an unrelated pr",
- }).AddTokenAuth(token)
- session.MakeRequest(t, req, http.StatusCreated)
-
- // Now this PR could be marked conflict - or at least a race may occur - so drop down to pure code at this point...
- gitRepo, err := gitrepo.OpenRepository(t.Context(), repo1)
- assert.NoError(t, err)
- pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
- HeadRepoID: repo1.ID,
- BaseRepoID: repo1.ID,
- HeadBranch: "unrelated",
- BaseBranch: "base",
- })
-
- err = pull_service.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "UNRELATED", false)
- assert.Error(t, err, "Merge should return an error due to unrelated")
- assert.True(t, pull_service.IsErrMergeUnrelatedHistories(err), "Merge error is not a unrelated histories error")
- gitRepo.Close()
- })
- }
-
- func TestFastForwardOnlyMerge(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFileToNewBranch(t, session, "user1", "repo1", "master", "update", "README.md", "Hello, World 2\n")
-
- // Use API to create a pr from update to master
- token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
- req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{
- Head: "update",
- Base: "master",
- Title: "create a pr that can be fast-forward-only merged",
- }).AddTokenAuth(token)
- session.MakeRequest(t, req, http.StatusCreated)
-
- user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{
- Name: "user1",
- })
- repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
- OwnerID: user1.ID,
- Name: "repo1",
- })
-
- pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
- HeadRepoID: repo1.ID,
- BaseRepoID: repo1.ID,
- HeadBranch: "update",
- BaseBranch: "master",
- })
-
- gitRepo, err := git.OpenRepository(t.Context(), repo_model.RepoPath(user1.Name, repo1.Name))
- assert.NoError(t, err)
-
- err = pull_service.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleFastForwardOnly, "", "FAST-FORWARD-ONLY", false)
-
- assert.NoError(t, err)
-
- gitRepo.Close()
- })
- }
-
- func TestCantFastForwardOnlyMergeDiverging(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFileToNewBranch(t, session, "user1", "repo1", "master", "diverging", "README.md", "Hello, World diverged\n")
- testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World 2\n")
-
- // Use API to create a pr from diverging to update
- token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
- req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{
- Head: "diverging",
- Base: "master",
- Title: "create a pr from a diverging branch",
- }).AddTokenAuth(token)
- session.MakeRequest(t, req, http.StatusCreated)
-
- user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{
- Name: "user1",
- })
- repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
- OwnerID: user1.ID,
- Name: "repo1",
- })
-
- pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
- HeadRepoID: repo1.ID,
- BaseRepoID: repo1.ID,
- HeadBranch: "diverging",
- BaseBranch: "master",
- })
-
- gitRepo, err := git.OpenRepository(t.Context(), repo_model.RepoPath(user1.Name, repo1.Name))
- assert.NoError(t, err)
-
- err = pull_service.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleFastForwardOnly, "", "DIVERGING", false)
-
- assert.Error(t, err, "Merge should return an error due to being for a diverging branch")
- assert.True(t, pull_service.IsErrMergeDivergingFastForwardOnly(err), "Merge error is not a diverging fast-forward-only error")
-
- gitRepo.Close()
- })
- }
-
- func TestConflictChecking(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-
- // Create new clean repo to test conflict checking.
- baseRepo, err := repo_service.CreateRepository(t.Context(), user, user, repo_service.CreateRepoOptions{
- Name: "conflict-checking",
- Description: "Tempo repo",
- AutoInit: true,
- Readme: "Default",
- DefaultBranch: "main",
- })
- assert.NoError(t, err)
- assert.NotEmpty(t, baseRepo)
-
- // create a commit on new branch.
- _, err = files_service.ChangeRepoFiles(t.Context(), baseRepo, user, &files_service.ChangeRepoFilesOptions{
- Files: []*files_service.ChangeRepoFile{
- {
- Operation: "create",
- TreePath: "important_file",
- ContentReader: strings.NewReader("Just a non-important file"),
- },
- },
- Message: "Add a important file",
- OldBranch: "main",
- NewBranch: "important-secrets",
- })
- assert.NoError(t, err)
-
- // create a commit on main branch.
- _, err = files_service.ChangeRepoFiles(t.Context(), baseRepo, user, &files_service.ChangeRepoFilesOptions{
- Files: []*files_service.ChangeRepoFile{
- {
- Operation: "create",
- TreePath: "important_file",
- ContentReader: strings.NewReader("Not the same content :P"),
- },
- },
- Message: "Add a important file",
- OldBranch: "main",
- NewBranch: "main",
- })
- assert.NoError(t, err)
-
- // create Pull to merge the important-secrets branch into main branch.
- pullIssue := &issues_model.Issue{
- RepoID: baseRepo.ID,
- Title: "PR with conflict!",
- PosterID: user.ID,
- Poster: user,
- IsPull: true,
- }
-
- pullRequest := &issues_model.PullRequest{
- HeadRepoID: baseRepo.ID,
- BaseRepoID: baseRepo.ID,
- HeadBranch: "important-secrets",
- BaseBranch: "main",
- HeadRepo: baseRepo,
- BaseRepo: baseRepo,
- Type: issues_model.PullRequestGitea,
- }
- prOpts := &pull_service.NewPullRequestOptions{Repo: baseRepo, Issue: pullIssue, PullRequest: pullRequest}
- err = pull_service.NewPullRequest(t.Context(), prOpts)
- assert.NoError(t, err)
-
- issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: "PR with conflict!"})
- assert.NoError(t, issue.LoadPullRequest(t.Context()))
- conflictingPR := issue.PullRequest
-
- // Ensure conflictedFiles is populated.
- assert.Len(t, conflictingPR.ConflictedFiles, 1)
- // Check if status is correct.
- assert.Equal(t, issues_model.PullRequestStatusConflict, conflictingPR.Status)
- // Ensure that mergeable returns false
- assert.False(t, conflictingPR.Mergeable(t.Context()))
- })
- }
-
- func TestPullRetargetChildOnBranchDelete(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- session := loginUser(t, "user1")
- testEditFileToNewBranch(t, session, "user2", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - TestPullRetargetOnCleanup - base PR)\n")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFileToNewBranch(t, session, "user1", "repo1", "base-pr", "child-pr", "README.md", "Hello, World\n(Edited - TestPullRetargetOnCleanup - base PR)\n(Edited - TestPullRetargetOnCleanup - child PR)")
-
- respBasePR := testPullCreate(t, session, "user2", "repo1", true, "master", "base-pr", "Base Pull Request")
- elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
- assert.Equal(t, "pulls", elemBasePR[3])
-
- respChildPR := testPullCreate(t, session, "user1", "repo1", false, "base-pr", "child-pr", "Child Pull Request")
- elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
- assert.Equal(t, "pulls", elemChildPR[3])
-
- testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
-
- repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"})
- branchBasePR := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo1.ID, Name: "base-pr"})
- assert.True(t, branchBasePR.IsDeleted)
-
- // Check child PR
- req := NewRequest(t, "GET", test.RedirectURL(respChildPR))
- resp := session.MakeRequest(t, req, http.StatusOK)
-
- htmlDoc := NewHTMLParser(t, resp.Body)
- targetBranch := htmlDoc.doc.Find("#branch_target>a").Text()
- prStatus := strings.TrimSpace(htmlDoc.doc.Find(".issue-title-meta>.issue-state-label").Text())
-
- assert.Equal(t, "master", targetBranch)
- assert.Equal(t, "Open", prStatus)
- })
- }
-
- func TestPullDontRetargetChildOnWrongRepo(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFileToNewBranch(t, session, "user1", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - TestPullDontRetargetChildOnWrongRepo - base PR)\n")
- testEditFileToNewBranch(t, session, "user1", "repo1", "base-pr", "child-pr", "README.md", "Hello, World\n(Edited - TestPullDontRetargetChildOnWrongRepo - base PR)\n(Edited - TestPullDontRetargetChildOnWrongRepo - child PR)")
-
- respBasePR := testPullCreate(t, session, "user1", "repo1", false, "master", "base-pr", "Base Pull Request")
- elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
- assert.Equal(t, "pulls", elemBasePR[3])
-
- respChildPR := testPullCreate(t, session, "user1", "repo1", true, "base-pr", "child-pr", "Child Pull Request")
- elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
- assert.Equal(t, "pulls", elemChildPR[3])
-
- defer test.MockVariableValue(&setting.Repository.PullRequest.RetargetChildrenOnMerge, false)()
-
- testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
-
- repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
- branchBasePR := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo1.ID, Name: "base-pr"})
- assert.True(t, branchBasePR.IsDeleted)
-
- // Check child PR
- req := NewRequest(t, "GET", test.RedirectURL(respChildPR))
- resp := session.MakeRequest(t, req, http.StatusOK)
-
- htmlDoc := NewHTMLParser(t, resp.Body)
- // the branch has been deleted, so there is no a html tag instead of span
- targetBranch := htmlDoc.doc.Find("#branch_target>span").Text()
- prStatus := strings.TrimSpace(htmlDoc.doc.Find(".issue-title-meta>.issue-state-label").Text())
-
- assert.Equal(t, "base-pr", targetBranch)
- assert.Equal(t, "Closed", prStatus)
- })
- }
-
- func TestPullRequestMergedWithNoPermissionDeleteBranch(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- session := loginUser(t, "user4")
- testRepoFork(t, session, "user2", "repo1", "user4", "repo1", "")
- testEditFileToNewBranch(t, session, "user4", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - TestPullDontRetargetChildOnWrongRepo - base PR)\n")
-
- respBasePR := testPullCreate(t, session, "user4", "repo1", false, "master", "base-pr", "Base Pull Request")
- elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
- assert.Equal(t, "pulls", elemBasePR[3])
-
- // user2 has no permission to delete branch of repo user1/repo1
- session2 := loginUser(t, "user2")
- testPullMerge(t, session2, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
-
- repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user4", Name: "repo1"})
- branchBasePR := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo1.ID, Name: "base-pr"})
- // branch has not been deleted
- assert.False(t, branchBasePR.IsDeleted)
- })
- }
-
- func TestPullMergeIndexerNotifier(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- // create a pull request
- session := loginUser(t, "user1")
- testRepoFork(t, session, "user2", "repo1", "user1", "repo1", "")
- testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
- createPullResp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "Indexer notifier test pull")
-
- assert.NoError(t, queue.GetManager().FlushAll(t.Context(), 0))
- time.Sleep(time.Second)
-
- repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
- OwnerName: "user2",
- Name: "repo1",
- })
- issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{
- RepoID: repo1.ID,
- Title: "Indexer notifier test pull",
- IsPull: true,
- IsClosed: false,
- })
-
- // build the request for searching issues
- link, _ := url.Parse("/api/v1/repos/issues/search")
- query := url.Values{}
- query.Add("state", "closed")
- query.Add("type", "pulls")
- query.Add("q", "notifier")
- link.RawQuery = query.Encode()
-
- // search issues
- searchIssuesResp := session.MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
- var apiIssuesBefore []*api.Issue
- DecodeJSON(t, searchIssuesResp, &apiIssuesBefore)
- assert.Empty(t, apiIssuesBefore)
-
- // merge the pull request
- elem := strings.Split(test.RedirectURL(createPullResp), "/")
- assert.Equal(t, "pulls", elem[3])
- testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
-
- // check if the issue is closed
- issue = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{
- ID: issue.ID,
- })
- assert.True(t, issue.IsClosed)
-
- assert.NoError(t, queue.GetManager().FlushAll(t.Context(), 0))
- time.Sleep(time.Second)
-
- // search issues again
- searchIssuesResp = session.MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
- var apiIssuesAfter []*api.Issue
- DecodeJSON(t, searchIssuesResp, &apiIssuesAfter)
- if assert.Len(t, apiIssuesAfter, 1) {
- assert.Equal(t, issue.ID, apiIssuesAfter[0].ID)
- }
- })
- }
-
- func testResetRepo(t *testing.T, repoPath, branch, commitID string) {
- f, err := os.OpenFile(filepath.Join(repoPath, "refs", "heads", branch), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o644)
- assert.NoError(t, err)
- _, err = f.WriteString(commitID + "\n")
- assert.NoError(t, err)
- f.Close()
-
- repo, err := git.OpenRepository(t.Context(), repoPath)
- assert.NoError(t, err)
- defer repo.Close()
- id, err := repo.GetBranchCommitID(branch)
- assert.NoError(t, err)
- assert.Equal(t, commitID, id)
- }
-
- func TestPullAutoMergeAfterCommitStatusSucceed(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- // create a pull request
- session := loginUser(t, "user1")
- user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
- forkedName := "repo1-1"
- testRepoFork(t, session, "user2", "repo1", "user1", forkedName, "")
- defer func() {
- testDeleteRepository(t, session, "user1", forkedName)
- }()
- testEditFile(t, session, "user1", forkedName, "master", "README.md", "Hello, World (Edited)\n")
- testPullCreate(t, session, "user1", forkedName, false, "master", "master", "Indexer notifier test pull")
-
- baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"})
- forkedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: forkedName})
- pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
- BaseRepoID: baseRepo.ID,
- BaseBranch: "master",
- HeadRepoID: forkedRepo.ID,
- HeadBranch: "master",
- })
-
- // add protected branch for commit status
- csrf := GetUserCSRFToken(t, session)
- // Change the "master" branch to "protected"
- req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/edit", map[string]string{
- "_csrf": csrf,
- "rule_name": "master",
- "enable_push": "true",
- "enable_status_check": "true",
- "status_check_contexts": "gitea/actions",
- })
- session.MakeRequest(t, req, http.StatusSeeOther)
-
- oldAutoMergeAddToQueue := automergequeue.AddToQueue
- addToQueueShaChan := make(chan string, 1)
- automergequeue.AddToQueue = func(pr *issues_model.PullRequest, sha string) {
- addToQueueShaChan <- sha
- }
- // first time insert automerge record, return true
- scheduled, err := automerge.ScheduleAutoMerge(t.Context(), user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
- assert.NoError(t, err)
- assert.True(t, scheduled)
- // and the pr should be added to automergequeue, in case it is already "mergeable"
- select {
- case <-addToQueueShaChan:
- case <-time.After(time.Second):
- assert.FailNow(t, "Timeout: nothing was added to automergequeue")
- }
- automergequeue.AddToQueue = oldAutoMergeAddToQueue
-
- // second time insert automerge record, return false because it does exist
- scheduled, err = automerge.ScheduleAutoMerge(t.Context(), user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
- assert.Error(t, err)
- assert.False(t, scheduled)
-
- // reload pr again
- pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
- assert.False(t, pr.HasMerged)
- assert.Empty(t, pr.MergedCommitID)
-
- // update commit status to success, then it should be merged automatically
- baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
- assert.NoError(t, err)
- sha, err := baseGitRepo.GetRefCommitID(pr.GetGitHeadRefName())
- assert.NoError(t, err)
- masterCommitID, err := baseGitRepo.GetBranchCommitID("master")
- assert.NoError(t, err)
-
- branches, _, err := baseGitRepo.GetBranchNames(0, 100)
- assert.NoError(t, err)
- assert.ElementsMatch(t, []string{"sub-home-md-img-check", "home-md-img-check", "pr-to-update", "branch2", "DefaultBranch", "develop", "feature/1", "master"}, branches)
- baseGitRepo.Close()
- defer func() {
- testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID)
- }()
-
- err = commitstatus_service.CreateCommitStatus(t.Context(), baseRepo, user1, sha, &git_model.CommitStatus{
- State: commitstatus.CommitStatusSuccess,
- TargetURL: "https://gitea.com",
- Context: "gitea/actions",
- })
- assert.NoError(t, err)
-
- assert.Eventually(t, func() bool {
- pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
- return pr.HasMerged
- }, 2*time.Second, 100*time.Millisecond)
- assert.NotEmpty(t, pr.MergedCommitID)
- unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID})
- })
- }
-
- func TestPullAutoMergeAfterCommitStatusSucceedAndApproval(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
- // create a pull request
- session := loginUser(t, "user1")
- user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
- forkedName := "repo1-2"
- testRepoFork(t, session, "user2", "repo1", "user1", forkedName, "")
- defer func() {
- testDeleteRepository(t, session, "user1", forkedName)
- }()
- testEditFile(t, session, "user1", forkedName, "master", "README.md", "Hello, World (Edited)\n")
- testPullCreate(t, session, "user1", forkedName, false, "master", "master", "Indexer notifier test pull")
-
- baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"})
- forkedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: forkedName})
- pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
- BaseRepoID: baseRepo.ID,
- BaseBranch: "master",
- HeadRepoID: forkedRepo.ID,
- HeadBranch: "master",
- })
-
- // add protected branch for commit status
- csrf := GetUserCSRFToken(t, session)
- // Change master branch to protected
- req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/edit", map[string]string{
- "_csrf": csrf,
- "rule_name": "master",
- "enable_push": "true",
- "enable_status_check": "true",
- "status_check_contexts": "gitea/actions",
- "required_approvals": "1",
- })
- session.MakeRequest(t, req, http.StatusSeeOther)
-
- // first time insert automerge record, return true
- scheduled, err := automerge.ScheduleAutoMerge(t.Context(), user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
- assert.NoError(t, err)
- assert.True(t, scheduled)
-
- // second time insert automerge record, return false because it does exist
- scheduled, err = automerge.ScheduleAutoMerge(t.Context(), user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
- assert.Error(t, err)
- assert.False(t, scheduled)
-
- // reload pr again
- pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
- assert.False(t, pr.HasMerged)
- assert.Empty(t, pr.MergedCommitID)
-
- // update commit status to success, then it should be merged automatically
- baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
- assert.NoError(t, err)
- sha, err := baseGitRepo.GetRefCommitID(pr.GetGitHeadRefName())
- assert.NoError(t, err)
- masterCommitID, err := baseGitRepo.GetBranchCommitID("master")
- assert.NoError(t, err)
- baseGitRepo.Close()
- defer func() {
- testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID)
- }()
-
- err = commitstatus_service.CreateCommitStatus(t.Context(), baseRepo, user1, sha, &git_model.CommitStatus{
- State: commitstatus.CommitStatusSuccess,
- TargetURL: "https://gitea.com",
- Context: "gitea/actions",
- })
- assert.NoError(t, err)
-
- time.Sleep(2 * time.Second)
-
- // reload pr again
- pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
- assert.False(t, pr.HasMerged)
- assert.Empty(t, pr.MergedCommitID)
-
- // approve the PR from non-author
- approveSession := loginUser(t, "user2")
- req = NewRequest(t, "GET", fmt.Sprintf("/user2/repo1/pulls/%d", pr.Index))
- resp := approveSession.MakeRequest(t, req, http.StatusOK)
- htmlDoc := NewHTMLParser(t, resp.Body)
- testSubmitReview(t, approveSession, htmlDoc.GetCSRF(), "user2", "repo1", strconv.Itoa(int(pr.Index)), sha, "approve", http.StatusOK)
-
- time.Sleep(2 * time.Second)
-
- // reload pr again
- pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
- assert.True(t, pr.HasMerged)
- assert.NotEmpty(t, pr.MergedCommitID)
-
- unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID})
- })
- }
-
- func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, u *url.URL) {
- // create a pull request
- baseAPITestContext := NewAPITestContext(t, "user2", "repo1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-
- dstPath := t.TempDir()
-
- u.Path = baseAPITestContext.GitPath()
- u.User = url.UserPassword("user2", userPassword)
-
- t.Run("Clone", doGitClone(dstPath, u))
-
- err := os.WriteFile(path.Join(dstPath, "test_file"), []byte("## test content"), 0o666)
- assert.NoError(t, err)
-
- err = git.AddChanges(t.Context(), dstPath, true)
- assert.NoError(t, err)
-
- err = git.CommitChanges(t.Context(), dstPath, git.CommitChangesOptions{
- Committer: &git.Signature{
- Email: "user2@example.com",
- Name: "user2",
- When: time.Now(),
- },
- Author: &git.Signature{
- Email: "user2@example.com",
- Name: "user2",
- When: time.Now(),
- },
- Message: "Testing commit 1",
- })
- assert.NoError(t, err)
-
- stderrBuf := &bytes.Buffer{}
-
- err = gitcmd.NewCommand("push", "origin", "HEAD:refs/for/master", "-o").
- AddDynamicArguments(`topic=test/head2`).
- AddArguments("-o").
- AddDynamicArguments(`title="create a test pull request with agit"`).
- AddArguments("-o").
- AddDynamicArguments(`description="This PR is a test pull request which created with agit"`).
- Run(t.Context(), &gitcmd.RunOpts{Dir: dstPath, Stderr: stderrBuf})
- assert.NoError(t, err)
-
- assert.Contains(t, stderrBuf.String(), setting.AppURL+"user2/repo1/pulls/6")
-
- baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"})
- pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
- Flow: issues_model.PullRequestFlowAGit,
- BaseRepoID: baseRepo.ID,
- BaseBranch: "master",
- HeadRepoID: baseRepo.ID,
- HeadBranch: "user2/test/head2",
- })
-
- session := loginUser(t, "user1")
- // add protected branch for commit status
- csrf := GetUserCSRFToken(t, session)
- // Change master branch to protected
- req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/edit", map[string]string{
- "_csrf": csrf,
- "rule_name": "master",
- "enable_push": "true",
- "enable_status_check": "true",
- "status_check_contexts": "gitea/actions",
- "required_approvals": "1",
- })
- session.MakeRequest(t, req, http.StatusSeeOther)
-
- user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
- // first time insert automerge record, return true
- scheduled, err := automerge.ScheduleAutoMerge(t.Context(), user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
- assert.NoError(t, err)
- assert.True(t, scheduled)
-
- // second time insert automerge record, return false because it does exist
- scheduled, err = automerge.ScheduleAutoMerge(t.Context(), user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
- assert.Error(t, err)
- assert.False(t, scheduled)
-
- // reload pr again
- pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
- assert.False(t, pr.HasMerged)
- assert.Empty(t, pr.MergedCommitID)
-
- // update commit status to success, then it should be merged automatically
- baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
- assert.NoError(t, err)
- sha, err := baseGitRepo.GetRefCommitID(pr.GetGitHeadRefName())
- assert.NoError(t, err)
- masterCommitID, err := baseGitRepo.GetBranchCommitID("master")
- assert.NoError(t, err)
- baseGitRepo.Close()
- defer func() {
- testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID)
- }()
-
- err = commitstatus_service.CreateCommitStatus(t.Context(), baseRepo, user1, sha, &git_model.CommitStatus{
- State: commitstatus.CommitStatusSuccess,
- TargetURL: "https://gitea.com",
- Context: "gitea/actions",
- })
- assert.NoError(t, err)
-
- // reload pr again
- pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
- assert.False(t, pr.HasMerged)
- assert.Empty(t, pr.MergedCommitID)
-
- // approve the PR from non-author
- approveSession := loginUser(t, "user1")
- req = NewRequest(t, "GET", fmt.Sprintf("/user2/repo1/pulls/%d", pr.Index))
- resp := approveSession.MakeRequest(t, req, http.StatusOK)
- htmlDoc := NewHTMLParser(t, resp.Body)
- testSubmitReview(t, approveSession, htmlDoc.GetCSRF(), "user2", "repo1", strconv.Itoa(int(pr.Index)), sha, "approve", http.StatusOK)
-
- // reload pr again
- pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
- assert.True(t, pr.HasMerged)
- assert.NotEmpty(t, pr.MergedCommitID)
-
- unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID})
- })
- }
-
- func TestPullNonMergeForAdminWithBranchProtection(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, u *url.URL) {
- // create a pull request
- session := loginUser(t, "user1")
- forkedName := "repo1-1"
- testRepoFork(t, session, "user2", "repo1", "user1", forkedName, "")
- defer testDeleteRepository(t, session, "user1", forkedName)
-
- testEditFile(t, session, "user1", forkedName, "master", "README.md", "Hello, World (Edited)\n")
- testPullCreate(t, session, "user1", forkedName, false, "master", "master", "Indexer notifier test pull")
-
- baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"})
- forkedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: forkedName})
- unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
- BaseRepoID: baseRepo.ID,
- BaseBranch: "master",
- HeadRepoID: forkedRepo.ID,
- HeadBranch: "master",
- })
-
- // add protected branch for commit status
- csrf := GetUserCSRFToken(t, session)
- // Change master branch to protected
- pbCreateReq := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/edit", map[string]string{
- "_csrf": csrf,
- "rule_name": "master",
- "enable_push": "true",
- "enable_status_check": "true",
- "status_check_contexts": "gitea/actions",
- "block_admin_merge_override": "true",
- })
- session.MakeRequest(t, pbCreateReq, http.StatusSeeOther)
-
- token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
-
- mergeReq := NewRequestWithValues(t, "POST", "/api/v1/repos/user2/repo1/pulls/6/merge", map[string]string{
- "_csrf": csrf,
- "head_commit_id": "",
- "merge_when_checks_succeed": "false",
- "force_merge": "true",
- "do": "rebase",
- }).AddTokenAuth(token)
-
- session.MakeRequest(t, mergeReq, http.StatusMethodNotAllowed)
- })
- }
|