Backport #37214 The only conflict is go.mod Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
@@ -6,7 +6,10 @@ package forms
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/modules/json"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestSubmitReviewForm_IsEmpty(t *testing.T) {
|
||||
@@ -37,3 +40,48 @@ func TestSubmitReviewForm_IsEmpty(t *testing.T) {
|
||||
assert.Equal(t, v.expected, v.form.HasEmptyContent())
|
||||
}
|
||||
}
|
||||
|
||||
func TestMergePullRequestForm(t *testing.T) {
|
||||
expected := &MergePullRequestForm{
|
||||
Do: "merge",
|
||||
MergeTitleField: "title",
|
||||
MergeMessageField: "message",
|
||||
MergeCommitID: "merge-id",
|
||||
HeadCommitID: "head-id",
|
||||
ForceMerge: true,
|
||||
MergeWhenChecksSucceed: true,
|
||||
DeleteBranchAfterMerge: new(true),
|
||||
}
|
||||
|
||||
t.Run("NewFields", func(t *testing.T) {
|
||||
input := `{
|
||||
"do": "merge",
|
||||
"merge_title_field": "title",
|
||||
"merge_message_field": "message",
|
||||
"merge_commit_id": "merge-id",
|
||||
"head_commit_id": "head-id",
|
||||
"force_merge": true,
|
||||
"merge_when_checks_succeed": true,
|
||||
"delete_branch_after_merge": true
|
||||
}`
|
||||
var m *MergePullRequestForm
|
||||
require.NoError(t, json.Unmarshal([]byte(input), &m))
|
||||
assert.Equal(t, expected, m)
|
||||
})
|
||||
|
||||
t.Run("OldFields", func(t *testing.T) {
|
||||
input := `{
|
||||
"Do": "merge",
|
||||
"MergeTitleField": "title",
|
||||
"MergeMessageField": "message",
|
||||
"MergeCommitID": "merge-id",
|
||||
"head_commit_id": "head-id",
|
||||
"force_merge": true,
|
||||
"merge_when_checks_succeed": true,
|
||||
"delete_branch_after_merge": true
|
||||
}`
|
||||
var m *MergePullRequestForm
|
||||
require.NoError(t, json.Unmarshal([]byte(input), &m))
|
||||
assert.Equal(t, expected, m)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user