mirror of
https://github.com/go-gitea/gitea.git
synced 2026-06-13 19:19:52 +00:00
wxiaoguang
1b3b4bdd03
* fix incorrect delayWriter call (there is already a defer call) * split HookPostReceive into small functions * fix incorrect HookPostReceiveResult response for errors * fix incorrect AddRepoToLicenseUpdaterQueue call * make sure repo home and branches page can work without default branch * make sure default branch is always synchronized between database and git repo, and fix FIXME
49 lines
1.5 KiB
Go
49 lines
1.5 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package private
|
|
|
|
import (
|
|
"testing"
|
|
|
|
issues_model "gitea.dev/models/issues"
|
|
pull_model "gitea.dev/models/pull"
|
|
repo_model "gitea.dev/models/repo"
|
|
"gitea.dev/models/unittest"
|
|
user_model "gitea.dev/models/user"
|
|
"gitea.dev/modules/private"
|
|
repo_module "gitea.dev/modules/repository"
|
|
"gitea.dev/services/contexttest"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestHandlePullRequestMerging(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
pr, err := issues_model.GetUnmergedPullRequest(t.Context(), 1, 1, "branch2", "master", issues_model.PullRequestFlowGithub)
|
|
assert.NoError(t, err)
|
|
assert.NoError(t, pr.LoadBaseRepo(t.Context()))
|
|
|
|
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
|
|
|
err = pull_model.ScheduleAutoMerge(t.Context(), user1, pr.ID, repo_model.MergeStyleSquash, "squash merge a pr", false)
|
|
assert.NoError(t, err)
|
|
|
|
autoMerge := unittest.AssertExistsAndLoadBean(t, &pull_model.AutoMerge{PullID: pr.ID})
|
|
|
|
ctx, resp := contexttest.MockPrivateContext(t, "/")
|
|
hookPostReceiveHandlePullRequestMerging(ctx, &private.HookOptions{
|
|
PullRequestID: pr.ID,
|
|
UserID: 2,
|
|
}, []*repo_module.PushUpdateOptions{
|
|
{NewCommitID: "01234567"},
|
|
})
|
|
assert.Empty(t, resp.Body.String())
|
|
pr, err = issues_model.GetPullRequestByID(t.Context(), pr.ID)
|
|
assert.NoError(t, err)
|
|
assert.True(t, pr.HasMerged)
|
|
assert.Equal(t, "01234567", pr.MergedCommitID)
|
|
|
|
unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{ID: autoMerge.ID})
|
|
}
|