Fix automerge will not work because of some events haven't been triggered (#30780)

+3 -3

models/issues/review.go

··· 155 155 if r.CodeComments != nil { 156 156 return err 157 157 } 158 - if err = r.loadIssue(ctx); err != nil { 158 + if err = r.LoadIssue(ctx); err != nil { 159 159 return err 160 160 } 161 161 r.CodeComments, err = fetchCodeCommentsByReview(ctx, r.Issue, nil, r, false) 162 162 return err 163 163 } 164 164 165 - func (r *Review) loadIssue(ctx context.Context) (err error) { 165 + func (r *Review) LoadIssue(ctx context.Context) (err error) { 166 166 if r.Issue != nil { 167 167 return err 168 168 } ··· 199 199 200 200 // LoadAttributes loads all attributes except CodeComments 201 201 func (r *Review) LoadAttributes(ctx context.Context) (err error) { 202 - if err = r.loadIssue(ctx); err != nil { 202 + if err = r.LoadIssue(ctx); err != nil { 203 203 return err 204 204 } 205 205 if err = r.LoadCodeComments(ctx); err != nil {

+70 -38

services/automerge/automerge.go

··· 22 22 "code.gitea.io/gitea/modules/log" 23 23 "code.gitea.io/gitea/modules/process" 24 24 "code.gitea.io/gitea/modules/queue" 25 + notify_service "code.gitea.io/gitea/services/notify" 25 26 pull_service "code.gitea.io/gitea/services/pull" 26 27 ) 27 28 ··· 30 31 31 32 // Init runs the task queue to that handles auto merges 32 33 func Init() error { 34 + notify_service.RegisterNotifier(NewNotifier()) 35 + 33 36 prAutoMergeQueue = queue.CreateUniqueQueue(graceful.GetManager().ShutdownContext(), "pr_auto_merge", handler) 34 37 if prAutoMergeQueue == nil { 35 38 return fmt.Errorf("unable to create pr_auto_merge queue") ··· 47 50 log.Error("could not parse data from pr_auto_merge queue (%v): %v", s, err) 48 51 continue 49 52 } 50 - handlePull(id, sha) 53 + handlePullRequestAutoMerge(id, sha) 51 54 } 52 55 return nil 53 56 } ··· 62 65 // ScheduleAutoMerge if schedule is false and no error, pull can be merged directly 63 66 func ScheduleAutoMerge(ctx context.Context, doer *user_model.User, pull *issues_model.PullRequest, style repo_model.MergeStyle, message string) (scheduled bool, err error) { 64 67 err = db.WithTx(ctx, func(ctx context.Context) error { 65 - lastCommitStatus, err := pull_service.GetPullRequestCommitStatusState(ctx, pull) 66 - if err != nil { 67 - return err 68 - } 69 - 70 - // we don't need to schedule 71 - if lastCommitStatus.IsSuccess() { 72 - return nil 73 - } 74 - 75 68 if err := pull_model.ScheduleAutoMerge(ctx, doer, pull.ID, style, message); err != nil { 76 69 return err 77 70 } ··· 95 88 }) 96 89 } 97 90 98 - // MergeScheduledPullRequest merges a previously scheduled pull request when all checks succeeded 99 - func MergeScheduledPullRequest(ctx context.Context, sha string, repo *repo_model.Repository) error { 91 + // StartPRCheckAndAutoMergeBySHA start an automerge check and auto merge task for all pull requests of repository and SHA 92 + func StartPRCheckAndAutoMergeBySHA(ctx context.Context, sha string, repo *repo_model.Repository) error { 100 93 pulls, err := getPullRequestsByHeadSHA(ctx, sha, repo, func(pr *issues_model.PullRequest) bool { 101 94 return !pr.HasMerged && pr.CanAutoMerge() 102 95 }) ··· 111 104 return nil 112 105 } 113 106 107 + // StartPRCheckAndAutoMerge start an automerge check and auto merge task for a pull request 108 + func StartPRCheckAndAutoMerge(ctx context.Context, pull *issues_model.PullRequest) { 109 + if pull == nil || pull.HasMerged || !pull.CanAutoMerge() { 110 + return 111 + } 112 + 113 + if err := pull.LoadBaseRepo(ctx); err != nil { 114 + log.Error("LoadBaseRepo: %v", err) 115 + return 116 + } 117 + 118 + gitRepo, err := gitrepo.OpenRepository(ctx, pull.BaseRepo) 119 + if err != nil { 120 + log.Error("OpenRepository: %v", err) 121 + return 122 + } 123 + defer gitRepo.Close() 124 + commitID, err := gitRepo.GetRefCommitID(pull.GetGitRefName()) 125 + if err != nil { 126 + log.Error("GetRefCommitID: %v", err) 127 + return 128 + } 129 + 130 + addToQueue(pull, commitID) 131 + } 132 + 114 133 func getPullRequestsByHeadSHA(ctx context.Context, sha string, repo *repo_model.Repository, filter func(*issues_model.PullRequest) bool) (map[int64]*issues_model.PullRequest, error) { 115 134 gitRepo, err := gitrepo.OpenRepository(ctx, repo) 116 135 if err != nil { ··· 161 180 return pulls, nil 162 181 } 163 182 164 - func handlePull(pullID int64, sha string) { 183 + // handlePullRequestAutoMerge merge the pull request if all checks are successful 184 + func handlePullRequestAutoMerge(pullID int64, sha string) { 165 185 ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), 166 186 fmt.Sprintf("Handle AutoMerge of PR[%d] with sha[%s]", pullID, sha)) 167 187 defer finished() ··· 182 202 return 183 203 } 184 204 205 + if err = pr.LoadBaseRepo(ctx); err != nil { 206 + log.Error("%-v LoadBaseRepo: %v", pr, err) 207 + return 208 + } 209 + 210 + // check the sha is the same as pull request head commit id 211 + baseGitRepo, err := gitrepo.OpenRepository(ctx, pr.BaseRepo) 212 + if err != nil { 213 + log.Error("OpenRepository: %v", err) 214 + return 215 + } 216 + defer baseGitRepo.Close() 217 + 218 + headCommitID, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) 219 + if err != nil { 220 + log.Error("GetRefCommitID: %v", err) 221 + return 222 + } 223 + if headCommitID != sha { 224 + log.Warn("Head commit id of auto merge %-v does not match sha [%s], it may means the head branch has been updated. Just ignore this request because a new request expected in the queue", pr, sha) 225 + return 226 + } 227 + 185 228 // Get all checks for this pr 186 229 // We get the latest sha commit hash again to handle the case where the check of a previous push 187 230 // did not succeed or was not finished yet. 188 - 189 231 if err = pr.LoadHeadRepo(ctx); err != nil { 190 232 log.Error("%-v LoadHeadRepo: %v", pr, err) 191 233 return 192 234 } 193 235 194 - headGitRepo, err := gitrepo.OpenRepository(ctx, pr.HeadRepo) 195 - if err != nil { 196 - log.Error("OpenRepository %-v: %v", pr.HeadRepo, err) 197 - return 236 + var headGitRepo *git.Repository 237 + if pr.BaseRepoID == pr.HeadRepoID { 238 + headGitRepo = baseGitRepo 239 + } else { 240 + headGitRepo, err = gitrepo.OpenRepository(ctx, pr.HeadRepo) 241 + if err != nil { 242 + log.Error("OpenRepository %-v: %v", pr.HeadRepo, err) 243 + return 244 + } 245 + defer headGitRepo.Close() 198 246 } 199 - defer headGitRepo.Close() 200 247 201 248 headBranchExist := headGitRepo.IsBranchExist(pr.HeadBranch) 202 - 203 249 if pr.HeadRepo == nil || !headBranchExist { 204 250 log.Warn("Head branch of auto merge %-v does not exist [HeadRepoID: %d, Branch: %s]", pr, pr.HeadRepoID, pr.HeadBranch) 205 251 return ··· 238 284 return 239 285 } 240 286 241 - var baseGitRepo *git.Repository 242 - if pr.BaseRepoID == pr.HeadRepoID { 243 - baseGitRepo = headGitRepo 244 - } else { 245 - if err = pr.LoadBaseRepo(ctx); err != nil { 246 - log.Error("%-v LoadBaseRepo: %v", pr, err) 247 - return 248 - } 249 - 250 - baseGitRepo, err = gitrepo.OpenRepository(ctx, pr.BaseRepo) 251 - if err != nil { 252 - log.Error("OpenRepository %-v: %v", pr.BaseRepo, err) 253 - return 254 - } 255 - defer baseGitRepo.Close() 256 - } 257 - 258 287 if err := pull_service.Merge(ctx, pr, doer, baseGitRepo, scheduledPRM.MergeStyle, "", scheduledPRM.Message, true); err != nil { 259 288 log.Error("pull_service.Merge: %v", err) 289 + // FIXME: if merge failed, we should display some error message to the pull request page. 290 + // The resolution is add a new column on automerge table named `error_message` to store the error message and displayed 291 + // on the pull request page. But this should not be finished in a bug fix PR which will be backport to release branch. 260 292 return 261 293 } 262 294 }

+46

services/automerge/notify.go

··· 1 + // Copyright 2024 The Gitea Authors. All rights reserved. 2 + // SPDX-License-Identifier: MIT 3 + 4 + package automerge 5 + 6 + import ( 7 + "context" 8 + 9 + issues_model "code.gitea.io/gitea/models/issues" 10 + user_model "code.gitea.io/gitea/models/user" 11 + "code.gitea.io/gitea/modules/log" 12 + notify_service "code.gitea.io/gitea/services/notify" 13 + ) 14 + 15 + type automergeNotifier struct { 16 + notify_service.NullNotifier 17 + } 18 + 19 + var _ notify_service.Notifier = &automergeNotifier{} 20 + 21 + // NewNotifier create a new automergeNotifier notifier 22 + func NewNotifier() notify_service.Notifier { 23 + return &automergeNotifier{} 24 + } 25 + 26 + func (n *automergeNotifier) PullRequestReview(ctx context.Context, pr *issues_model.PullRequest, review *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) { 27 + // as a missing / blocking reviews could have blocked a pending automerge let's recheck 28 + if review.Type == issues_model.ReviewTypeApprove { 29 + if err := StartPRCheckAndAutoMergeBySHA(ctx, review.CommitID, pr.BaseRepo); err != nil { 30 + log.Error("StartPullRequestAutoMergeCheckBySHA: %v", err) 31 + } 32 + } 33 + } 34 + 35 + func (n *automergeNotifier) PullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) { 36 + if err := review.LoadIssue(ctx); err != nil { 37 + log.Error("LoadIssue: %v", err) 38 + return 39 + } 40 + if err := review.Issue.LoadPullRequest(ctx); err != nil { 41 + log.Error("LoadPullRequest: %v", err) 42 + return 43 + } 44 + // as reviews could have blocked a pending automerge let's recheck 45 + StartPRCheckAndAutoMerge(ctx, review.Issue.PullRequest) 46 + }

+1 -1

services/repository/commitstatus/commitstatus.go

··· 117 117 } 118 118 119 119 if status.State.IsSuccess() { 120 - if err := automerge.MergeScheduledPullRequest(ctx, sha, repo); err != nil { 120 + if err := automerge.StartPRCheckAndAutoMergeBySHA(ctx, sha, repo); err != nil { 121 121 return fmt.Errorf("MergeScheduledPullRequest[repo_id: %d, user_id: %d, sha: %s]: %w", repo.ID, creator.ID, sha, err) 122 122 } 123 123 }

+20 -16

tests/integration/editor_test.go

··· 30 30 func TestCreateFile(t *testing.T) { 31 31 onGiteaRun(t, func(t *testing.T, u *url.URL) { 32 32 session := loginUser(t, "user2") 33 + testCreateFile(t, session, "user2", "repo1", "master", "test.txt", "Content") 34 + }) 35 + } 33 36 34 - // Request editor page 35 - req := NewRequest(t, "GET", "/user2/repo1/_new/master/") 36 - resp := session.MakeRequest(t, req, http.StatusOK) 37 + func testCreateFile(t *testing.T, session *TestSession, user, repo, branch, filePath, content string) *httptest.ResponseRecorder { 38 + // Request editor page 39 + newURL := fmt.Sprintf("/%s/%s/_new/%s/", user, repo, branch) 40 + req := NewRequest(t, "GET", newURL) 41 + resp := session.MakeRequest(t, req, http.StatusOK) 37 42 38 - doc := NewHTMLParser(t, resp.Body) 39 - lastCommit := doc.GetInputValueByName("last_commit") 40 - assert.NotEmpty(t, lastCommit) 43 + doc := NewHTMLParser(t, resp.Body) 44 + lastCommit := doc.GetInputValueByName("last_commit") 45 + assert.NotEmpty(t, lastCommit) 41 46 42 - // Save new file to master branch 43 - req = NewRequestWithValues(t, "POST", "/user2/repo1/_new/master/", map[string]string{ 44 - "_csrf": doc.GetCSRF(), 45 - "last_commit": lastCommit, 46 - "tree_path": "test.txt", 47 - "content": "Content", 48 - "commit_choice": "direct", 49 - "commit_mail_id": "3", 50 - }) 51 - session.MakeRequest(t, req, http.StatusSeeOther) 47 + // Save new file to master branch 48 + req = NewRequestWithValues(t, "POST", newURL, map[string]string{ 49 + "_csrf": doc.GetCSRF(), 50 + "last_commit": lastCommit, 51 + "tree_path": filePath, 52 + "content": content, 53 + "commit_choice": "direct", 54 + "commit_mail_id": "3", 52 55 }) 56 + return session.MakeRequest(t, req, http.StatusSeeOther) 53 57 } 54 58 55 59 func TestCreateFileOnProtectedBranch(t *testing.T) {

+198

tests/integration/pull_merge_test.go

··· 12 12 "net/url" 13 13 "os" 14 14 "path" 15 + "path/filepath" 16 + "strconv" 15 17 "strings" 16 18 "testing" 17 19 "time" ··· 19 21 "code.gitea.io/gitea/models" 20 22 auth_model "code.gitea.io/gitea/models/auth" 21 23 "code.gitea.io/gitea/models/db" 24 + git_model "code.gitea.io/gitea/models/git" 22 25 issues_model "code.gitea.io/gitea/models/issues" 26 + pull_model "code.gitea.io/gitea/models/pull" 23 27 repo_model "code.gitea.io/gitea/models/repo" 24 28 "code.gitea.io/gitea/models/unittest" 25 29 user_model "code.gitea.io/gitea/models/user" ··· 32 36 api "code.gitea.io/gitea/modules/structs" 33 37 "code.gitea.io/gitea/modules/test" 34 38 "code.gitea.io/gitea/modules/translation" 39 + "code.gitea.io/gitea/services/automerge" 35 40 "code.gitea.io/gitea/services/pull" 41 + commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" 36 42 files_service "code.gitea.io/gitea/services/repository/files" 37 43 webhook_service "code.gitea.io/gitea/services/webhook" 38 44 ··· 661 667 } 662 668 }) 663 669 } 670 + 671 + func testResetRepo(t *testing.T, repoPath, branch, commitID string) { 672 + f, err := os.OpenFile(filepath.Join(repoPath, "refs", "heads", branch), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o644) 673 + assert.NoError(t, err) 674 + _, err = f.WriteString(commitID + "\n") 675 + assert.NoError(t, err) 676 + f.Close() 677 + 678 + repo, err := git.OpenRepository(context.Background(), repoPath) 679 + assert.NoError(t, err) 680 + defer repo.Close() 681 + id, err := repo.GetBranchCommitID(branch) 682 + assert.NoError(t, err) 683 + assert.EqualValues(t, commitID, id) 684 + } 685 + 686 + func TestPullAutoMergeAfterCommitStatusSucceed(t *testing.T) { 687 + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { 688 + // create a pull request 689 + session := loginUser(t, "user1") 690 + user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) 691 + forkedName := "repo1-1" 692 + testRepoFork(t, session, "user2", "repo1", "user1", forkedName) 693 + defer func() { 694 + testDeleteRepository(t, session, "user1", forkedName) 695 + }() 696 + testEditFile(t, session, "user1", forkedName, "master", "README.md", "Hello, World (Edited)\n") 697 + testPullCreate(t, session, "user1", forkedName, false, "master", "master", "Indexer notifier test pull") 698 + 699 + baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"}) 700 + forkedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: forkedName}) 701 + pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ 702 + BaseRepoID: baseRepo.ID, 703 + BaseBranch: "master", 704 + HeadRepoID: forkedRepo.ID, 705 + HeadBranch: "master", 706 + }) 707 + 708 + // add protected branch for commit status 709 + csrf := GetCSRF(t, session, "/user2/repo1/settings/branches") 710 + // Change master branch to protected 711 + req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/edit", map[string]string{ 712 + "_csrf": csrf, 713 + "rule_name": "master", 714 + "enable_push": "true", 715 + "enable_status_check": "true", 716 + "status_check_contexts": "gitea/actions", 717 + }) 718 + session.MakeRequest(t, req, http.StatusSeeOther) 719 + 720 + // first time insert automerge record, return true 721 + scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") 722 + assert.NoError(t, err) 723 + assert.True(t, scheduled) 724 + 725 + // second time insert automerge record, return false because it does exist 726 + scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") 727 + assert.Error(t, err) 728 + assert.False(t, scheduled) 729 + 730 + // reload pr again 731 + pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) 732 + assert.False(t, pr.HasMerged) 733 + assert.Empty(t, pr.MergedCommitID) 734 + 735 + // update commit status to success, then it should be merged automatically 736 + baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo) 737 + assert.NoError(t, err) 738 + sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) 739 + assert.NoError(t, err) 740 + masterCommitID, err := baseGitRepo.GetBranchCommitID("master") 741 + assert.NoError(t, err) 742 + 743 + branches, _, err := baseGitRepo.GetBranchNames(0, 100) 744 + assert.NoError(t, err) 745 + assert.ElementsMatch(t, []string{"sub-home-md-img-check", "home-md-img-check", "pr-to-update", "branch2", "DefaultBranch", "develop", "feature/1", "master"}, branches) 746 + baseGitRepo.Close() 747 + defer func() { 748 + testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID) 749 + }() 750 + 751 + err = commitstatus_service.CreateCommitStatus(db.DefaultContext, baseRepo, user1, sha, &git_model.CommitStatus{ 752 + State: api.CommitStatusSuccess, 753 + TargetURL: "https://gitea.com", 754 + Context: "gitea/actions", 755 + }) 756 + assert.NoError(t, err) 757 + 758 + time.Sleep(2 * time.Second) 759 + 760 + // realod pr again 761 + pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) 762 + assert.True(t, pr.HasMerged) 763 + assert.NotEmpty(t, pr.MergedCommitID) 764 + 765 + unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID}) 766 + }) 767 + } 768 + 769 + func TestPullAutoMergeAfterCommitStatusSucceedAndApproval(t *testing.T) { 770 + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { 771 + // create a pull request 772 + session := loginUser(t, "user1") 773 + user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) 774 + forkedName := "repo1-2" 775 + testRepoFork(t, session, "user2", "repo1", "user1", forkedName) 776 + defer func() { 777 + testDeleteRepository(t, session, "user1", forkedName) 778 + }() 779 + testEditFile(t, session, "user1", forkedName, "master", "README.md", "Hello, World (Edited)\n") 780 + testPullCreate(t, session, "user1", forkedName, false, "master", "master", "Indexer notifier test pull") 781 + 782 + baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"}) 783 + forkedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: forkedName}) 784 + pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ 785 + BaseRepoID: baseRepo.ID, 786 + BaseBranch: "master", 787 + HeadRepoID: forkedRepo.ID, 788 + HeadBranch: "master", 789 + }) 790 + 791 + // add protected branch for commit status 792 + csrf := GetCSRF(t, session, "/user2/repo1/settings/branches") 793 + // Change master branch to protected 794 + req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/edit", map[string]string{ 795 + "_csrf": csrf, 796 + "rule_name": "master", 797 + "enable_push": "true", 798 + "enable_status_check": "true", 799 + "status_check_contexts": "gitea/actions", 800 + "required_approvals": "1", 801 + }) 802 + session.MakeRequest(t, req, http.StatusSeeOther) 803 + 804 + // first time insert automerge record, return true 805 + scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") 806 + assert.NoError(t, err) 807 + assert.True(t, scheduled) 808 + 809 + // second time insert automerge record, return false because it does exist 810 + scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") 811 + assert.Error(t, err) 812 + assert.False(t, scheduled) 813 + 814 + // reload pr again 815 + pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) 816 + assert.False(t, pr.HasMerged) 817 + assert.Empty(t, pr.MergedCommitID) 818 + 819 + // update commit status to success, then it should be merged automatically 820 + baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo) 821 + assert.NoError(t, err) 822 + sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) 823 + assert.NoError(t, err) 824 + masterCommitID, err := baseGitRepo.GetBranchCommitID("master") 825 + assert.NoError(t, err) 826 + baseGitRepo.Close() 827 + defer func() { 828 + testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID) 829 + }() 830 + 831 + err = commitstatus_service.CreateCommitStatus(db.DefaultContext, baseRepo, user1, sha, &git_model.CommitStatus{ 832 + State: api.CommitStatusSuccess, 833 + TargetURL: "https://gitea.com", 834 + Context: "gitea/actions", 835 + }) 836 + assert.NoError(t, err) 837 + 838 + time.Sleep(2 * time.Second) 839 + 840 + // reload pr again 841 + pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) 842 + assert.False(t, pr.HasMerged) 843 + assert.Empty(t, pr.MergedCommitID) 844 + 845 + // approve the PR from non-author 846 + approveSession := loginUser(t, "user2") 847 + req = NewRequest(t, "GET", fmt.Sprintf("/user2/repo1/pulls/%d", pr.Index)) 848 + resp := approveSession.MakeRequest(t, req, http.StatusOK) 849 + htmlDoc := NewHTMLParser(t, resp.Body) 850 + testSubmitReview(t, approveSession, htmlDoc.GetCSRF(), "user2", "repo1", strconv.Itoa(int(pr.Index)), sha, "approve", http.StatusOK) 851 + 852 + time.Sleep(2 * time.Second) 853 + 854 + // realod pr again 855 + pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) 856 + assert.True(t, pr.HasMerged) 857 + assert.NotEmpty(t, pr.MergedCommitID) 858 + 859 + unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID}) 860 + }) 861 + }

