mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-26 19:23:09 +00:00
ca46385637
* Use PathUnescape instead of QueryUnescape when working with branch names Currently branch names with a '+' fail in certain situations because QueryUnescape replaces the + character with a blank space. Using PathUnescape should be better since it is defined as: // PathUnescape is identical to QueryUnescape except that it does not // unescape '+' to ' ' (space). Fixes #6333 * Change error to match new function name * Add new util function PathEscapeSegments This function simply runs PathEscape on each segment of a path without touching the forward slash itself. We want to use this instead of PathEscape/QueryEscape in most cases because a forward slash is a valid name for a branch etc... and we don't want that escaped in a URL. Putting this in new file url.go and also moving a couple similar functions into that file as well. * Use EscapePathSegments where appropriate Replace various uses of EscapePath/EscapeQuery with new EscapePathSegments. Also remove uncessary uses of various escape/unescape functions when the text had already been escaped or was not escaped. * Reformat comment to make drone build happy * Remove no longer used url library * Requested code changes
44 lines
1.3 KiB
Go
44 lines
1.3 KiB
Go
// 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"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/util"
|
|
|
|
"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, util.PathEscapeSegments(branchName))
|
|
req := NewRequest(t, "GET", reqURL)
|
|
t.Log(reqURL)
|
|
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", setting.InternalToken))
|
|
|
|
resp := MakeRequest(t, req, NoExpectedStatus)
|
|
if isErr {
|
|
assert.EqualValues(t, http.StatusInternalServerError, resp.Code)
|
|
} else {
|
|
assert.EqualValues(t, http.StatusOK, resp.Code)
|
|
var branch models.ProtectedBranch
|
|
t.Log(resp.Body.String())
|
|
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), &branch))
|
|
assert.Equal(t, canPush, !branch.IsProtected())
|
|
}
|
|
}
|
|
|
|
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)
|
|
}
|