mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-09-02 23:46:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

[v12.0/forgejo] fix: prevent pull requests from being merged multiple times (#8862)

Browse source 
Backport of https://codeberg.org/forgejo/forgejo/pulls/8842

Contains a partial cherry-pick of 184e068f37, for the parts the PR depends on. The whole commit is way too involved to cherry-pick as a whole.

Co-authored-by: Danko Aleksejevs <danko@very.lv>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8862
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: BtbN <btbn@btbn.de>
Co-committed-by: BtbN <btbn@btbn.de>
This commit is contained in:
BtbN 2025-08-11 23:08:46 +02:00 • committed by Earl Warren
commit 53c4c6bda8
6 changed files with 92 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

34
services/pull/merge_test.go
View file

@ -6,7 +6,15 @@ package pull
import (
"testing"
"forgejo.org/models"
issues_model "forgejo.org/models/issues"
repo_model "forgejo.org/models/repo"
"forgejo.org/models/unittest"
user_model "forgejo.org/models/user"
"forgejo.org/modules/gitrepo"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func Test_expandDefaultMergeMessage(t *testing.T) {
@ -90,3 +98,29 @@ func TestAddCommitMessageTailer(t *testing.T) {
assert.Equal(t, "title\n\nTest-tailer: v1\nTest-tailer: v2", AddCommitMessageTrailer("title\n\nTest-tailer: v1", "Test-tailer", "v2"))
assert.Equal(t, "title\n\nTest-tailer: v1\nTest-tailer: v2", AddCommitMessageTrailer("title\n\nTest-tailer: v1\n", "Test-tailer", "v2"))
}
func TestMergeMergedPR(t *testing.T) {
require.NoError(t, unittest.PrepareTestDatabase())
pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 1})
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
require.NoError(t, pr.LoadBaseRepo(t.Context()))
gitRepo, err := gitrepo.OpenRepository(t.Context(), pr.BaseRepo)
require.NoError(t, err)
defer gitRepo.Close()
assert.True(t, pr.HasMerged)
pr.HasMerged = false
err = Merge(t.Context(), pr, doer, gitRepo, repo_model.MergeStyleRebase, "", "I should not exist", false)
require.Error(t, err)
assert.True(t, models.IsErrPullRequestHasMerged(err))
if mergeErr, ok := err.(models.ErrPullRequestHasMerged); ok {
assert.Equal(t, pr.ID, mergeErr.ID)
assert.Equal(t, pr.IssueID, mergeErr.IssueID)
assert.Equal(t, pr.HeadBranch, mergeErr.HeadBranch)
assert.Equal(t, pr.BaseBranch, mergeErr.BaseBranch)
}
}