mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-24 11:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: prevent pull requests from being merged multiple times

Browse source
This commit is contained in:
BtbN 2025-08-09 22:12:33 +02:00 • committed by BtbN
commit 0b552407fe
5 changed files with 63 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
services/pull/merge_test.go
View file

@ -9,7 +9,12 @@ import (
"strings"
"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"
"forgejo.org/modules/setting"
"forgejo.org/modules/test"
@ -146,3 +151,29 @@ func TestLoadMergeMessageTemplates(t *testing.T) {
require.NoError(t, LoadMergeMessageTemplates())
assert.Empty(t, mergeMessageTemplates)
}
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)
}
}