mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-24 01:22:21 +00:00
79b7089360
- Currently protected branch rules do not apply to admins, however in some cases (like in the case of Forgejo project) you might also want to apply these rules to admins to avoid accidental merges. - Add new option to configure this on a per-rule basis. - Adds integration tests. - Resolves #65
88 lines
3.2 KiB
Go
88 lines
3.2 KiB
Go
// Copyright 2024 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package integration
|
|
|
|
import (
|
|
"net/http"
|
|
"net/url"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
|
|
git_model "code.gitea.io/gitea/models/git"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
"code.gitea.io/gitea/tests"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestProtectedBranch_AdminEnforcement(t *testing.T) {
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
|
session := loginUser(t, "user1")
|
|
testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
|
|
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "add-readme", "README.md", "WIP")
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: 1, Name: "repo1"})
|
|
|
|
req := NewRequestWithValues(t, "POST", "user1/repo1/compare/master...add-readme", map[string]string{
|
|
"_csrf": GetCSRF(t, session, "user1/repo1/compare/master...add-readme"),
|
|
"title": "pull request",
|
|
})
|
|
session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
t.Run("No protected branch", func(t *testing.T) {
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
req = NewRequest(t, "GET", "/user1/repo1/pulls/1")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
|
|
text := strings.TrimSpace(doc.doc.Find(".merge-section").Text())
|
|
assert.Contains(t, text, "This pull request can be merged automatically.")
|
|
assert.Contains(t, text, "'canMergeNow': true")
|
|
})
|
|
|
|
t.Run("Without admin enforcement", func(t *testing.T) {
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
req := NewRequestWithValues(t, "POST", "/user1/repo1/settings/branches/edit", map[string]string{
|
|
"_csrf": GetCSRF(t, session, "/user1/repo1/settings/branches/edit"),
|
|
"rule_name": "master",
|
|
"required_approvals": "1",
|
|
})
|
|
session.MakeRequest(t, req, http.StatusSeeOther)
|
|
|
|
req = NewRequest(t, "GET", "/user1/repo1/pulls/1")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
|
|
text := strings.TrimSpace(doc.doc.Find(".merge-section").Text())
|
|
assert.Contains(t, text, "This pull request doesn't have enough approvals yet. 0 of 1 approvals granted.")
|
|
assert.Contains(t, text, "'canMergeNow': true")
|
|
})
|
|
|
|
t.Run("With admin enforcement", func(t *testing.T) {
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
protectedBranch := unittest.AssertExistsAndLoadBean(t, &git_model.ProtectedBranch{RuleName: "master", RepoID: repo.ID})
|
|
req := NewRequestWithValues(t, "POST", "/user1/repo1/settings/branches/edit", map[string]string{
|
|
"_csrf": GetCSRF(t, session, "/user1/repo1/settings/branches/edit"),
|
|
"rule_name": "master",
|
|
"rule_id": strconv.FormatInt(protectedBranch.ID, 10),
|
|
"required_approvals": "1",
|
|
"apply_to_admins": "true",
|
|
})
|
|
session.MakeRequest(t, req, http.StatusSeeOther)
|
|
|
|
req = NewRequest(t, "GET", "/user1/repo1/pulls/1")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
|
|
text := strings.TrimSpace(doc.doc.Find(".merge-section").Text())
|
|
assert.Contains(t, text, "This pull request doesn't have enough approvals yet. 0 of 1 approvals granted.")
|
|
assert.Contains(t, text, "'canMergeNow': false")
|
|
})
|
|
})
|
|
}
|