+6 -6

tests/integration/pull_review_test.go

··· 425 425 htmlDoc := NewHTMLParser(t, resp.Body) 426 426 427 427 // Submit an approve review on the PR. 428 - testSubmitReview(t, user2Session, htmlDoc.GetCSRF(), "user2", "repo1", elem[4], "approve", http.StatusUnprocessableEntity) 428 + testSubmitReview(t, user2Session, htmlDoc.GetCSRF(), "user2", "repo1", elem[4], "", "approve", http.StatusUnprocessableEntity) 429 429 430 430 // Submit a reject review on the PR. 431 - testSubmitReview(t, user2Session, htmlDoc.GetCSRF(), "user2", "repo1", elem[4], "reject", http.StatusUnprocessableEntity) 431 + testSubmitReview(t, user2Session, htmlDoc.GetCSRF(), "user2", "repo1", elem[4], "", "reject", http.StatusUnprocessableEntity) 432 432 }) 433 433 434 434 t.Run("Submit approve/reject review on closed PR", func(t *testing.T) { ··· 445 445 htmlDoc := NewHTMLParser(t, resp.Body) 446 446 447 447 // Submit an approve review on the PR. 448 - testSubmitReview(t, user2Session, htmlDoc.GetCSRF(), "user2", "repo1", elem[4], "approve", http.StatusUnprocessableEntity) 448 + testSubmitReview(t, user2Session, htmlDoc.GetCSRF(), "user2", "repo1", elem[4], "", "approve", http.StatusUnprocessableEntity) 449 449 450 450 // Submit a reject review on the PR. 451 - testSubmitReview(t, user2Session, htmlDoc.GetCSRF(), "user2", "repo1", elem[4], "reject", http.StatusUnprocessableEntity) 451 + testSubmitReview(t, user2Session, htmlDoc.GetCSRF(), "user2", "repo1", elem[4], "", "reject", http.StatusUnprocessableEntity) 452 452 }) 453 453 }) 454 454 } 455 455 456 - func testSubmitReview(t *testing.T, session *TestSession, csrf, owner, repo, pullNumber, reviewType string, expectedSubmitStatus int) *httptest.ResponseRecorder { 456 + func testSubmitReview(t *testing.T, session *TestSession, csrf, owner, repo, pullNumber, commitID, reviewType string, expectedSubmitStatus int) *httptest.ResponseRecorder { 457 457 options := map[string]string{ 458 458 "_csrf": csrf, 459 - "commit_id": "", 459 + "commit_id": commitID, 460 460 "content": "test", 461 461 "type": reviewType, 462 462 }

Configure Feed

Configure Feed