mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-26 06:16:56 +09:00
bircniandsilverwind
ba4f8fa246
Adds a repository setting for the default squash merge commit message body with GitHub's options `PR_BODY`, `COMMIT_MESSAGES` and `BLANK`, also settable via `squash_merge_commit_message` in the API. The commit title stays the pull request title. 1. Breaking: API squash merges without `merge_message_field` now get the same default message as the web merge box instead of a title-only commit, which affects clients sending only `Do` like Renovate. An empty value keeps title-only. 2. Breaking: `[repository.pull-request] DEFAULT_SQUASH_MERGE_MESSAGE` replaces `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES`, which still works as a deprecated fallback. Repositories store the default when created or next saved. 3. Deprecated app.ini keys now migrate through one table instead of per-loader fallbacks, which also fixes the ignored `[mailer] CERT_FILE` and `KEY_FILE` fallbacks. Deprecation warnings no longer claim a removal version. <img width="1891" height="571" alt="grafik" src="https://github.com/user-attachments/assets/0fdcde13-1f11-4156-b598-d80eb0d04cbe" /> --------- Co-authored-by: silverwind <me@silverwind.io>
103 lines
3.0 KiB
Go
103 lines
3.0 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package forms
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"gitea.dev/modules/json"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestSubmitReviewForm_IsEmpty(t *testing.T) {
|
|
cases := []struct {
|
|
form SubmitReviewForm
|
|
expected bool
|
|
}{
|
|
// Approved PR with a comment shouldn't count as empty
|
|
{SubmitReviewForm{Type: "approve", Content: "Awesome"}, false},
|
|
|
|
// Approved PR without a comment shouldn't count as empty
|
|
{SubmitReviewForm{Type: "approve", Content: ""}, false},
|
|
|
|
// Rejected PR without a comment should count as empty
|
|
{SubmitReviewForm{Type: "reject", Content: ""}, true},
|
|
|
|
// Rejected PR with a comment shouldn't count as empty
|
|
{SubmitReviewForm{Type: "reject", Content: "Awesome"}, false},
|
|
|
|
// Comment review on a PR with a comment shouldn't count as empty
|
|
{SubmitReviewForm{Type: "comment", Content: "Awesome"}, false},
|
|
|
|
// Comment review on a PR without a comment should count as empty
|
|
{SubmitReviewForm{Type: "comment", Content: ""}, true},
|
|
}
|
|
|
|
for _, v := range cases {
|
|
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),
|
|
HasMergeMessageField: 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)
|
|
})
|
|
|
|
t.Run("OmittedMergeMessageFieldClearsPreviousMessage", func(t *testing.T) {
|
|
form := &MergePullRequestForm{MergeMessageField: "previous message", HasMergeMessageField: true}
|
|
require.NoError(t, json.Unmarshal([]byte(`{"do": "squash"}`), &form))
|
|
assert.Empty(t, form.MergeMessageField)
|
|
assert.False(t, form.HasMergeMessageField)
|
|
})
|
|
|
|
t.Run("EmptyMergeMessageField", func(t *testing.T) {
|
|
var form MergePullRequestForm
|
|
require.NoError(t, json.Unmarshal([]byte(`{"do": "squash", "merge_message_field": ""}`), &form))
|
|
assert.Empty(t, form.MergeMessageField)
|
|
assert.True(t, form.HasMergeMessageField)
|
|
})
|
|
}
|