From 03ab2fa2711c22d55a4ddbfcc08fbeca701950eb Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 7 May 2024 11:02:35 +0800 Subject: [PATCH] Add test for automerge deletion --- routers/private/hook_post_receive_test.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/routers/private/hook_post_receive_test.go b/routers/private/hook_post_receive_test.go index d4401bc699..658557d3cf 100644 --- a/routers/private/hook_post_receive_test.go +++ b/routers/private/hook_post_receive_test.go @@ -8,7 +8,10 @@ import ( "code.gitea.io/gitea/models/db" 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/modules/private" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/services/contexttest" @@ -21,6 +24,14 @@ func TestHandlePullRequestMerging(t *testing.T) { pr, err := issues_model.GetUnmergedPullRequest(db.DefaultContext, 1, 1, "branch2", "master", issues_model.PullRequestFlowGithub) assert.NoError(t, err) assert.NoError(t, pr.LoadBaseRepo(db.DefaultContext)) + + user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) + + err = pull_model.ScheduleAutoMerge(db.DefaultContext, user1, pr.ID, repo_model.MergeStyleSquash, "squash merge a pr") + assert.NoError(t, err) + + autoMerge := unittest.AssertExistsAndLoadBean(t, &pull_model.AutoMerge{PullID: pr.ID}) + ctx, resp := contexttest.MockPrivateContext(t, "/") handlePullRequestMerging(ctx, &private.HookOptions{ PullRequestID: pr.ID, @@ -33,5 +44,6 @@ func TestHandlePullRequestMerging(t *testing.T) { assert.NoError(t, err) assert.True(t, pr.HasMerged) assert.EqualValues(t, "01234567", pr.MergedCommitID) - // TODO: test the removal of auto merge + + unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{ID: autoMerge.ID}) }