ynkmr/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-09-16 09:53:24 +09:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Nicolas
2026-05-31 12:57:52 +02:00
parent f5d0e1633d
commit f99aa56c4f
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/pull/pull_test.go
+2 -4
View File
@@ -14,6 +14,7 @@ import (
"gitea.dev/modules/git"
"gitea.dev/modules/gitrepo"
"gitea.dev/modules/setting"
"gitea.dev/modules/test"
"github.com/stretchr/testify/assert"
)
@@ -41,10 +42,7 @@ func TestPullRequest_FormatSquashMergeCommitMessages(t *testing.T) {
oldest := &git.Commit{CommitMessage: git.CommitMessage{MessageRaw: "commit msg 1"}}
newest := &git.Commit{CommitMessage: git.CommitMessage{MessageRaw: "commit msg 2\n\nCommit description."}}
defer func(old int) { setting.Repository.PullRequest.DefaultMergeMessageSize = old }(
setting.Repository.PullRequest.DefaultMergeMessageSize,
)
setting.Repository.PullRequest.DefaultMergeMessageSize = 0
defer test.MockVariableValue(&setting.Repository.PullRequest.DefaultMergeMessageSize, 0)()
// all commits
assert.Equal(t, "* commit msg 1\n\n* commit msg 2\n\nCommit description.\n\n",