mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-08-27 21:35:29 +02:00
fix bug when push a branch name with / & fix an integration test bug (#1689)
This commit is contained in:
parent
79494047b0
commit
2bb8b3a562
4 changed files with 53 additions and 7 deletions
|
@ -94,11 +94,12 @@ func initIntegrationTest() {
|
|||
if err != nil {
|
||||
log.Fatalf("db.Query: %v", err)
|
||||
}
|
||||
if rows.Next() {
|
||||
break // database already exists
|
||||
}
|
||||
if _, err = db.Exec("CREATE DATABASE testgitea"); err != nil {
|
||||
log.Fatalf("db.Exec: %v", err)
|
||||
defer rows.Close()
|
||||
|
||||
if !rows.Next() {
|
||||
if _, err = db.Exec("CREATE DATABASE testgitea"); err != nil {
|
||||
log.Fatalf("db.Exec: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
routers.GlobalInit()
|
||||
|
|
45
integrations/internal_test.go
Normal file
45
integrations/internal_test.go
Normal file
|
@ -0,0 +1,45 @@
|
|||
// Copyright 2017 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package integrations
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func assertProtectedBranch(t *testing.T, repoID int64, branchName string, isErr, canPush bool) {
|
||||
reqURL := fmt.Sprintf("/api/internal/branch/%d/%s", repoID, url.QueryEscape(branchName))
|
||||
req, err := http.NewRequest("GET", reqURL, nil)
|
||||
t.Log(reqURL)
|
||||
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", setting.InternalToken))
|
||||
|
||||
assert.NoError(t, err)
|
||||
resp := MakeRequest(req)
|
||||
if isErr {
|
||||
assert.EqualValues(t, 500, resp.HeaderCode)
|
||||
} else {
|
||||
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
|
||||
var branch models.ProtectedBranch
|
||||
t.Log(string(resp.Body))
|
||||
assert.NoError(t, json.Unmarshal(resp.Body, &branch))
|
||||
assert.Equal(t, canPush, branch.CanPush)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInternal_GetProtectedBranch(t *testing.T) {
|
||||
prepareTestEnv(t)
|
||||
|
||||
assertProtectedBranch(t, 1, "master", false, true)
|
||||
assertProtectedBranch(t, 1, "dev", false, true)
|
||||
assertProtectedBranch(t, 1, "lunny/dev", false, true)
|
||||
}
|
|
@ -13,7 +13,7 @@ import (
|
|||
// GetProtectedBranchBy get protected branch information
|
||||
func GetProtectedBranchBy(ctx *macaron.Context) {
|
||||
repoID := ctx.ParamsInt64(":id")
|
||||
branchName := ctx.Params(":branch")
|
||||
branchName := ctx.Params("*")
|
||||
protectBranch, err := models.GetProtectedBranchBy(repoID, branchName)
|
||||
if err != nil {
|
||||
ctx.JSON(500, map[string]interface{}{
|
||||
|
|
|
@ -42,6 +42,6 @@ func RegisterRoutes(m *macaron.Macaron) {
|
|||
m.Group("/", func() {
|
||||
m.Post("/ssh/:id/update", UpdatePublicKey)
|
||||
m.Post("/push/update", PushUpdate)
|
||||
m.Get("/branch/:id/:branch", GetProtectedBranchBy)
|
||||
m.Get("/branch/:id/*", GetProtectedBranchBy)
|
||||
}, CheckInternalToken)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue