mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-03 17:34:28 +09:00
Enable addtional linters (#34085)
enable mirror, usestdlibbars and perfsprint part of: https://github.com/go-gitea/gitea/issues/34083 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
@@ -94,7 +94,7 @@ func TestE2e(t *testing.T) {
|
||||
onGiteaRun(t, func(*testing.T, *url.URL) {
|
||||
cmd := exec.Command(runArgs[0], runArgs...)
|
||||
cmd.Env = os.Environ()
|
||||
cmd.Env = append(cmd.Env, fmt.Sprintf("GITEA_URL=%s", setting.AppURL))
|
||||
cmd.Env = append(cmd.Env, "GITEA_URL="+setting.AppURL)
|
||||
|
||||
var stdout, stderr bytes.Buffer
|
||||
cmd.Stdout = &stdout
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"net/http"
|
||||
"net/url"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -137,9 +138,9 @@ jobs:
|
||||
runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"}, false)
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) {
|
||||
t.Run("test "+tc.treePath, func(t *testing.T) {
|
||||
// create the workflow file
|
||||
opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent)
|
||||
opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, "create "+tc.treePath, tc.fileContent)
|
||||
fileResp := createWorkflowFile(t, token, user2.Name, apiRepo.Name, tc.treePath, opts)
|
||||
|
||||
// fetch and execute task
|
||||
@@ -320,8 +321,8 @@ jobs:
|
||||
runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"}, false)
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) {
|
||||
opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent)
|
||||
t.Run("test "+tc.treePath, func(t *testing.T) {
|
||||
opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, "create "+tc.treePath, tc.fileContent)
|
||||
createWorkflowFile(t, token, user2.Name, apiRepo.Name, tc.treePath, opts)
|
||||
|
||||
for i := 0; i < len(tc.outcomes); i++ {
|
||||
@@ -371,7 +372,7 @@ jobs:
|
||||
steps:
|
||||
- run: echo 'test the pull'
|
||||
`
|
||||
opts := getWorkflowCreateFileOptions(user2, baseRepo.DefaultBranch, fmt.Sprintf("create %s", wfTreePath), wfFileContent)
|
||||
opts := getWorkflowCreateFileOptions(user2, baseRepo.DefaultBranch, "create "+wfTreePath, wfFileContent)
|
||||
createWorkflowFile(t, user2Token, baseRepo.OwnerName, baseRepo.Name, wfTreePath, opts)
|
||||
// user2 creates a pull request
|
||||
doAPICreateFile(user2APICtx, "user2-patch.txt", &api.CreateFileOptions{
|
||||
@@ -418,9 +419,9 @@ jobs:
|
||||
assert.Equal(t, actionRun.Repo.OwnerName+"/"+actionRun.Repo.Name, gtCtx["repository"].GetStringValue())
|
||||
assert.Equal(t, actionRun.Repo.OwnerName, gtCtx["repository_owner"].GetStringValue())
|
||||
assert.Equal(t, actionRun.Repo.HTMLURL(), gtCtx["repositoryUrl"].GetStringValue())
|
||||
assert.Equal(t, fmt.Sprint(actionRunJob.RunID), gtCtx["run_id"].GetStringValue())
|
||||
assert.Equal(t, fmt.Sprint(actionRun.Index), gtCtx["run_number"].GetStringValue())
|
||||
assert.Equal(t, fmt.Sprint(actionRunJob.Attempt), gtCtx["run_attempt"].GetStringValue())
|
||||
assert.Equal(t, strconv.FormatInt(actionRunJob.RunID, 10), gtCtx["run_id"].GetStringValue())
|
||||
assert.Equal(t, strconv.FormatInt(actionRun.Index, 10), gtCtx["run_number"].GetStringValue())
|
||||
assert.Equal(t, strconv.FormatInt(actionRunJob.Attempt, 10), gtCtx["run_attempt"].GetStringValue())
|
||||
assert.Equal(t, "Actions", gtCtx["secret_source"].GetStringValue())
|
||||
assert.Equal(t, setting.AppURL, gtCtx["server_url"].GetStringValue())
|
||||
assert.Equal(t, actionRun.CommitSHA, gtCtx["sha"].GetStringValue())
|
||||
@@ -463,7 +464,7 @@ jobs:
|
||||
steps:
|
||||
- run: echo 'test the pull'
|
||||
`
|
||||
opts := getWorkflowCreateFileOptions(user2, baseRepo.DefaultBranch, fmt.Sprintf("create %s", wfTreePath), wfFileContent)
|
||||
opts := getWorkflowCreateFileOptions(user2, baseRepo.DefaultBranch, "create "+wfTreePath, wfFileContent)
|
||||
createWorkflowFile(t, user2Token, baseRepo.OwnerName, baseRepo.Name, wfTreePath, opts)
|
||||
// user2 creates a pull request
|
||||
doAPICreateFile(user2APICtx, "user2-patch.txt", &api.CreateFileOptions{
|
||||
@@ -510,9 +511,9 @@ jobs:
|
||||
assert.Equal(t, actionRun.Repo.OwnerName+"/"+actionRun.Repo.Name, gtCtx["repository"].GetStringValue())
|
||||
assert.Equal(t, actionRun.Repo.OwnerName, gtCtx["repository_owner"].GetStringValue())
|
||||
assert.Equal(t, actionRun.Repo.HTMLURL(), gtCtx["repositoryUrl"].GetStringValue())
|
||||
assert.Equal(t, fmt.Sprint(actionRunJob.RunID), gtCtx["run_id"].GetStringValue())
|
||||
assert.Equal(t, fmt.Sprint(actionRun.Index), gtCtx["run_number"].GetStringValue())
|
||||
assert.Equal(t, fmt.Sprint(actionRunJob.Attempt), gtCtx["run_attempt"].GetStringValue())
|
||||
assert.Equal(t, strconv.FormatInt(actionRunJob.RunID, 10), gtCtx["run_id"].GetStringValue())
|
||||
assert.Equal(t, strconv.FormatInt(actionRun.Index, 10), gtCtx["run_number"].GetStringValue())
|
||||
assert.Equal(t, strconv.FormatInt(actionRunJob.Attempt, 10), gtCtx["run_attempt"].GetStringValue())
|
||||
assert.Equal(t, "Actions", gtCtx["secret_source"].GetStringValue())
|
||||
assert.Equal(t, setting.AppURL, gtCtx["server_url"].GetStringValue())
|
||||
assert.Equal(t, actionRun.CommitSHA, gtCtx["sha"].GetStringValue())
|
||||
|
||||
@@ -156,7 +156,7 @@ jobs:
|
||||
runner.registerAsRepoRunner(t, user2.Name, repo.Name, "mock-runner", []string{"ubuntu-latest"}, false)
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) {
|
||||
t.Run("test "+tc.treePath, func(t *testing.T) {
|
||||
var resetFunc func()
|
||||
if tc.zstdEnabled {
|
||||
resetFunc = test.MockVariableValue(&setting.Actions.LogCompression, "zstd")
|
||||
@@ -167,7 +167,7 @@ jobs:
|
||||
}
|
||||
|
||||
// create the workflow file
|
||||
opts := getWorkflowCreateFileOptions(user2, repo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent)
|
||||
opts := getWorkflowCreateFileOptions(user2, repo.DefaultBranch, "create "+tc.treePath, tc.fileContent)
|
||||
createWorkflowFile(t, token, user2.Name, repo.Name, tc.treePath, opts)
|
||||
|
||||
// fetch and execute tasks
|
||||
|
||||
@@ -37,7 +37,7 @@ func newMockRunner() *mockRunner {
|
||||
}
|
||||
|
||||
func newMockRunnerClient(uuid, token string) *mockRunnerClient {
|
||||
baseURL := fmt.Sprintf("%sapi/actions", setting.AppURL)
|
||||
baseURL := setting.AppURL + "api/actions"
|
||||
|
||||
opt := connect.WithInterceptors(connect.UnaryInterceptorFunc(func(next connect.UnaryFunc) connect.UnaryFunc {
|
||||
return func(ctx context.Context, req connect.AnyRequest) (connect.AnyResponse, error) {
|
||||
|
||||
@@ -286,7 +286,7 @@ jobs:
|
||||
ContentReader: strings.NewReader("bar"),
|
||||
},
|
||||
},
|
||||
Message: fmt.Sprintf("%s add bar", setting.Actions.SkipWorkflowStrings[0]),
|
||||
Message: setting.Actions.SkipWorkflowStrings[0] + " add bar",
|
||||
OldBranch: "master",
|
||||
NewBranch: "master",
|
||||
Author: &files_service.IdentityOptions{
|
||||
|
||||
@@ -72,10 +72,10 @@ func TestActivityPubPerson(t *testing.T) {
|
||||
ctx := t.Context()
|
||||
user1, err := user_model.GetUserByName(ctx, username1)
|
||||
assert.NoError(t, err)
|
||||
user1url := fmt.Sprintf("%s/api/v1/activitypub/user-id/1#main-key", srv.URL)
|
||||
user1url := srv.URL + "/api/v1/activitypub/user-id/1#main-key"
|
||||
c, err := activitypub.NewClient(db.DefaultContext, user1, user1url)
|
||||
assert.NoError(t, err)
|
||||
user2inboxurl := fmt.Sprintf("%s/api/v1/activitypub/user-id/2/inbox", srv.URL)
|
||||
user2inboxurl := srv.URL + "/api/v1/activitypub/user-id/2/inbox"
|
||||
|
||||
// Signed request succeeds
|
||||
resp, err := c.Post([]byte{}, user2inboxurl)
|
||||
|
||||
@@ -88,7 +88,7 @@ func TestAPISudoUser(t *testing.T) {
|
||||
normalUsername := "user2"
|
||||
token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeReadUser)
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user?sudo=%s", normalUsername)).
|
||||
req := NewRequest(t, "GET", "/api/v1/user?sudo="+normalUsername).
|
||||
AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
var user api.User
|
||||
@@ -103,7 +103,7 @@ func TestAPISudoUserForbidden(t *testing.T) {
|
||||
normalUsername := "user2"
|
||||
|
||||
token := getUserToken(t, normalUsername, auth_model.AccessTokenScopeReadAdmin)
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user?sudo=%s", adminUsername)).
|
||||
req := NewRequest(t, "GET", "/api/v1/user?sudo="+adminUsername).
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusForbidden)
|
||||
}
|
||||
@@ -193,7 +193,7 @@ func TestAPIEditUser(t *testing.T) {
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
adminUsername := "user1"
|
||||
token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeWriteAdmin)
|
||||
urlStr := fmt.Sprintf("/api/v1/admin/users/%s", "user2")
|
||||
urlStr := "/api/v1/admin/users/" + "user2"
|
||||
|
||||
fullNameToChange := "Full Name User 2"
|
||||
req := NewRequestWithValues(t, "PATCH", urlStr, map[string]string{
|
||||
@@ -374,7 +374,7 @@ func TestAPIEditUser_NotAllowedEmailDomain(t *testing.T) {
|
||||
|
||||
adminUsername := "user1"
|
||||
token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeWriteAdmin)
|
||||
urlStr := fmt.Sprintf("/api/v1/admin/users/%s", "user2")
|
||||
urlStr := "/api/v1/admin/users/" + "user2"
|
||||
|
||||
newEmail := "user2@example1.com"
|
||||
req := NewRequestWithJSON(t, "PATCH", urlStr, api.EditUserOption{
|
||||
|
||||
@@ -174,7 +174,7 @@ func TestAPIGetSystemUserComment(t *testing.T) {
|
||||
user_model.NewGhostUser(),
|
||||
user_model.NewActionsUser(),
|
||||
} {
|
||||
body := fmt.Sprintf("Hello %s", systemUser.Name)
|
||||
body := "Hello " + systemUser.Name
|
||||
comment, err := issues_model.CreateComment(db.DefaultContext, &issues_model.CreateCommentOptions{
|
||||
Type: issues_model.CommentTypeComment,
|
||||
Doer: systemUser,
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
@@ -38,7 +37,7 @@ func TestAPIGetGitignoreTemplateInfo(t *testing.T) {
|
||||
// Use the first template for the test
|
||||
templateName := repo_module.Gitignores[0]
|
||||
|
||||
urlStr := fmt.Sprintf("/api/v1/gitignore/templates/%s", templateName)
|
||||
urlStr := "/api/v1/gitignore/templates/" + templateName
|
||||
req := NewRequest(t, "GET", urlStr)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
|
||||
@@ -143,7 +143,7 @@ func TestCreateUserKey(t *testing.T) {
|
||||
})
|
||||
|
||||
// Search by fingerprint
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/keys?fingerprint=%s", newPublicKey.Fingerprint)).
|
||||
req = NewRequest(t, "GET", "/api/v1/user/keys?fingerprint="+newPublicKey.Fingerprint).
|
||||
AddTokenAuth(token)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
@@ -183,7 +183,7 @@ func TestCreateUserKey(t *testing.T) {
|
||||
token2 := getTokenForLoggedInUser(t, session2, auth_model.AccessTokenScopeWriteUser)
|
||||
|
||||
// Should find key even though not ours, but we shouldn't know whose it is
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/keys?fingerprint=%s", newPublicKey.Fingerprint)).
|
||||
req = NewRequest(t, "GET", "/api/v1/user/keys?fingerprint="+newPublicKey.Fingerprint).
|
||||
AddTokenAuth(token2)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
@@ -42,7 +41,7 @@ func TestAPIGetLabelTemplateInfo(t *testing.T) {
|
||||
// Use the first template for the test
|
||||
templateName := repo_module.LabelTemplateFiles[0].DisplayName
|
||||
|
||||
urlStr := fmt.Sprintf("/api/v1/label/templates/%s", url.PathEscape(templateName))
|
||||
urlStr := "/api/v1/label/templates/" + url.PathEscape(templateName)
|
||||
req := NewRequest(t, "GET", urlStr)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"testing"
|
||||
@@ -39,7 +38,7 @@ func TestAPIGetLicenseTemplateInfo(t *testing.T) {
|
||||
// Use the first template for the test
|
||||
licenseName := repo_module.Licenses[0]
|
||||
|
||||
urlStr := fmt.Sprintf("/api/v1/licenses/%s", url.PathEscape(licenseName))
|
||||
urlStr := "/api/v1/licenses/" + url.PathEscape(licenseName)
|
||||
req := NewRequest(t, "GET", urlStr)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ func TestAPINotification(t *testing.T) {
|
||||
// -- GET /notifications --
|
||||
// test filter
|
||||
since := "2000-01-01T00%3A50%3A01%2B00%3A00" // 946687801
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?since=%s", since)).
|
||||
req := NewRequest(t, "GET", "/api/v1/notifications?since="+since).
|
||||
AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
var apiNL []api.NotificationThread
|
||||
|
||||
@@ -163,7 +163,7 @@ license = MIT`)
|
||||
assert.Condition(t, func() bool {
|
||||
seen := false
|
||||
expectedFilename := fmt.Sprintf("%s-%s-aarch64.pkg.tar.%s", packageName, packageVersion, compression)
|
||||
expectedCompositeKey := fmt.Sprintf("%s|aarch64", repository)
|
||||
expectedCompositeKey := repository + "|aarch64"
|
||||
for _, pf := range pfs {
|
||||
if pf.Name == expectedFilename && pf.CompositeKey == expectedCompositeKey {
|
||||
if seen {
|
||||
@@ -321,7 +321,7 @@ license = MIT`)
|
||||
_, has = content["gitea-test-1.0.1/desc"]
|
||||
assert.True(t, has)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/gitea-test/1.0.1/aarch64", rootURL)).
|
||||
req = NewRequest(t, "DELETE", rootURL+"/gitea-test/1.0.1/aarch64").
|
||||
AddBasicAuth(user.Name)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
||||
}
|
||||
|
||||
root := fmt.Sprintf("%sapi/packages/%s/cargo", setting.AppURL, user.Name)
|
||||
url := fmt.Sprintf("%s/api/v1/crates", root)
|
||||
url := root + "/api/v1/crates"
|
||||
|
||||
t.Run("Index", func(t *testing.T) {
|
||||
t.Run("Git/Config", func(t *testing.T) {
|
||||
|
||||
@@ -274,7 +274,7 @@ nwIDAQAB
|
||||
uploadPackage := func(t *testing.T, version string, expectedStatus int) {
|
||||
var body bytes.Buffer
|
||||
mpw := multipart.NewWriter(&body)
|
||||
part, _ := mpw.CreateFormFile("tarball", fmt.Sprintf("%s.tar.gz", version))
|
||||
part, _ := mpw.CreateFormFile("tarball", version+".tar.gz")
|
||||
zw := gzip.NewWriter(part)
|
||||
tw := tar.NewWriter(zw)
|
||||
|
||||
@@ -320,7 +320,7 @@ nwIDAQAB
|
||||
pfs, err := packages.GetFilesByVersionID(db.DefaultContext, pvs[0].ID)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, pfs, 1)
|
||||
assert.Equal(t, fmt.Sprintf("%s.tar.gz", packageVersion), pfs[0].Name)
|
||||
assert.Equal(t, packageVersion+".tar.gz", pfs[0].Name)
|
||||
assert.True(t, pfs[0].IsLead)
|
||||
|
||||
uploadPackage(t, packageVersion, http.StatusConflict)
|
||||
|
||||
@@ -64,7 +64,7 @@ func TestPackageComposer(t *testing.T) {
|
||||
t.Run("ServiceIndex", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/packages.json", url)).
|
||||
req := NewRequest(t, "GET", url+"/packages.json").
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
|
||||
@@ -91,18 +91,18 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/digest", recipeURL)).
|
||||
req = NewRequest(t, "GET", recipeURL+"/digest").
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/download_urls", recipeURL)).
|
||||
req = NewRequest(t, "GET", recipeURL+"/download_urls").
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequest(t, "POST", fmt.Sprintf("%s/upload_urls", recipeURL))
|
||||
req = NewRequest(t, "POST", recipeURL+"/upload_urls")
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("%s/upload_urls", recipeURL), map[string]int64{
|
||||
req = NewRequestWithJSON(t, "POST", recipeURL+"/upload_urls", map[string]int64{
|
||||
conanfileName: int64(len(contentConanfile)),
|
||||
"removed.txt": 0,
|
||||
}).AddTokenAuth(token)
|
||||
@@ -127,18 +127,18 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/digest", packageURL)).
|
||||
req = NewRequest(t, "GET", packageURL+"/digest").
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/download_urls", packageURL)).
|
||||
req = NewRequest(t, "GET", packageURL+"/download_urls").
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequest(t, "POST", fmt.Sprintf("%s/upload_urls", packageURL))
|
||||
req = NewRequest(t, "POST", packageURL+"/upload_urls")
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("%s/upload_urls", packageURL), map[string]int64{
|
||||
req = NewRequestWithJSON(t, "POST", packageURL+"/upload_urls", map[string]int64{
|
||||
conaninfoName: int64(len(contentConaninfo)),
|
||||
"removed.txt": 0,
|
||||
}).AddTokenAuth(token)
|
||||
@@ -167,7 +167,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusCreated)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/files", recipeURL)).
|
||||
req = NewRequest(t, "GET", recipeURL+"/files").
|
||||
AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
@@ -180,7 +180,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
|
||||
|
||||
packageURL := fmt.Sprintf("%s/packages/%s/revisions/%s", recipeURL, conanPackageReference, packageRevision)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/files", packageURL)).
|
||||
req = NewRequest(t, "GET", packageURL+"/files").
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
@@ -188,7 +188,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusCreated)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/files", packageURL)).
|
||||
req = NewRequest(t, "GET", packageURL+"/files").
|
||||
AddTokenAuth(token)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
@@ -219,7 +219,7 @@ func TestPackageConan(t *testing.T) {
|
||||
t.Run("Ping", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/ping", url))
|
||||
req := NewRequest(t, "GET", url+"/v1/ping")
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
assert.Equal(t, "revisions", resp.Header().Get("X-Conan-Server-Capabilities"))
|
||||
@@ -230,7 +230,7 @@ func TestPackageConan(t *testing.T) {
|
||||
t.Run("UserName/Password Authenticate", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/users/authenticate", url)).
|
||||
req := NewRequest(t, "GET", url+"/v1/users/authenticate").
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
@@ -256,7 +256,7 @@ func TestPackageConan(t *testing.T) {
|
||||
|
||||
token := getTokenForLoggedInUser(t, session, scope)
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/users/authenticate", url)).
|
||||
req := NewRequest(t, "GET", url+"/v1/users/authenticate").
|
||||
AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, expectedAuthStatusCode)
|
||||
if expectedAuthStatusCode != http.StatusOK {
|
||||
@@ -273,7 +273,7 @@ func TestPackageConan(t *testing.T) {
|
||||
|
||||
recipeURL := fmt.Sprintf("%s/v1/conans/%s/%s/%s/%s", url, "TestScope", version1, "testing", channel1)
|
||||
|
||||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("%s/upload_urls", recipeURL), map[string]int64{
|
||||
req = NewRequestWithJSON(t, "POST", recipeURL+"/upload_urls", map[string]int64{
|
||||
conanfileName: 64,
|
||||
"removed.txt": 0,
|
||||
}).AddTokenAuth(token)
|
||||
@@ -308,7 +308,7 @@ func TestPackageConan(t *testing.T) {
|
||||
t.Run("CheckCredentials", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/users/check_credentials", url)).
|
||||
req := NewRequest(t, "GET", url+"/v1/users/check_credentials").
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusOK)
|
||||
})
|
||||
@@ -376,14 +376,14 @@ func TestPackageConan(t *testing.T) {
|
||||
assert.Contains(t, fileHashes, conanfileName)
|
||||
assert.Equal(t, "7abc52241c22090782c54731371847a8", fileHashes[conanfileName])
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/digest", recipeURL))
|
||||
req = NewRequest(t, "GET", recipeURL+"/digest")
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
downloadURLs := make(map[string]string)
|
||||
DecodeJSON(t, resp, &downloadURLs)
|
||||
assert.Contains(t, downloadURLs, conanfileName)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/download_urls", recipeURL))
|
||||
req = NewRequest(t, "GET", recipeURL+"/download_urls")
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
DecodeJSON(t, resp, &downloadURLs)
|
||||
@@ -404,14 +404,14 @@ func TestPackageConan(t *testing.T) {
|
||||
assert.Contains(t, fileHashes, conaninfoName)
|
||||
assert.Equal(t, "7628bfcc5b17f1470c468621a78df394", fileHashes[conaninfoName])
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/digest", packageURL))
|
||||
req = NewRequest(t, "GET", packageURL+"/digest")
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
downloadURLs = make(map[string]string)
|
||||
DecodeJSON(t, resp, &downloadURLs)
|
||||
assert.Contains(t, downloadURLs, conaninfoName)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/download_urls", packageURL))
|
||||
req = NewRequest(t, "GET", packageURL+"/download_urls")
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
DecodeJSON(t, resp, &downloadURLs)
|
||||
@@ -550,7 +550,7 @@ func TestPackageConan(t *testing.T) {
|
||||
t.Run("Ping", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/ping", url))
|
||||
req := NewRequest(t, "GET", url+"/v2/ping")
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
assert.Equal(t, "revisions", resp.Header().Get("X-Conan-Server-Capabilities"))
|
||||
@@ -561,7 +561,7 @@ func TestPackageConan(t *testing.T) {
|
||||
t.Run("UserName/Password Authenticate", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/users/authenticate", url)).
|
||||
req := NewRequest(t, "GET", url+"/v2/users/authenticate").
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
@@ -573,7 +573,7 @@ func TestPackageConan(t *testing.T) {
|
||||
assert.Equal(t, user.ID, pkgMeta.UserID)
|
||||
assert.Equal(t, auth_model.AccessTokenScopeAll, pkgMeta.Scope)
|
||||
|
||||
token = fmt.Sprintf("Bearer %s", body)
|
||||
token = "Bearer " + body
|
||||
})
|
||||
|
||||
badToken := ""
|
||||
@@ -590,7 +590,7 @@ func TestPackageConan(t *testing.T) {
|
||||
|
||||
token := getTokenForLoggedInUser(t, session, scope)
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/users/authenticate", url)).
|
||||
req := NewRequest(t, "GET", url+"/v2/users/authenticate").
|
||||
AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, expectedAuthStatusCode)
|
||||
if expectedAuthStatusCode != http.StatusOK {
|
||||
@@ -640,7 +640,7 @@ func TestPackageConan(t *testing.T) {
|
||||
t.Run("CheckCredentials", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/users/check_credentials", url)).
|
||||
req := NewRequest(t, "GET", url+"/v2/users/check_credentials").
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusOK)
|
||||
})
|
||||
@@ -664,7 +664,7 @@ func TestPackageConan(t *testing.T) {
|
||||
|
||||
recipeURL := fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s", url, name, version1, user1, channel1)
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/latest", recipeURL))
|
||||
req := NewRequest(t, "GET", recipeURL+"/latest")
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
obj := make(map[string]string)
|
||||
|
||||
@@ -193,19 +193,19 @@ func TestPackageConda(t *testing.T) {
|
||||
Removed map[string]*PackageInfo `json:"removed"`
|
||||
}
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/noarch/repodata.json", root))
|
||||
req := NewRequest(t, "GET", root+"/noarch/repodata.json")
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
assert.Equal(t, "application/json", resp.Header().Get("Content-Type"))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/noarch/repodata.json.bz2", root))
|
||||
req = NewRequest(t, "GET", root+"/noarch/repodata.json.bz2")
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
assert.Equal(t, "application/x-bzip2", resp.Header().Get("Content-Type"))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/noarch/current_repodata.json", root))
|
||||
req = NewRequest(t, "GET", root+"/noarch/current_repodata.json")
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
assert.Equal(t, "application/json", resp.Header().Get("Content-Type"))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%s/noarch/current_repodata.json.bz2", root))
|
||||
req = NewRequest(t, "GET", root+"/noarch/current_repodata.json.bz2")
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
assert.Equal(t, "application/x-bzip2", resp.Header().Get("Content-Type"))
|
||||
|
||||
@@ -218,7 +218,7 @@ func TestPackageConda(t *testing.T) {
|
||||
pd, err := packages.GetPackageDescriptor(db.DefaultContext, pv)
|
||||
assert.NoError(t, err)
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/noarch/repodata.json", root))
|
||||
req := NewRequest(t, "GET", root+"/noarch/repodata.json")
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var result RepoData
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
@@ -92,12 +93,12 @@ func TestPackageContainer(t *testing.T) {
|
||||
t.Run("Anonymous", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL))
|
||||
req := NewRequest(t, "GET", setting.AppURL+"v2")
|
||||
resp := MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
assert.ElementsMatch(t, defaultAuthenticateValues, resp.Header().Values("WWW-Authenticate"))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL))
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2/token")
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
tokenResponse := &TokenResponse{}
|
||||
@@ -105,18 +106,18 @@ func TestPackageContainer(t *testing.T) {
|
||||
|
||||
assert.NotEmpty(t, tokenResponse.Token)
|
||||
|
||||
anonymousToken = fmt.Sprintf("Bearer %s", tokenResponse.Token)
|
||||
anonymousToken = "Bearer " + tokenResponse.Token
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)).
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2").
|
||||
AddTokenAuth(anonymousToken)
|
||||
MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
defer test.MockVariableValue(&setting.Service.RequireSignInViewStrict, true)()
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL))
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2")
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL))
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2/token")
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
defer test.MockVariableValue(&setting.AppURL, "https://domain:8443/sub-path/")()
|
||||
@@ -129,12 +130,12 @@ func TestPackageContainer(t *testing.T) {
|
||||
t.Run("UserName/Password", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL))
|
||||
req := NewRequest(t, "GET", setting.AppURL+"v2")
|
||||
resp := MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
assert.ElementsMatch(t, defaultAuthenticateValues, resp.Header().Values("WWW-Authenticate"))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL)).
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2/token").
|
||||
AddBasicAuth(user.Name)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
@@ -147,9 +148,9 @@ func TestPackageContainer(t *testing.T) {
|
||||
assert.Equal(t, user.ID, pkgMeta.UserID)
|
||||
assert.Equal(t, auth_model.AccessTokenScopeAll, pkgMeta.Scope)
|
||||
|
||||
userToken = fmt.Sprintf("Bearer %s", tokenResponse.Token)
|
||||
userToken = "Bearer " + tokenResponse.Token
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)).
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2").
|
||||
AddTokenAuth(userToken)
|
||||
MakeRequest(t, req, http.StatusOK)
|
||||
})
|
||||
@@ -161,23 +162,23 @@ func TestPackageContainer(t *testing.T) {
|
||||
session := loginUser(t, user.Name)
|
||||
|
||||
readToken = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadPackage)
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL))
|
||||
req := NewRequest(t, "GET", setting.AppURL+"v2/token")
|
||||
req.Request.SetBasicAuth(user.Name, readToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
tokenResponse := &TokenResponse{}
|
||||
DecodeJSON(t, resp, &tokenResponse)
|
||||
|
||||
readToken = fmt.Sprintf("Bearer %s", tokenResponse.Token)
|
||||
readToken = "Bearer " + tokenResponse.Token
|
||||
|
||||
badToken = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadNotification)
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL))
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2/token")
|
||||
req.Request.SetBasicAuth(user.Name, badToken)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
testCase := func(scope auth_model.AccessTokenScope, expectedAuthStatus, expectedStatus int) {
|
||||
token := getTokenForLoggedInUser(t, session, scope)
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL))
|
||||
req := NewRequest(t, "GET", setting.AppURL+"v2/token")
|
||||
req.SetBasicAuth(user.Name, token)
|
||||
|
||||
resp := MakeRequest(t, req, expectedAuthStatus)
|
||||
@@ -190,8 +191,8 @@ func TestPackageContainer(t *testing.T) {
|
||||
|
||||
assert.NotEmpty(t, tokenResponse.Token)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)).
|
||||
AddTokenAuth(fmt.Sprintf("Bearer %s", tokenResponse.Token))
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2").
|
||||
AddTokenAuth("Bearer " + tokenResponse.Token)
|
||||
MakeRequest(t, req, expectedStatus)
|
||||
}
|
||||
testCase(auth_model.AccessTokenScopeReadPackage, http.StatusOK, http.StatusOK)
|
||||
@@ -204,17 +205,17 @@ func TestPackageContainer(t *testing.T) {
|
||||
t.Run("DetermineSupport", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)).
|
||||
req := NewRequest(t, "GET", setting.AppURL+"v2").
|
||||
AddTokenAuth(userToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
assert.Equal(t, "registry/2.0", resp.Header().Get("Docker-Distribution-Api-Version"))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)).
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2").
|
||||
AddTokenAuth(readToken)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
assert.Equal(t, "registry/2.0", resp.Header().Get("Docker-Distribution-Api-Version"))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)).
|
||||
req = NewRequest(t, "GET", setting.AppURL+"v2").
|
||||
AddTokenAuth(badToken)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
})
|
||||
@@ -226,15 +227,15 @@ func TestPackageContainer(t *testing.T) {
|
||||
t.Run("UploadBlob/Monolithic", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)).
|
||||
req := NewRequest(t, "POST", url+"/blobs/uploads").
|
||||
AddTokenAuth(anonymousToken)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)).
|
||||
req = NewRequest(t, "POST", url+"/blobs/uploads").
|
||||
AddTokenAuth(readToken)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)).
|
||||
req = NewRequest(t, "POST", url+"/blobs/uploads").
|
||||
AddTokenAuth(badToken)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
@@ -264,15 +265,15 @@ func TestPackageContainer(t *testing.T) {
|
||||
t.Run("UploadBlob/Chunked", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)).
|
||||
req := NewRequest(t, "POST", url+"/blobs/uploads").
|
||||
AddTokenAuth(readToken)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)).
|
||||
req = NewRequest(t, "POST", url+"/blobs/uploads").
|
||||
AddTokenAuth(badToken)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)).
|
||||
req = NewRequest(t, "POST", url+"/blobs/uploads").
|
||||
AddTokenAuth(userToken)
|
||||
resp := MakeRequest(t, req, http.StatusAccepted)
|
||||
|
||||
@@ -325,7 +326,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
t.Run("Cancel", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)).
|
||||
req := NewRequest(t, "POST", url+"/blobs/uploads").
|
||||
AddTokenAuth(userToken)
|
||||
resp := MakeRequest(t, req, http.StatusAccepted)
|
||||
|
||||
@@ -467,7 +468,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
t.Run("HeadManifest", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/unknown-tag", url)).
|
||||
req := NewRequest(t, "HEAD", url+"/manifests/unknown-tag").
|
||||
AddTokenAuth(userToken)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
@@ -475,14 +476,14 @@ func TestPackageContainer(t *testing.T) {
|
||||
AddTokenAuth(userToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
assert.Equal(t, fmt.Sprintf("%d", len(manifestContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, strconv.Itoa(len(manifestContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, manifestDigest, resp.Header().Get("Docker-Content-Digest"))
|
||||
})
|
||||
|
||||
t.Run("GetManifest", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/manifests/unknown-tag", url)).
|
||||
req := NewRequest(t, "GET", url+"/manifests/unknown-tag").
|
||||
AddTokenAuth(userToken)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
@@ -490,7 +491,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
AddTokenAuth(userToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
assert.Equal(t, fmt.Sprintf("%d", len(manifestContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, strconv.Itoa(len(manifestContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, oci.MediaTypeImageManifest, resp.Header().Get("Content-Type"))
|
||||
assert.Equal(t, manifestDigest, resp.Header().Get("Docker-Content-Digest"))
|
||||
assert.Equal(t, manifestContent, resp.Body.String())
|
||||
@@ -512,7 +513,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
AddTokenAuth(userToken)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
assert.Equal(t, fmt.Sprintf("%d", len(untaggedManifestContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, strconv.Itoa(len(untaggedManifestContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, untaggedManifestDigest, resp.Header().Get("Docker-Content-Digest"))
|
||||
|
||||
pv, err := packages_model.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, untaggedManifestDigest)
|
||||
@@ -598,7 +599,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
AddTokenAuth(userToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
assert.Equal(t, fmt.Sprintf("%d", len(blobContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, strconv.Itoa(len(blobContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, blobDigest, resp.Header().Get("Docker-Content-Digest"))
|
||||
|
||||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/blobs/%s", url, blobDigest)).
|
||||
@@ -617,7 +618,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
AddTokenAuth(userToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
assert.Equal(t, fmt.Sprintf("%d", len(blobContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, strconv.Itoa(len(blobContent)), resp.Header().Get("Content-Length"))
|
||||
assert.Equal(t, blobDigest, resp.Header().Get("Docker-Content-Digest"))
|
||||
assert.Equal(t, blobContent, resp.Body.Bytes())
|
||||
})
|
||||
@@ -631,27 +632,27 @@ func TestPackageContainer(t *testing.T) {
|
||||
ExpectedLink string
|
||||
}{
|
||||
{
|
||||
URL: fmt.Sprintf("%s/tags/list", url),
|
||||
URL: url + "/tags/list",
|
||||
ExpectedTags: []string{"latest", "main", "multi"},
|
||||
ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=multi>; rel="next"`, user.Name, image),
|
||||
},
|
||||
{
|
||||
URL: fmt.Sprintf("%s/tags/list?n=0", url),
|
||||
URL: url + "/tags/list?n=0",
|
||||
ExpectedTags: []string{},
|
||||
ExpectedLink: "",
|
||||
},
|
||||
{
|
||||
URL: fmt.Sprintf("%s/tags/list?n=2", url),
|
||||
URL: url + "/tags/list?n=2",
|
||||
ExpectedTags: []string{"latest", "main"},
|
||||
ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=main&n=2>; rel="next"`, user.Name, image),
|
||||
},
|
||||
{
|
||||
URL: fmt.Sprintf("%s/tags/list?last=main", url),
|
||||
URL: url + "/tags/list?last=main",
|
||||
ExpectedTags: []string{"multi"},
|
||||
ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=multi>; rel="next"`, user.Name, image),
|
||||
},
|
||||
{
|
||||
URL: fmt.Sprintf("%s/tags/list?n=1&last=latest", url),
|
||||
URL: url + "/tags/list?n=1&last=latest",
|
||||
ExpectedTags: []string{"main"},
|
||||
ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=main&n=1>; rel="next"`, user.Name, image),
|
||||
},
|
||||
@@ -757,7 +758,7 @@ func TestPackageContainer(t *testing.T) {
|
||||
return func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%sv2/_catalog", setting.AppURL)).
|
||||
req := NewRequest(t, "GET", setting.AppURL+"v2/_catalog").
|
||||
AddTokenAuth(userToken)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
|
||||
@@ -133,8 +133,8 @@ func TestPackageCran(t *testing.T) {
|
||||
assert.Contains(t, resp.Header().Get("Content-Type"), "text/plain")
|
||||
|
||||
body := resp.Body.String()
|
||||
assert.Contains(t, body, fmt.Sprintf("Package: %s", packageName))
|
||||
assert.Contains(t, body, fmt.Sprintf("Version: %s", packageVersion))
|
||||
assert.Contains(t, body, "Package: "+packageName)
|
||||
assert.Contains(t, body, "Version: "+packageVersion)
|
||||
|
||||
req = NewRequest(t, "GET", url+"/src/contrib/PACKAGES.gz").
|
||||
AddBasicAuth(user.Name)
|
||||
@@ -230,8 +230,8 @@ func TestPackageCran(t *testing.T) {
|
||||
assert.Contains(t, resp.Header().Get("Content-Type"), "text/plain")
|
||||
|
||||
body := resp.Body.String()
|
||||
assert.Contains(t, body, fmt.Sprintf("Package: %s", packageName))
|
||||
assert.Contains(t, body, fmt.Sprintf("Version: %s", packageVersion))
|
||||
assert.Contains(t, body, "Package: "+packageName)
|
||||
assert.Contains(t, body, "Version: "+packageVersion)
|
||||
|
||||
req = NewRequest(t, "GET", url+"/bin/windows/contrib/4.2/PACKAGES.gz").
|
||||
AddBasicAuth(user.Name)
|
||||
|
||||
@@ -52,7 +52,7 @@ dependencies:
|
||||
zw := gzip.NewWriter(&buf)
|
||||
archive := tar.NewWriter(zw)
|
||||
archive.WriteHeader(&tar.Header{
|
||||
Name: fmt.Sprintf("%s/Chart.yaml", packageName),
|
||||
Name: packageName + "/Chart.yaml",
|
||||
Mode: 0o600,
|
||||
Size: int64(len(chartContent)),
|
||||
})
|
||||
@@ -122,7 +122,7 @@ dependencies:
|
||||
t.Run("Index", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/index.yaml", url)).
|
||||
req := NewRequest(t, "GET", url+"/index.yaml").
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ func TestPackageNpm(t *testing.T) {
|
||||
|
||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
|
||||
token := fmt.Sprintf("Bearer %s", getTokenForLoggedInUser(t, loginUser(t, user.Name), auth_model.AccessTokenScopeWritePackage))
|
||||
token := "Bearer " + getTokenForLoggedInUser(t, loginUser(t, user.Name), auth_model.AccessTokenScopeWritePackage)
|
||||
|
||||
packageName := "@scope/test-package"
|
||||
packageVersion := "1.0.1-pre"
|
||||
|
||||
@@ -198,7 +198,7 @@ func TestPackageNuGet(t *testing.T) {
|
||||
t.Run(c.Owner, func(t *testing.T) {
|
||||
url := fmt.Sprintf("/api/packages/%s/nuget", c.Owner)
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/index.json", url))
|
||||
req := NewRequest(t, "GET", url+"/index.json")
|
||||
if c.UseBasicAuth {
|
||||
req.AddBasicAuth(user.Name)
|
||||
} else if c.token != "" {
|
||||
@@ -273,7 +273,7 @@ func TestPackageNuGet(t *testing.T) {
|
||||
pb, err := packages.GetBlobByID(db.DefaultContext, pf.BlobID)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(len(content)), pb.Size)
|
||||
case fmt.Sprintf("%s.nuspec", packageName):
|
||||
case packageName + ".nuspec":
|
||||
assert.False(t, pf.IsLead)
|
||||
default:
|
||||
assert.Fail(t, "unexpected filename", "unexpected filename: %v", pf.Name)
|
||||
@@ -319,7 +319,7 @@ func TestPackageNuGet(t *testing.T) {
|
||||
pb, err := packages.GetBlobByID(db.DefaultContext, pf.BlobID)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(len(content)), pb.Size)
|
||||
case fmt.Sprintf("%s.nuspec", packageName):
|
||||
case packageName + ".nuspec":
|
||||
assert.False(t, pf.IsLead)
|
||||
default:
|
||||
assert.Fail(t, "unexpected filename", "unexpected filename: %v", pf.Name)
|
||||
@@ -360,15 +360,15 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
|
||||
return &buf
|
||||
}
|
||||
|
||||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage("unknown-package", "SymbolsPackage")).
|
||||
req := NewRequestWithBody(t, "PUT", url+"/symbolpackage", createSymbolPackage("unknown-package", "SymbolsPackage")).
|
||||
AddBasicAuth(user.Name)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage(packageName, "DummyPackage")).
|
||||
req = NewRequestWithBody(t, "PUT", url+"/symbolpackage", createSymbolPackage(packageName, "DummyPackage")).
|
||||
AddBasicAuth(user.Name)
|
||||
MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage(packageName, "SymbolsPackage")).
|
||||
req = NewRequestWithBody(t, "PUT", url+"/symbolpackage", createSymbolPackage(packageName, "SymbolsPackage")).
|
||||
AddBasicAuth(user.Name)
|
||||
MakeRequest(t, req, http.StatusCreated)
|
||||
|
||||
@@ -400,7 +400,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
|
||||
pb, err := packages.GetBlobByID(db.DefaultContext, pf.BlobID)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(616), pb.Size)
|
||||
case fmt.Sprintf("%s.nuspec", packageName):
|
||||
case packageName + ".nuspec":
|
||||
assert.False(t, pf.IsLead)
|
||||
|
||||
pb, err := packages.GetBlobByID(db.DefaultContext, pf.BlobID)
|
||||
@@ -423,7 +423,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
|
||||
}
|
||||
}
|
||||
|
||||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage(packageName, "SymbolsPackage")).
|
||||
req = NewRequestWithBody(t, "PUT", url+"/symbolpackage", createSymbolPackage(packageName, "SymbolsPackage")).
|
||||
AddBasicAuth(user.Name)
|
||||
MakeRequest(t, req, http.StatusConflict)
|
||||
})
|
||||
@@ -631,7 +631,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
|
||||
})
|
||||
|
||||
t.Run("Next", func(t *testing.T) {
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/Search()?searchTerm='test'&$skip=0&$top=1", url)).
|
||||
req := NewRequest(t, "GET", url+"/Search()?searchTerm='test'&$skip=0&$top=1").
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ func TestPackagePub(t *testing.T) {
|
||||
packageVersion := "1.0.1"
|
||||
packageDescription := "Test Description"
|
||||
|
||||
filename := fmt.Sprintf("%s.tar.gz", packageVersion)
|
||||
filename := packageVersion + ".tar.gz"
|
||||
|
||||
pubspecContent := `name: ` + packageName + `
|
||||
version: ` + packageVersion + `
|
||||
|
||||
@@ -67,7 +67,7 @@ func TestPackagePyPI(t *testing.T) {
|
||||
body, writer, closeFunc := createBasicMultipartFile(filename, packageName, content)
|
||||
|
||||
writer.WriteField("project_urls", "DOCUMENTATION , https://readthedocs.org")
|
||||
writer.WriteField("project_urls", fmt.Sprintf("Home-page, %s", projectURL))
|
||||
writer.WriteField("project_urls", "Home-page, "+projectURL)
|
||||
|
||||
_ = closeFunc()
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ func TestPackageRubyGems(t *testing.T) {
|
||||
root := fmt.Sprintf("/api/packages/%s/rubygems", user.Name)
|
||||
|
||||
uploadFile := func(t *testing.T, content []byte, expectedStatus int) {
|
||||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("%s/api/v1/gems", root), bytes.NewReader(content)).
|
||||
req := NewRequestWithBody(t, "POST", root+"/api/v1/gems", bytes.NewReader(content)).
|
||||
AddBasicAuth(user.Name)
|
||||
MakeRequest(t, req, expectedStatus)
|
||||
}
|
||||
@@ -293,7 +293,7 @@ gAAAAP//MS06Gw==`)
|
||||
|
||||
t.Run("Versions", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/versions", root)).AddBasicAuth(user.Name)
|
||||
req := NewRequest(t, "GET", root+"/versions").AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
assert.Equal(t, `---
|
||||
gitea 1.0.5 08843c2dd0ea19910e6b056b98e38f1c
|
||||
@@ -307,7 +307,7 @@ gitea-another 0.99 8b639e4048d282941485368ec42609be
|
||||
_ = writer.WriteField("gem_name", packageName)
|
||||
_ = writer.WriteField("version", packageVersion)
|
||||
_ = writer.Close()
|
||||
req := NewRequestWithBody(t, "DELETE", fmt.Sprintf("%s/api/v1/gems/yank", root), &body).
|
||||
req := NewRequestWithBody(t, "DELETE", root+"/api/v1/gems/yank", &body).
|
||||
SetHeader("Content-Type", writer.FormDataContentType()).
|
||||
AddBasicAuth(user.Name)
|
||||
MakeRequest(t, req, http.StatusOK)
|
||||
@@ -330,7 +330,7 @@ gitea-another 0.99 8b639e4048d282941485368ec42609be
|
||||
|
||||
t.Run("VersionsAfterDelete", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/versions", root)).AddBasicAuth(user.Name)
|
||||
req := NewRequest(t, "GET", root+"/versions").AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
assert.Equal(t, "---\n", resp.Body.String())
|
||||
})
|
||||
|
||||
@@ -49,7 +49,7 @@ func TestPackageAPI(t *testing.T) {
|
||||
t.Run("ListPackages", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s", user.Name)).
|
||||
req := NewRequest(t, "GET", "/api/v1/packages/"+user.Name).
|
||||
AddTokenAuth(tokenReadPackage)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
@@ -408,7 +408,7 @@ func TestPackageAccess(t *testing.T) {
|
||||
{limitedOrgNoMember, http.StatusOK},
|
||||
{publicOrgNoMember, http.StatusOK},
|
||||
} {
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s", target.Owner.Name)).
|
||||
req := NewRequest(t, "GET", "/api/v1/packages/"+target.Owner.Name).
|
||||
AddTokenAuth(tokenReadPackage)
|
||||
MakeRequest(t, req, target.ExpectedStatus)
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ func TestPackageVagrant(t *testing.T) {
|
||||
packageDescription := "Test Description"
|
||||
packageProvider := "virtualbox"
|
||||
|
||||
filename := fmt.Sprintf("%s.box", packageProvider)
|
||||
filename := packageProvider + ".box"
|
||||
|
||||
infoContent, _ := json.Marshal(map[string]string{
|
||||
"description": packageDescription,
|
||||
@@ -59,7 +59,7 @@ func TestPackageVagrant(t *testing.T) {
|
||||
t.Run("Authenticate", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
authenticateURL := fmt.Sprintf("%s/authenticate", root)
|
||||
authenticateURL := root + "/authenticate"
|
||||
|
||||
req := NewRequest(t, "GET", authenticateURL)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
@@ -193,7 +193,7 @@ func TestAPICreatePullSuccess(t *testing.T) {
|
||||
session := loginUser(t, owner11.Name)
|
||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
|
||||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", owner10.Name, repo10.Name), &api.CreatePullRequestOption{
|
||||
Head: fmt.Sprintf("%s:master", owner11.Name),
|
||||
Head: owner11.Name + ":master",
|
||||
Base: "master",
|
||||
Title: "create a failure pr",
|
||||
}).AddTokenAuth(token)
|
||||
@@ -213,7 +213,7 @@ func TestAPICreatePullBasePermission(t *testing.T) {
|
||||
session := loginUser(t, user4.Name)
|
||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
|
||||
opts := &api.CreatePullRequestOption{
|
||||
Head: fmt.Sprintf("%s:master", repo11.OwnerName),
|
||||
Head: repo11.OwnerName + ":master",
|
||||
Base: "master",
|
||||
Title: "create a failure pr",
|
||||
}
|
||||
@@ -241,7 +241,7 @@ func TestAPICreatePullHeadPermission(t *testing.T) {
|
||||
session := loginUser(t, user4.Name)
|
||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
|
||||
opts := &api.CreatePullRequestOption{
|
||||
Head: fmt.Sprintf("%s:master", repo11.OwnerName),
|
||||
Head: repo11.OwnerName + ":master",
|
||||
Base: "master",
|
||||
Title: "create a failure pr",
|
||||
}
|
||||
@@ -269,7 +269,7 @@ func TestAPICreatePullSameRepoSuccess(t *testing.T) {
|
||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
|
||||
|
||||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", owner.Name, repo.Name), &api.CreatePullRequestOption{
|
||||
Head: fmt.Sprintf("%s:pr-to-update", owner.Name),
|
||||
Head: owner.Name + ":pr-to-update",
|
||||
Base: "master",
|
||||
Title: "successfully create a PR between branches of the same repository",
|
||||
}).AddTokenAuth(token)
|
||||
@@ -290,7 +290,7 @@ func TestAPICreatePullWithFieldsSuccess(t *testing.T) {
|
||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
|
||||
|
||||
opts := &api.CreatePullRequestOption{
|
||||
Head: fmt.Sprintf("%s:master", owner11.Name),
|
||||
Head: owner11.Name + ":master",
|
||||
Base: "master",
|
||||
Title: "create a failure pr",
|
||||
Body: "foobaaar",
|
||||
@@ -328,7 +328,7 @@ func TestAPICreatePullWithFieldsFailure(t *testing.T) {
|
||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
|
||||
|
||||
opts := &api.CreatePullRequestOption{
|
||||
Head: fmt.Sprintf("%s:master", owner11.Name),
|
||||
Head: owner11.Name + ":master",
|
||||
Base: "master",
|
||||
}
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
auth_model "code.gitea.io/gitea/models/auth"
|
||||
@@ -59,7 +59,7 @@ func TestAPIRepoBranchesPlain(t *testing.T) {
|
||||
|
||||
req := NewRequest(t, "POST", link.String()).AddTokenAuth(token)
|
||||
req.Header.Add("Content-Type", "application/json")
|
||||
req.Body = io.NopCloser(bytes.NewBufferString(`{"new_branch_name":"test_branch2", "old_branch_name": "test_branch", "old_ref_name":"refs/heads/test_branch"}`))
|
||||
req.Body = io.NopCloser(strings.NewReader(`{"new_branch_name":"test_branch2", "old_branch_name": "test_branch", "old_ref_name":"refs/heads/test_branch"}`))
|
||||
resp = MakeRequest(t, req, http.StatusCreated)
|
||||
bs, err = io.ReadAll(resp.Body)
|
||||
assert.NoError(t, err)
|
||||
@@ -117,7 +117,7 @@ func TestAPIRepoBranchesMirror(t *testing.T) {
|
||||
|
||||
req := NewRequest(t, "POST", link.String()).AddTokenAuth(token)
|
||||
req.Header.Add("Content-Type", "application/json")
|
||||
req.Body = io.NopCloser(bytes.NewBufferString(`{"new_branch_name":"test_branch2", "old_branch_name": "test_branch", "old_ref_name":"refs/heads/test_branch"}`))
|
||||
req.Body = io.NopCloser(strings.NewReader(`{"new_branch_name":"test_branch2", "old_branch_name": "test_branch", "old_ref_name":"refs/heads/test_branch"}`))
|
||||
resp = MakeRequest(t, req, http.StatusForbidden)
|
||||
bs, err = io.ReadAll(resp.Body)
|
||||
assert.NoError(t, err)
|
||||
|
||||
@@ -45,7 +45,7 @@ func TestAPIUserReposNotLogin(t *testing.T) {
|
||||
func TestAPIUserReposWithWrongToken(t *testing.T) {
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
wrongToken := fmt.Sprintf("Bearer %s", "wrong_token")
|
||||
wrongToken := "Bearer " + "wrong_token"
|
||||
req := NewRequestf(t, "GET", "/api/v1/users/%s/repos", user.Name).
|
||||
AddTokenAuth(wrongToken)
|
||||
resp := MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
@@ -76,7 +76,7 @@ func TestBlockUser(t *testing.T) {
|
||||
blockeeName := "user10"
|
||||
|
||||
t.Run("Block", func(t *testing.T) {
|
||||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName))
|
||||
req := NewRequest(t, "PUT", "/api/v1/user/blocks/"+blockeeName)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
assert.EqualValues(t, 1, countStars(t, blockerID, blockeeID))
|
||||
@@ -84,7 +84,7 @@ func TestBlockUser(t *testing.T) {
|
||||
assert.EqualValues(t, 1, countRepositoryTransfers(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 1, countCollaborations(t, blockerID, blockeeID))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
req = NewRequest(t, "GET", "/api/v1/user/blocks/"+blockeeName).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
@@ -97,15 +97,15 @@ func TestBlockUser(t *testing.T) {
|
||||
assert.EqualValues(t, 0, countRepositoryTransfers(t, blockerID, blockeeID))
|
||||
assert.EqualValues(t, 0, countCollaborations(t, blockerID, blockeeID))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
req = NewRequest(t, "GET", "/api/v1/user/blocks/"+blockeeName).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
req = NewRequest(t, "PUT", "/api/v1/user/blocks/"+blockeeName).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest) // can't block blocked user
|
||||
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/blocks/%s", "org3")).
|
||||
req = NewRequest(t, "PUT", "/api/v1/user/blocks/"+"org3").
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest) // can't block organization
|
||||
|
||||
@@ -124,18 +124,18 @@ func TestBlockUser(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("Unblock", func(t *testing.T) {
|
||||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName))
|
||||
req := NewRequest(t, "DELETE", "/api/v1/user/blocks/"+blockeeName)
|
||||
MakeRequest(t, req, http.StatusUnauthorized)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
req = NewRequest(t, "DELETE", "/api/v1/user/blocks/"+blockeeName).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/blocks/%s", blockeeName)).
|
||||
req = NewRequest(t, "DELETE", "/api/v1/user/blocks/"+blockeeName).
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/blocks/%s", "org3")).
|
||||
req = NewRequest(t, "DELETE", "/api/v1/user/blocks/"+"org3").
|
||||
AddTokenAuth(blockerToken)
|
||||
MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ func TestAPIFollow(t *testing.T) {
|
||||
t.Run("Follow", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/following/%s", user1)).
|
||||
req := NewRequest(t, "PUT", "/api/v1/user/following/"+user1).
|
||||
AddTokenAuth(token2)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
@@ -110,11 +110,11 @@ func TestAPIFollow(t *testing.T) {
|
||||
t.Run("CheckMyFollowing", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/following/%s", user1)).
|
||||
req := NewRequest(t, "GET", "/api/v1/user/following/"+user1).
|
||||
AddTokenAuth(token2)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/following/%s", user2)).
|
||||
req = NewRequest(t, "GET", "/api/v1/user/following/"+user2).
|
||||
AddTokenAuth(token1)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
})
|
||||
@@ -122,7 +122,7 @@ func TestAPIFollow(t *testing.T) {
|
||||
t.Run("Unfollow", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/following/%s", user1)).
|
||||
req := NewRequest(t, "DELETE", "/api/v1/user/following/"+user1).
|
||||
AddTokenAuth(token2)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
})
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
@@ -31,7 +30,7 @@ func TestAPIUserInfo(t *testing.T) {
|
||||
t.Run("GetInfo", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s", user2)).
|
||||
req := NewRequest(t, "GET", "/api/v1/users/"+user2).
|
||||
AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
@@ -39,17 +38,17 @@ func TestAPIUserInfo(t *testing.T) {
|
||||
DecodeJSON(t, resp, &u)
|
||||
assert.Equal(t, user2, u.UserName)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s", user2))
|
||||
req = NewRequest(t, "GET", "/api/v1/users/"+user2)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
// test if the placaholder Mail is returned if a User is not logged in
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s", org3.Name))
|
||||
req = NewRequest(t, "GET", "/api/v1/users/"+org3.Name)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
DecodeJSON(t, resp, &u)
|
||||
assert.Equal(t, org3.GetPlaceholderEmail(), u.Email)
|
||||
|
||||
// Test if the correct Mail is returned if a User is logged in
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s", org3.Name)).
|
||||
req = NewRequest(t, "GET", "/api/v1/users/"+org3.Name).
|
||||
AddTokenAuth(token)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
DecodeJSON(t, resp, &u)
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
@@ -55,7 +54,7 @@ func TestAPIUserSecrets(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, c := range cases {
|
||||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/user/actions/secrets/%s", c.Name), api.CreateOrUpdateSecretOption{
|
||||
req := NewRequestWithJSON(t, "PUT", "/api/v1/user/actions/secrets/"+c.Name, api.CreateOrUpdateSecretOption{
|
||||
Data: "data",
|
||||
}).AddTokenAuth(token)
|
||||
MakeRequest(t, req, c.ExpectedStatus)
|
||||
@@ -64,7 +63,7 @@ func TestAPIUserSecrets(t *testing.T) {
|
||||
|
||||
t.Run("Update", func(t *testing.T) {
|
||||
name := "update_secret"
|
||||
url := fmt.Sprintf("/api/v1/user/actions/secrets/%s", name)
|
||||
url := "/api/v1/user/actions/secrets/" + name
|
||||
|
||||
req := NewRequestWithJSON(t, "PUT", url, api.CreateOrUpdateSecretOption{
|
||||
Data: "initial",
|
||||
@@ -79,7 +78,7 @@ func TestAPIUserSecrets(t *testing.T) {
|
||||
|
||||
t.Run("Delete", func(t *testing.T) {
|
||||
name := "delete_secret"
|
||||
url := fmt.Sprintf("/api/v1/user/actions/secrets/%s", name)
|
||||
url := "/api/v1/user/actions/secrets/" + name
|
||||
|
||||
req := NewRequestWithJSON(t, "PUT", url, api.CreateOrUpdateSecretOption{
|
||||
Data: "initial",
|
||||
|
||||
@@ -32,13 +32,13 @@ func TestAPIStar(t *testing.T) {
|
||||
t.Run("Star", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||
req := NewRequest(t, "PUT", "/api/v1/user/starred/"+repo).
|
||||
AddTokenAuth(tokenWithUserScope)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
// blocked user can't star a repo
|
||||
user34 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 34})
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||
req = NewRequest(t, "PUT", "/api/v1/user/starred/"+repo).
|
||||
AddTokenAuth(getUserToken(t, user34.Name, auth_model.AccessTokenScopeWriteRepository))
|
||||
MakeRequest(t, req, http.StatusForbidden)
|
||||
})
|
||||
@@ -76,11 +76,11 @@ func TestAPIStar(t *testing.T) {
|
||||
t.Run("IsStarring", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||
req := NewRequest(t, "GET", "/api/v1/user/starred/"+repo).
|
||||
AddTokenAuth(tokenWithUserScope)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred/%s", repo+"notexisting")).
|
||||
req = NewRequest(t, "GET", "/api/v1/user/starred/"+repo+"notexisting").
|
||||
AddTokenAuth(tokenWithUserScope)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
})
|
||||
@@ -88,7 +88,7 @@ func TestAPIStar(t *testing.T) {
|
||||
t.Run("Unstar", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||
req := NewRequest(t, "DELETE", "/api/v1/user/starred/"+repo).
|
||||
AddTokenAuth(tokenWithUserScope)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
})
|
||||
@@ -109,12 +109,12 @@ func TestAPIStarDisabled(t *testing.T) {
|
||||
t.Run("Star", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||
req := NewRequest(t, "PUT", "/api/v1/user/starred/"+repo).
|
||||
AddTokenAuth(tokenWithUserScope)
|
||||
MakeRequest(t, req, http.StatusForbidden)
|
||||
|
||||
user34 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 34})
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||
req = NewRequest(t, "PUT", "/api/v1/user/starred/"+repo).
|
||||
AddTokenAuth(getUserToken(t, user34.Name, auth_model.AccessTokenScopeWriteRepository))
|
||||
MakeRequest(t, req, http.StatusForbidden)
|
||||
})
|
||||
@@ -138,11 +138,11 @@ func TestAPIStarDisabled(t *testing.T) {
|
||||
t.Run("IsStarring", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||
req := NewRequest(t, "GET", "/api/v1/user/starred/"+repo).
|
||||
AddTokenAuth(tokenWithUserScope)
|
||||
MakeRequest(t, req, http.StatusForbidden)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred/%s", repo+"notexisting")).
|
||||
req = NewRequest(t, "GET", "/api/v1/user/starred/"+repo+"notexisting").
|
||||
AddTokenAuth(tokenWithUserScope)
|
||||
MakeRequest(t, req, http.StatusForbidden)
|
||||
})
|
||||
@@ -150,7 +150,7 @@ func TestAPIStarDisabled(t *testing.T) {
|
||||
t.Run("Unstar", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||
req := NewRequest(t, "DELETE", "/api/v1/user/starred/"+repo).
|
||||
AddTokenAuth(tokenWithUserScope)
|
||||
MakeRequest(t, req, http.StatusForbidden)
|
||||
})
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
@@ -63,7 +62,7 @@ func TestAPIUserVariables(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, c := range cases {
|
||||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/user/actions/variables/%s", c.Name), api.CreateVariableOption{
|
||||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/actions/variables/"+c.Name, api.CreateVariableOption{
|
||||
Value: "value",
|
||||
}).AddTokenAuth(token)
|
||||
MakeRequest(t, req, c.ExpectedStatus)
|
||||
@@ -72,7 +71,7 @@ func TestAPIUserVariables(t *testing.T) {
|
||||
|
||||
t.Run("UpdateUserVariable", func(t *testing.T) {
|
||||
variableName := "test_update_var"
|
||||
url := fmt.Sprintf("/api/v1/user/actions/variables/%s", variableName)
|
||||
url := "/api/v1/user/actions/variables/" + variableName
|
||||
req := NewRequestWithJSON(t, "POST", url, api.CreateVariableOption{
|
||||
Value: "initial_val",
|
||||
}).AddTokenAuth(token)
|
||||
@@ -118,7 +117,7 @@ func TestAPIUserVariables(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, c := range cases {
|
||||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/user/actions/variables/%s", c.Name), api.UpdateVariableOption{
|
||||
req := NewRequestWithJSON(t, "PUT", "/api/v1/user/actions/variables/"+c.Name, api.UpdateVariableOption{
|
||||
Name: c.UpdateName,
|
||||
Value: "updated_val",
|
||||
}).AddTokenAuth(token)
|
||||
@@ -128,7 +127,7 @@ func TestAPIUserVariables(t *testing.T) {
|
||||
|
||||
t.Run("DeleteRepoVariable", func(t *testing.T) {
|
||||
variableName := "test_delete_var"
|
||||
url := fmt.Sprintf("/api/v1/user/actions/variables/%s", variableName)
|
||||
url := "/api/v1/user/actions/variables/" + variableName
|
||||
|
||||
req := NewRequestWithJSON(t, "POST", url, api.CreateVariableOption{
|
||||
Value: "initial_val",
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
@@ -34,7 +33,7 @@ func TestUserDeleteAccount(t *testing.T) {
|
||||
|
||||
session := loginUser(t, "user8")
|
||||
csrf := GetUserCSRFToken(t, session)
|
||||
urlStr := fmt.Sprintf("/user/settings/account/delete?password=%s", userPassword)
|
||||
urlStr := "/user/settings/account/delete?password=" + userPassword
|
||||
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
|
||||
"_csrf": csrf,
|
||||
})
|
||||
@@ -49,7 +48,7 @@ func TestUserDeleteAccountStillOwnRepos(t *testing.T) {
|
||||
|
||||
session := loginUser(t, "user2")
|
||||
csrf := GetUserCSRFToken(t, session)
|
||||
urlStr := fmt.Sprintf("/user/settings/account/delete?password=%s", userPassword)
|
||||
urlStr := "/user/settings/account/delete?password=" + userPassword
|
||||
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
|
||||
"_csrf": csrf,
|
||||
})
|
||||
|
||||
@@ -12,6 +12,7 @@ import (
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"path"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
@@ -227,7 +228,7 @@ func TestWebGitCommitEmail(t *testing.T) {
|
||||
body := &bytes.Buffer{}
|
||||
uploadForm := multipart.NewWriter(body)
|
||||
file, _ := uploadForm.CreateFormFile("file", name)
|
||||
_, _ = io.Copy(file, bytes.NewBufferString(content))
|
||||
_, _ = io.Copy(file, strings.NewReader(content))
|
||||
_ = uploadForm.WriteField("_csrf", GetUserCSRFToken(t, session))
|
||||
_ = uploadForm.Close()
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ import (
|
||||
"mime/multipart"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
auth_model "code.gitea.io/gitea/models/auth"
|
||||
@@ -130,7 +131,7 @@ func TestEmptyRepoUploadFile(t *testing.T) {
|
||||
mpForm := multipart.NewWriter(body)
|
||||
_ = mpForm.WriteField("_csrf", GetUserCSRFToken(t, session))
|
||||
file, _ := mpForm.CreateFormFile("file", "uploaded-file.txt")
|
||||
_, _ = io.Copy(file, bytes.NewBufferString("newly-uploaded-test-file"))
|
||||
_, _ = io.Copy(file, strings.NewReader("newly-uploaded-test-file"))
|
||||
_ = mpForm.Close()
|
||||
|
||||
req = NewRequestWithBody(t, "POST", "/user30/empty/upload-file", body)
|
||||
|
||||
@@ -592,7 +592,7 @@ func doPushCreate(ctx APITestContext, u *url.URL) func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
// create a context for a currently non-existent repository
|
||||
ctx.Reponame = fmt.Sprintf("repo-tmp-push-create-%s", u.Scheme)
|
||||
ctx.Reponame = "repo-tmp-push-create-" + u.Scheme
|
||||
u.Path = ctx.GitPath()
|
||||
|
||||
// Create a temporary directory
|
||||
@@ -623,7 +623,7 @@ func doPushCreate(ctx APITestContext, u *url.URL) func(t *testing.T) {
|
||||
|
||||
// Now add a remote that is invalid to "Push To Create"
|
||||
invalidCtx := ctx
|
||||
invalidCtx.Reponame = fmt.Sprintf("invalid/repo-tmp-push-create-%s", u.Scheme)
|
||||
invalidCtx.Reponame = "invalid/repo-tmp-push-create-" + u.Scheme
|
||||
u.Path = invalidCtx.GitPath()
|
||||
t.Run("AddInvalidRemote", doGitAddRemote(tmpDir, "invalid", u))
|
||||
|
||||
|
||||
@@ -123,7 +123,7 @@ func doGitInitTestRepository(dstPath string) func(*testing.T) {
|
||||
// forcibly set default branch to master
|
||||
_, _, err := git.NewCommand("symbolic-ref", "HEAD", git.BranchPrefix+"master").RunStdString(git.DefaultContext, &git.RunOpts{Dir: dstPath})
|
||||
assert.NoError(t, err)
|
||||
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", dstPath)), 0o644))
|
||||
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, "README.md"), []byte("# Testing Repository\n\nOriginally created in: "+dstPath), 0o644))
|
||||
assert.NoError(t, git.AddChanges(dstPath, true))
|
||||
signature := git.Signature{
|
||||
Email: "test@example.com",
|
||||
@@ -163,7 +163,7 @@ func doGitAddSomeCommits(dstPath, branch string) func(*testing.T) {
|
||||
return func(t *testing.T) {
|
||||
doGitCheckoutBranch(dstPath, branch)(t)
|
||||
|
||||
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, fmt.Sprintf("file-%s.txt", branch)), []byte(fmt.Sprintf("file %s", branch)), 0o644))
|
||||
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, fmt.Sprintf("file-%s.txt", branch)), []byte("file "+branch), 0o644))
|
||||
assert.NoError(t, git.AddChanges(dstPath, true))
|
||||
signature := git.Signature{
|
||||
Email: "test@test.test",
|
||||
@@ -172,7 +172,7 @@ func doGitAddSomeCommits(dstPath, branch string) func(*testing.T) {
|
||||
assert.NoError(t, git.CommitChanges(dstPath, git.CommitChangesOptions{
|
||||
Committer: &signature,
|
||||
Author: &signature,
|
||||
Message: fmt.Sprintf("update %s", branch),
|
||||
Message: "update " + branch,
|
||||
}))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -238,7 +238,7 @@ func crudActionCreateFile(_ *testing.T, ctx APITestContext, user *user_model.Use
|
||||
Email: user.Email,
|
||||
},
|
||||
},
|
||||
ContentBase64: base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("This is new text for %s", path))),
|
||||
ContentBase64: base64.StdEncoding.EncodeToString([]byte("This is new text for " + path)),
|
||||
}, callback...)
|
||||
}
|
||||
|
||||
|
||||
@@ -310,7 +310,7 @@ func NewRequestWithValues(t testing.TB, method, urlStr string, values map[string
|
||||
|
||||
func NewRequestWithURLValues(t testing.TB, method, urlStr string, urlValues url.Values) *RequestWrapper {
|
||||
t.Helper()
|
||||
return NewRequestWithBody(t, method, urlStr, bytes.NewBufferString(urlValues.Encode())).
|
||||
return NewRequestWithBody(t, method, urlStr, strings.NewReader(urlValues.Encode())).
|
||||
SetHeader("Content-Type", "application/x-www-form-urlencoded")
|
||||
}
|
||||
|
||||
|
||||
@@ -195,21 +195,21 @@ func TestEditIssue(t *testing.T) {
|
||||
session := loginUser(t, "user2")
|
||||
issueURL := testNewIssue(t, session, "user2", "repo1", "Title", "Description")
|
||||
|
||||
req := NewRequestWithValues(t, "POST", fmt.Sprintf("%s/content", issueURL), map[string]string{
|
||||
req := NewRequestWithValues(t, "POST", issueURL+"/content", map[string]string{
|
||||
"_csrf": GetUserCSRFToken(t, session),
|
||||
"content": "modified content",
|
||||
"context": fmt.Sprintf("/%s/%s", "user2", "repo1"),
|
||||
})
|
||||
session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
req = NewRequestWithValues(t, "POST", fmt.Sprintf("%s/content", issueURL), map[string]string{
|
||||
req = NewRequestWithValues(t, "POST", issueURL+"/content", map[string]string{
|
||||
"_csrf": GetUserCSRFToken(t, session),
|
||||
"content": "modified content",
|
||||
"context": fmt.Sprintf("/%s/%s", "user2", "repo1"),
|
||||
})
|
||||
session.MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
req = NewRequestWithValues(t, "POST", fmt.Sprintf("%s/content", issueURL), map[string]string{
|
||||
req = NewRequestWithValues(t, "POST", issueURL+"/content", map[string]string{
|
||||
"_csrf": GetUserCSRFToken(t, session),
|
||||
"content": "modified content",
|
||||
"content_version": "1",
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -41,55 +40,55 @@ func TestDetermineLocalEndpoint(t *testing.T) {
|
||||
{
|
||||
cloneurl: root,
|
||||
lfsurl: "",
|
||||
expected: str2url(fmt.Sprintf("file://%s", root)),
|
||||
expected: str2url("file://" + root),
|
||||
},
|
||||
// case 1
|
||||
{
|
||||
cloneurl: root,
|
||||
lfsurl: lfsroot,
|
||||
expected: str2url(fmt.Sprintf("file://%s", lfsroot)),
|
||||
expected: str2url("file://" + lfsroot),
|
||||
},
|
||||
// case 2
|
||||
{
|
||||
cloneurl: "https://git.com/repo.git",
|
||||
lfsurl: lfsroot,
|
||||
expected: str2url(fmt.Sprintf("file://%s", lfsroot)),
|
||||
expected: str2url("file://" + lfsroot),
|
||||
},
|
||||
// case 3
|
||||
{
|
||||
cloneurl: rootdotgit,
|
||||
lfsurl: "",
|
||||
expected: str2url(fmt.Sprintf("file://%s", filepath.Join(rootdotgit, ".git"))),
|
||||
expected: str2url("file://" + filepath.Join(rootdotgit, ".git")),
|
||||
},
|
||||
// case 4
|
||||
{
|
||||
cloneurl: "",
|
||||
lfsurl: rootdotgit,
|
||||
expected: str2url(fmt.Sprintf("file://%s", filepath.Join(rootdotgit, ".git"))),
|
||||
expected: str2url("file://" + filepath.Join(rootdotgit, ".git")),
|
||||
},
|
||||
// case 5
|
||||
{
|
||||
cloneurl: rootdotgit,
|
||||
lfsurl: rootdotgit,
|
||||
expected: str2url(fmt.Sprintf("file://%s", filepath.Join(rootdotgit, ".git"))),
|
||||
expected: str2url("file://" + filepath.Join(rootdotgit, ".git")),
|
||||
},
|
||||
// case 6
|
||||
{
|
||||
cloneurl: fmt.Sprintf("file://%s", root),
|
||||
cloneurl: "file://" + root,
|
||||
lfsurl: "",
|
||||
expected: str2url(fmt.Sprintf("file://%s", root)),
|
||||
expected: str2url("file://" + root),
|
||||
},
|
||||
// case 7
|
||||
{
|
||||
cloneurl: fmt.Sprintf("file://%s", root),
|
||||
lfsurl: fmt.Sprintf("file://%s", lfsroot),
|
||||
expected: str2url(fmt.Sprintf("file://%s", lfsroot)),
|
||||
cloneurl: "file://" + root,
|
||||
lfsurl: "file://" + lfsroot,
|
||||
expected: str2url("file://" + lfsroot),
|
||||
},
|
||||
// case 8
|
||||
{
|
||||
cloneurl: root,
|
||||
lfsurl: fmt.Sprintf("file://%s", lfsroot),
|
||||
expected: str2url(fmt.Sprintf("file://%s", lfsroot)),
|
||||
lfsurl: "file://" + lfsroot,
|
||||
expected: str2url("file://" + lfsroot),
|
||||
},
|
||||
// case 9
|
||||
{
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"testing"
|
||||
|
||||
auth_model "code.gitea.io/gitea/models/auth"
|
||||
@@ -95,7 +96,7 @@ func TestMigrateGiteaForm(t *testing.T) {
|
||||
"issues": "on",
|
||||
"repo_name": migratedRepoName,
|
||||
"description": "",
|
||||
"uid": fmt.Sprintf("%d", repoOwner.ID),
|
||||
"uid": strconv.FormatInt(repoOwner.ID, 10),
|
||||
})
|
||||
resp = session.MakeRequest(t, req, http.StatusSeeOther)
|
||||
// Step 5: a redirection displays the migrated repository
|
||||
|
||||
@@ -140,10 +140,10 @@ func restoreOldDB(t *testing.T, version string) {
|
||||
assert.NoError(t, err)
|
||||
defer db.Close()
|
||||
|
||||
_, err = db.Exec(fmt.Sprintf("DROP DATABASE IF EXISTS %s", setting.Database.Name))
|
||||
_, err = db.Exec("DROP DATABASE IF EXISTS " + setting.Database.Name)
|
||||
assert.NoError(t, err)
|
||||
|
||||
_, err = db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", setting.Database.Name))
|
||||
_, err = db.Exec("CREATE DATABASE IF NOT EXISTS " + setting.Database.Name)
|
||||
assert.NoError(t, err)
|
||||
db.Close()
|
||||
|
||||
@@ -170,10 +170,10 @@ func restoreOldDB(t *testing.T, version string) {
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
_, err = db.Exec(fmt.Sprintf("DROP DATABASE IF EXISTS %s", setting.Database.Name))
|
||||
_, err = db.Exec("DROP DATABASE IF EXISTS " + setting.Database.Name)
|
||||
assert.NoError(t, err)
|
||||
|
||||
_, err = db.Exec(fmt.Sprintf("CREATE DATABASE %s", setting.Database.Name))
|
||||
_, err = db.Exec("CREATE DATABASE " + setting.Database.Name)
|
||||
assert.NoError(t, err)
|
||||
db.Close()
|
||||
|
||||
@@ -195,7 +195,7 @@ func restoreOldDB(t *testing.T, version string) {
|
||||
|
||||
if !schrows.Next() {
|
||||
// Create and setup a DB schema
|
||||
_, err = db.Exec(fmt.Sprintf("CREATE SCHEMA %s", setting.Database.Schema))
|
||||
_, err = db.Exec("CREATE SCHEMA " + setting.Database.Schema)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
schrows.Close()
|
||||
|
||||
@@ -58,7 +58,7 @@ func TestOrgTeamEmailInvite(t *testing.T) {
|
||||
session = loginUser(t, user.Name)
|
||||
|
||||
// join the team
|
||||
inviteURL := fmt.Sprintf("/org/invite/%s", invites[0].Token)
|
||||
inviteURL := "/org/invite/" + invites[0].Token
|
||||
csrf = GetUserCSRFToken(t, session)
|
||||
req = NewRequestWithValues(t, "POST", inviteURL, map[string]string{
|
||||
"_csrf": csrf,
|
||||
@@ -108,8 +108,8 @@ func TestOrgTeamEmailInviteRedirectsExistingUser(t *testing.T) {
|
||||
assert.Len(t, invites, 1)
|
||||
|
||||
// accept the invite
|
||||
inviteURL := fmt.Sprintf("/org/invite/%s", invites[0].Token)
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/user/login?redirect_to=%s", url.QueryEscape(inviteURL)))
|
||||
inviteURL := "/org/invite/" + invites[0].Token
|
||||
req = NewRequest(t, "GET", "/user/login?redirect_to="+url.QueryEscape(inviteURL))
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
doc := NewHTMLParser(t, resp.Body)
|
||||
@@ -179,8 +179,8 @@ func TestOrgTeamEmailInviteRedirectsNewUser(t *testing.T) {
|
||||
assert.Len(t, invites, 1)
|
||||
|
||||
// accept the invite
|
||||
inviteURL := fmt.Sprintf("/org/invite/%s", invites[0].Token)
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/user/sign_up?redirect_to=%s", url.QueryEscape(inviteURL)))
|
||||
inviteURL := "/org/invite/" + invites[0].Token
|
||||
req = NewRequest(t, "GET", "/user/sign_up?redirect_to="+url.QueryEscape(inviteURL))
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
doc := NewHTMLParser(t, resp.Body)
|
||||
@@ -260,8 +260,8 @@ func TestOrgTeamEmailInviteRedirectsNewUserWithActivation(t *testing.T) {
|
||||
// new user: accept the invite
|
||||
session = emptyTestSession(t)
|
||||
|
||||
inviteURL := fmt.Sprintf("/org/invite/%s", invites[0].Token)
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/user/sign_up?redirect_to=%s", url.QueryEscape(inviteURL)))
|
||||
inviteURL := "/org/invite/" + invites[0].Token
|
||||
req = NewRequest(t, "GET", "/user/sign_up?redirect_to="+url.QueryEscape(inviteURL))
|
||||
session.MakeRequest(t, req, http.StatusOK)
|
||||
req = NewRequestWithValues(t, "POST", "/user/sign_up", map[string]string{
|
||||
"user_name": "doesnotexist",
|
||||
@@ -275,7 +275,7 @@ func TestOrgTeamEmailInviteRedirectsNewUserWithActivation(t *testing.T) {
|
||||
assert.NoError(t, err)
|
||||
|
||||
activationCode := user_model.GenerateUserTimeLimitCode(&user_model.TimeLimitCodeOptions{Purpose: user_model.TimeLimitCodeActivateAccount}, user)
|
||||
activateURL := fmt.Sprintf("/user/activate?code=%s", activationCode)
|
||||
activateURL := "/user/activate?code=" + activationCode
|
||||
req = NewRequestWithValues(t, "POST", activateURL, map[string]string{
|
||||
"password": "examplePassword!1",
|
||||
})
|
||||
@@ -337,8 +337,8 @@ func TestOrgTeamEmailInviteRedirectsExistingUserWithLogin(t *testing.T) {
|
||||
session = loginUser(t, "user5")
|
||||
|
||||
// accept the invite (note: this uses the sign_up url)
|
||||
inviteURL := fmt.Sprintf("/org/invite/%s", invites[0].Token)
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/user/sign_up?redirect_to=%s", url.QueryEscape(inviteURL)))
|
||||
inviteURL := "/org/invite/" + invites[0].Token
|
||||
req = NewRequest(t, "GET", "/user/sign_up?redirect_to="+url.QueryEscape(inviteURL))
|
||||
resp = session.MakeRequest(t, req, http.StatusSeeOther)
|
||||
assert.Equal(t, inviteURL, test.RedirectURL(resp))
|
||||
|
||||
|
||||
@@ -151,7 +151,7 @@ func TestOrgRestrictedUser(t *testing.T) {
|
||||
|
||||
// assert restrictedUser cannot see the org or the public repo
|
||||
restrictedSession := loginUser(t, restrictedUser)
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/%s", orgName))
|
||||
req := NewRequest(t, "GET", "/"+orgName)
|
||||
restrictedSession.MakeRequest(t, req, http.StatusNotFound)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s", orgName, repoName))
|
||||
@@ -188,7 +188,7 @@ func TestOrgRestrictedUser(t *testing.T) {
|
||||
_ = adminSession.MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
// Now we need to check if the restrictedUser can access the repo
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/%s", orgName))
|
||||
req = NewRequest(t, "GET", "/"+orgName)
|
||||
restrictedSession.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s", orgName, repoName))
|
||||
|
||||
@@ -110,7 +110,7 @@ func TestPullCompare_EnableAllowEditsFromMaintainer(t *testing.T) {
|
||||
|
||||
// user2 (admin of repo3) goes to the PR files page
|
||||
user2Session := loginUser(t, "user2")
|
||||
resp = user2Session.MakeRequest(t, NewRequest(t, "GET", fmt.Sprintf("%s/files", prURL)), http.StatusOK)
|
||||
resp = user2Session.MakeRequest(t, NewRequest(t, "GET", prURL+"/files"), http.StatusOK)
|
||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||
nodes := htmlDoc.doc.Find(".diff-file-box[data-new-filename=\"README.md\"] .diff-file-header-actions .tippy-target a")
|
||||
if assert.Equal(t, 1, nodes.Length()) {
|
||||
@@ -127,14 +127,14 @@ func TestPullCompare_EnableAllowEditsFromMaintainer(t *testing.T) {
|
||||
htmlDoc = NewHTMLParser(t, resp.Body)
|
||||
dataURL, exists := htmlDoc.doc.Find("#allow-edits-from-maintainers").Attr("data-url")
|
||||
assert.True(t, exists)
|
||||
req := NewRequestWithValues(t, "POST", fmt.Sprintf("%s/set_allow_maintainer_edit", dataURL), map[string]string{
|
||||
req := NewRequestWithValues(t, "POST", dataURL+"/set_allow_maintainer_edit", map[string]string{
|
||||
"_csrf": htmlDoc.GetCSRF(),
|
||||
"allow_maintainer_edit": "true",
|
||||
})
|
||||
user4Session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
// user2 (admin of repo3) goes to the PR files page again
|
||||
resp = user2Session.MakeRequest(t, NewRequest(t, "GET", fmt.Sprintf("%s/files", prURL)), http.StatusOK)
|
||||
resp = user2Session.MakeRequest(t, NewRequest(t, "GET", prURL+"/files"), http.StatusOK)
|
||||
htmlDoc = NewHTMLParser(t, resp.Body)
|
||||
nodes = htmlDoc.doc.Find(".diff-file-box[data-new-filename=\"README.md\"] .diff-file-header-actions .tippy-target a")
|
||||
if assert.Equal(t, 2, nodes.Length()) {
|
||||
|
||||
@@ -293,10 +293,10 @@ func TestCreatePullWhenBlocked(t *testing.T) {
|
||||
// sessionBase := loginUser(t, "user2")
|
||||
token := getUserToken(t, RepoOwner, auth_model.AccessTokenScopeWriteUser)
|
||||
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/blocks/%s", ForkOwner)).
|
||||
req := NewRequest(t, "GET", "/api/v1/user/blocks/"+ForkOwner).
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/blocks/%s", ForkOwner)).
|
||||
req = NewRequest(t, "PUT", "/api/v1/user/blocks/"+ForkOwner).
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
|
||||
@@ -308,7 +308,7 @@ func TestCreatePullWhenBlocked(t *testing.T) {
|
||||
|
||||
// Teardown
|
||||
// Unblock user
|
||||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/blocks/%s", ForkOwner)).
|
||||
req = NewRequest(t, "DELETE", "/api/v1/user/blocks/"+ForkOwner).
|
||||
AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusNoContent)
|
||||
})
|
||||
|
||||
@@ -296,7 +296,7 @@ func TestCantMergeUnrelated(t *testing.T) {
|
||||
err := git.NewCommand("read-tree", "--empty").Run(git.DefaultContext, &git.RunOpts{Dir: path})
|
||||
assert.NoError(t, err)
|
||||
|
||||
stdin := bytes.NewBufferString("Unrelated File")
|
||||
stdin := strings.NewReader("Unrelated File")
|
||||
var stdout strings.Builder
|
||||
err = git.NewCommand("hash-object", "-w", "--stdin").Run(git.DefaultContext, &git.RunOpts{
|
||||
Dir: path,
|
||||
|
||||
@@ -138,7 +138,7 @@ func TestCreateBranchInvalidCSRF(t *testing.T) {
|
||||
}
|
||||
|
||||
func prepareRecentlyPushedBranchTest(t *testing.T, headSession *TestSession, baseRepo, headRepo *repo_model.Repository) {
|
||||
refSubURL := fmt.Sprintf("branch/%s", headRepo.DefaultBranch)
|
||||
refSubURL := "branch/" + headRepo.DefaultBranch
|
||||
baseRepoPath := baseRepo.OwnerName + "/" + baseRepo.Name
|
||||
headRepoPath := headRepo.OwnerName + "/" + headRepo.Name
|
||||
// Case 1: Normal branch changeset to display pushed message
|
||||
@@ -168,7 +168,7 @@ func prepareRecentlyPushedBranchTest(t *testing.T, headSession *TestSession, bas
|
||||
}
|
||||
|
||||
func prepareRecentlyPushedBranchSpecialTest(t *testing.T, session *TestSession, baseRepo, headRepo *repo_model.Repository) {
|
||||
refSubURL := fmt.Sprintf("branch/%s", headRepo.DefaultBranch)
|
||||
refSubURL := "branch/" + headRepo.DefaultBranch
|
||||
baseRepoPath := baseRepo.OwnerName + "/" + baseRepo.Name
|
||||
headRepoPath := headRepo.OwnerName + "/" + headRepo.Name
|
||||
// create branch with no new commit
|
||||
@@ -196,7 +196,7 @@ func testCreatePullToDefaultBranch(t *testing.T, session *TestSession, baseRepo,
|
||||
}
|
||||
|
||||
func prepareRepoPR(t *testing.T, baseSession, headSession *TestSession, baseRepo, headRepo *repo_model.Repository) {
|
||||
refSubURL := fmt.Sprintf("branch/%s", headRepo.DefaultBranch)
|
||||
refSubURL := "branch/" + headRepo.DefaultBranch
|
||||
testCreateBranch(t, headSession, headRepo.OwnerName, headRepo.Name, refSubURL, "new-commit", http.StatusSeeOther)
|
||||
|
||||
// create opening PR
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strconv"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models/db"
|
||||
@@ -46,7 +47,7 @@ func testRepoFork(t *testing.T, session *TestSession, ownerName, repoName, forkO
|
||||
assert.True(t, exists, "Fork owner '%s' is not present in select box", forkOwnerName)
|
||||
req = NewRequestWithValues(t, "POST", link, map[string]string{
|
||||
"_csrf": htmlDoc.GetCSRF(),
|
||||
"uid": fmt.Sprintf("%d", forkOwner.ID),
|
||||
"uid": strconv.FormatInt(forkOwner.ID, 10),
|
||||
"repo_name": forkRepoName,
|
||||
"fork_single_branch": forkBranch,
|
||||
})
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
@@ -44,7 +45,7 @@ func testRepoGenerate(t *testing.T, session *TestSession, templateID, templateOw
|
||||
assert.True(t, exists, "Generate owner '%s' is not present in select box", generateOwnerName)
|
||||
req = NewRequestWithValues(t, "POST", link, map[string]string{
|
||||
"_csrf": htmlDoc.GetCSRF(),
|
||||
"uid": fmt.Sprintf("%d", generateOwner.ID),
|
||||
"uid": strconv.FormatInt(generateOwner.ID, 10),
|
||||
"repo_name": generateRepoName,
|
||||
"repo_template": templateID,
|
||||
"git_content": "true",
|
||||
|
||||
@@ -660,7 +660,7 @@ jobs:
|
||||
- run: echo 'cmd 1'
|
||||
- run: echo 'cmd 2'
|
||||
`
|
||||
opts := getWorkflowCreateFileOptions(user2, repo1.DefaultBranch, fmt.Sprintf("create %s", wfTreePath), wfFileContent)
|
||||
opts := getWorkflowCreateFileOptions(user2, repo1.DefaultBranch, "create "+wfTreePath, wfFileContent)
|
||||
createWorkflowFile(t, token, "user2", "repo1", wfTreePath, opts)
|
||||
|
||||
commitID, err := gitRepo1.GetBranchCommitID(repo1.DefaultBranch)
|
||||
|
||||
@@ -51,7 +51,7 @@ func testPushDeployKeyOnEmptyRepo(t *testing.T, u *url.URL) {
|
||||
ctx := NewAPITestContext(t, "user2", "deploy-key-empty-repo-1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
|
||||
ctxWithDeleteRepo := NewAPITestContext(t, "user2", "deploy-key-empty-repo-1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
|
||||
|
||||
keyname := fmt.Sprintf("%s-push", ctx.Reponame)
|
||||
keyname := ctx.Reponame + "-push"
|
||||
u.Path = ctx.GitPath()
|
||||
|
||||
t.Run("CreateEmptyRepository", doAPICreateRepository(ctx, true))
|
||||
@@ -89,7 +89,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
|
||||
reponame := "ssh-key-test-repo"
|
||||
username := "user2"
|
||||
u.Path = fmt.Sprintf("%s/%s.git", username, reponame)
|
||||
keyname := fmt.Sprintf("%s-push", reponame)
|
||||
keyname := reponame + "-push"
|
||||
|
||||
// OK login
|
||||
ctx := NewAPITestContext(t, username, reponame, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
|
||||
|
||||
@@ -5,7 +5,6 @@ package integration
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"image/png"
|
||||
"io"
|
||||
"mime/multipart"
|
||||
@@ -84,9 +83,9 @@ func TestUserAvatar(t *testing.T) {
|
||||
}
|
||||
|
||||
func testGetAvatarRedirect(t *testing.T, user *user_model.User) {
|
||||
t.Run(fmt.Sprintf("getAvatarRedirect_%s", user.Name), func(t *testing.T) {
|
||||
t.Run("getAvatarRedirect_"+user.Name, func(t *testing.T) {
|
||||
req := NewRequestf(t, "GET", "/%s.png", user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusSeeOther)
|
||||
assert.Equal(t, fmt.Sprintf("/avatars/%s", user.Avatar), resp.Header().Get("location"))
|
||||
assert.Equal(t, "/avatars/"+user.Avatar, resp.Header().Get("location"))
|
||||
})
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models/unittest"
|
||||
@@ -52,7 +53,7 @@ func TestWebfinger(t *testing.T) {
|
||||
var jrd webfingerJRD
|
||||
DecodeJSON(t, resp, &jrd)
|
||||
assert.Equal(t, "acct:user2@"+appURL.Host, jrd.Subject)
|
||||
assert.ElementsMatch(t, []string{user.HTMLURL(), appURL.String() + "api/v1/activitypub/user-id/" + fmt.Sprint(user.ID)}, jrd.Aliases)
|
||||
assert.ElementsMatch(t, []string{user.HTMLURL(), appURL.String() + "api/v1/activitypub/user-id/" + strconv.FormatInt(user.ID, 10)}, jrd.Aliases)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=acct:%s@%s", user.LowerName, "unknown.host"))
|
||||
MakeRequest(t, req, http.StatusBadRequest)
|
||||
@@ -63,6 +64,6 @@ func TestWebfinger(t *testing.T) {
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=acct:%s@%s", "user31", appURL.Host))
|
||||
session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=mailto:%s", user.Email))
|
||||
req = NewRequest(t, "GET", "/.well-known/webfinger?resource=mailto:"+user.Email)
|
||||
MakeRequest(t, req, http.StatusNotFound)
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
@@ -38,7 +37,7 @@ func TestRepoCloneWiki(t *testing.T) {
|
||||
|
||||
dstPath := t.TempDir()
|
||||
|
||||
r := fmt.Sprintf("%suser2/repo1.wiki.git", u.String())
|
||||
r := u.String() + "user2/repo1.wiki.git"
|
||||
u, _ = url.Parse(r)
|
||||
u.User = url.UserPassword("user2", userPassword)
|
||||
t.Run("Clone", func(t *testing.T) {
|
||||
|
||||
@@ -93,7 +93,7 @@ func InitTest(requireGitea bool) {
|
||||
if err != nil {
|
||||
log.Fatal("sql.Open: %v", err)
|
||||
}
|
||||
if _, err = db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", setting.Database.Name)); err != nil {
|
||||
if _, err = db.Exec("CREATE DATABASE IF NOT EXISTS " + setting.Database.Name); err != nil {
|
||||
log.Fatal("db.Exec: %v", err)
|
||||
}
|
||||
case setting.Database.Type.IsPostgreSQL():
|
||||
@@ -118,7 +118,7 @@ func InitTest(requireGitea bool) {
|
||||
defer dbrows.Close()
|
||||
|
||||
if !dbrows.Next() {
|
||||
if _, err = db.Exec(fmt.Sprintf("CREATE DATABASE %s", setting.Database.Name)); err != nil {
|
||||
if _, err = db.Exec("CREATE DATABASE " + setting.Database.Name); err != nil {
|
||||
log.Fatal("db.Exec: CREATE DATABASE: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -148,7 +148,7 @@ func InitTest(requireGitea bool) {
|
||||
|
||||
if !schrows.Next() {
|
||||
// Create and setup a DB schema
|
||||
if _, err = db.Exec(fmt.Sprintf("CREATE SCHEMA %s", setting.Database.Schema)); err != nil {
|
||||
if _, err = db.Exec("CREATE SCHEMA " + setting.Database.Schema); err != nil {
|
||||
log.Fatal("db.Exec: CREATE SCHEMA: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user