Skip to content

Commit 03ab2fa

Browse files
committed
Add test for automerge deletion
1 parent 20a188a commit 03ab2fa

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

routers/private/hook_post_receive_test.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ import (
88

99
"code.gitea.io/gitea/models/db"
1010
issues_model "code.gitea.io/gitea/models/issues"
11+
pull_model "code.gitea.io/gitea/models/pull"
12+
repo_model "code.gitea.io/gitea/models/repo"
1113
"code.gitea.io/gitea/models/unittest"
14+
user_model "code.gitea.io/gitea/models/user"
1215
"code.gitea.io/gitea/modules/private"
1316
repo_module "code.gitea.io/gitea/modules/repository"
1417
"code.gitea.io/gitea/services/contexttest"
@@ -21,6 +24,14 @@ func TestHandlePullRequestMerging(t *testing.T) {
2124
pr, err := issues_model.GetUnmergedPullRequest(db.DefaultContext, 1, 1, "branch2", "master", issues_model.PullRequestFlowGithub)
2225
assert.NoError(t, err)
2326
assert.NoError(t, pr.LoadBaseRepo(db.DefaultContext))
27+
28+
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
29+
30+
err = pull_model.ScheduleAutoMerge(db.DefaultContext, user1, pr.ID, repo_model.MergeStyleSquash, "squash merge a pr")
31+
assert.NoError(t, err)
32+
33+
autoMerge := unittest.AssertExistsAndLoadBean(t, &pull_model.AutoMerge{PullID: pr.ID})
34+
2435
ctx, resp := contexttest.MockPrivateContext(t, "/")
2536
handlePullRequestMerging(ctx, &private.HookOptions{
2637
PullRequestID: pr.ID,
@@ -33,5 +44,6 @@ func TestHandlePullRequestMerging(t *testing.T) {
3344
assert.NoError(t, err)
3445
assert.True(t, pr.HasMerged)
3546
assert.EqualValues(t, "01234567", pr.MergedCommitID)
36-
// TODO: test the removal of auto merge
47+
48+
unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{ID: autoMerge.ID})
3749
}

0 commit comments

Comments
 (0)