@@ -8,7 +8,10 @@ import (
8
8
9
9
"code.gitea.io/gitea/models/db"
10
10
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"
11
13
"code.gitea.io/gitea/models/unittest"
14
+ user_model "code.gitea.io/gitea/models/user"
12
15
"code.gitea.io/gitea/modules/private"
13
16
repo_module "code.gitea.io/gitea/modules/repository"
14
17
"code.gitea.io/gitea/services/contexttest"
@@ -21,6 +24,14 @@ func TestHandlePullRequestMerging(t *testing.T) {
21
24
pr , err := issues_model .GetUnmergedPullRequest (db .DefaultContext , 1 , 1 , "branch2" , "master" , issues_model .PullRequestFlowGithub )
22
25
assert .NoError (t , err )
23
26
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
+
24
35
ctx , resp := contexttest .MockPrivateContext (t , "/" )
25
36
handlePullRequestMerging (ctx , & private.HookOptions {
26
37
PullRequestID : pr .ID ,
@@ -33,5 +44,6 @@ func TestHandlePullRequestMerging(t *testing.T) {
33
44
assert .NoError (t , err )
34
45
assert .True (t , pr .HasMerged )
35
46
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 })
37
49
}
0 commit comments