mirror of
https://github.com/go-gitea/gitea.git
synced 2025-11-05 14:45:30 +01:00
Update actions_schedule_test.go
This commit is contained in:
parent
d692bd1994
commit
d168f6558b
@ -89,9 +89,7 @@ jobs:
|
|||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
// merge pull request
|
// merge pull request
|
||||||
testPullMerge(t, testContext.Session, repo.OwnerName, repo.Name, strconv.FormatInt(apiPull.Index, 10), MergeOptions{
|
testPullMerge(t, testContext.Session, repo.OwnerName, repo.Name, strconv.FormatInt(apiPull.Index, 10), mergeStyle, false)
|
||||||
Style: mergeStyle,
|
|
||||||
})
|
|
||||||
|
|
||||||
pull := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: apiPull.ID})
|
pull := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: apiPull.ID})
|
||||||
return pull.MergedCommitID, "@every 2m"
|
return pull.MergedCommitID, "@every 2m"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user