@@ -30,8 +30,7 @@ func TestActionsArtifactUploadSingleFile(t *testing.T) { | |||
req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts", getUploadArtifactRequest{ | |||
Type: "actions_storage", | |||
Name: "artifact", | |||
}) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
}).AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var uploadResp uploadArtifactResponse | |||
DecodeJSON(t, resp, &uploadResp) | |||
@@ -43,18 +42,18 @@ func TestActionsArtifactUploadSingleFile(t *testing.T) { | |||
// upload artifact chunk | |||
body := strings.Repeat("A", 1024) | |||
req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body)) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req.Header.Add("Content-Range", "bytes 0-1023/1024") | |||
req.Header.Add("x-tfs-filelength", "1024") | |||
req.Header.Add("x-actions-results-md5", "1HsSe8LeLWh93ILaw1TEFQ==") // base64(md5(body)) | |||
req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body)). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a"). | |||
SetHeader("Content-Range", "bytes 0-1023/1024"). | |||
SetHeader("x-tfs-filelength", "1024"). | |||
SetHeader("x-actions-results-md5", "1HsSe8LeLWh93ILaw1TEFQ==") // base64(md5(body)) | |||
MakeRequest(t, req, http.StatusOK) | |||
t.Logf("Create artifact confirm") | |||
// confirm artifact upload | |||
req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact") | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact"). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
MakeRequest(t, req, http.StatusOK) | |||
} | |||
@@ -64,11 +63,11 @@ func TestActionsArtifactUploadInvalidHash(t *testing.T) { | |||
// artifact id 54321 not exist | |||
url := "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts/8e5b948a454515dbabfc7eb718ddddddd/upload?itemPath=artifact/abc.txt" | |||
body := strings.Repeat("A", 1024) | |||
req := NewRequestWithBody(t, "PUT", url, strings.NewReader(body)) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req.Header.Add("Content-Range", "bytes 0-1023/1024") | |||
req.Header.Add("x-tfs-filelength", "1024") | |||
req.Header.Add("x-actions-results-md5", "1HsSe8LeLWh93ILaw1TEFQ==") // base64(md5(body)) | |||
req := NewRequestWithBody(t, "PUT", url, strings.NewReader(body)). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a"). | |||
SetHeader("Content-Range", "bytes 0-1023/1024"). | |||
SetHeader("x-tfs-filelength", "1024"). | |||
SetHeader("x-actions-results-md5", "1HsSe8LeLWh93ILaw1TEFQ==") // base64(md5(body)) | |||
resp := MakeRequest(t, req, http.StatusBadRequest) | |||
assert.Contains(t, resp.Body.String(), "Invalid artifact hash") | |||
} | |||
@@ -76,8 +75,8 @@ func TestActionsArtifactUploadInvalidHash(t *testing.T) { | |||
func TestActionsArtifactConfirmUploadWithoutName(t *testing.T) { | |||
defer tests.PrepareTestEnv(t)() | |||
req := NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts") | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req := NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts"). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp := MakeRequest(t, req, http.StatusBadRequest) | |||
assert.Contains(t, resp.Body.String(), "artifact name is empty") | |||
} | |||
@@ -111,8 +110,8 @@ type ( | |||
func TestActionsArtifactDownload(t *testing.T) { | |||
defer tests.PrepareTestEnv(t)() | |||
req := NewRequest(t, "GET", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts") | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req := NewRequest(t, "GET", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts"). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var listResp listArtifactsResponse | |||
DecodeJSON(t, resp, &listResp) | |||
@@ -122,8 +121,8 @@ func TestActionsArtifactDownload(t *testing.T) { | |||
idx := strings.Index(listResp.Value[0].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/") | |||
url := listResp.Value[0].FileContainerResourceURL[idx+1:] + "?itemPath=artifact" | |||
req = NewRequest(t, "GET", url) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req = NewRequest(t, "GET", url). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var downloadResp downloadArtifactResponse | |||
DecodeJSON(t, resp, &downloadResp) | |||
@@ -134,8 +133,8 @@ func TestActionsArtifactDownload(t *testing.T) { | |||
idx = strings.Index(downloadResp.Value[0].ContentLocation, "/api/actions_pipeline/_apis/pipelines/") | |||
url = downloadResp.Value[0].ContentLocation[idx:] | |||
req = NewRequest(t, "GET", url) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req = NewRequest(t, "GET", url). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
body := strings.Repeat("A", 1024) | |||
assert.Equal(t, resp.Body.String(), body) | |||
@@ -150,8 +149,7 @@ func TestActionsArtifactUploadMultipleFile(t *testing.T) { | |||
req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts", getUploadArtifactRequest{ | |||
Type: "actions_storage", | |||
Name: testArtifactName, | |||
}) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
}).AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var uploadResp uploadArtifactResponse | |||
DecodeJSON(t, resp, &uploadResp) | |||
@@ -182,19 +180,19 @@ func TestActionsArtifactUploadMultipleFile(t *testing.T) { | |||
url := uploadResp.FileContainerResourceURL[idx:] + "?itemPath=" + testArtifactName + "/" + f.Path | |||
// upload artifact chunk | |||
req = NewRequestWithBody(t, "PUT", url, strings.NewReader(f.Content)) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req.Header.Add("Content-Range", "bytes 0-1023/1024") | |||
req.Header.Add("x-tfs-filelength", "1024") | |||
req.Header.Add("x-actions-results-md5", f.MD5) // base64(md5(body)) | |||
req = NewRequestWithBody(t, "PUT", url, strings.NewReader(f.Content)). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a"). | |||
SetHeader("Content-Range", "bytes 0-1023/1024"). | |||
SetHeader("x-tfs-filelength", "1024"). | |||
SetHeader("x-actions-results-md5", f.MD5) // base64(md5(body)) | |||
MakeRequest(t, req, http.StatusOK) | |||
} | |||
t.Logf("Create artifact confirm") | |||
// confirm artifact upload | |||
req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName="+testArtifactName) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName="+testArtifactName). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
MakeRequest(t, req, http.StatusOK) | |||
} | |||
@@ -203,8 +201,8 @@ func TestActionsArtifactDownloadMultiFiles(t *testing.T) { | |||
const testArtifactName = "multi-files" | |||
req := NewRequest(t, "GET", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts") | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req := NewRequest(t, "GET", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts"). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var listResp listArtifactsResponse | |||
DecodeJSON(t, resp, &listResp) | |||
@@ -221,8 +219,8 @@ func TestActionsArtifactDownloadMultiFiles(t *testing.T) { | |||
idx := strings.Index(fileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/") | |||
url := fileContainerResourceURL[idx+1:] + "?itemPath=" + testArtifactName | |||
req = NewRequest(t, "GET", url) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req = NewRequest(t, "GET", url). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var downloadResp downloadArtifactResponse | |||
DecodeJSON(t, resp, &downloadResp) | |||
@@ -246,8 +244,8 @@ func TestActionsArtifactDownloadMultiFiles(t *testing.T) { | |||
idx = strings.Index(value.ContentLocation, "/api/actions_pipeline/_apis/pipelines/") | |||
url = value.ContentLocation[idx:] | |||
req = NewRequest(t, "GET", url) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req = NewRequest(t, "GET", url). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
body := strings.Repeat(bodyChar, 1024) | |||
assert.Equal(t, resp.Body.String(), body) | |||
@@ -262,8 +260,7 @@ func TestActionsArtifactUploadWithRetentionDays(t *testing.T) { | |||
Type: "actions_storage", | |||
Name: "artifact-retention-days", | |||
RetentionDays: 9, | |||
}) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
}).AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var uploadResp uploadArtifactResponse | |||
DecodeJSON(t, resp, &uploadResp) | |||
@@ -276,17 +273,17 @@ func TestActionsArtifactUploadWithRetentionDays(t *testing.T) { | |||
// upload artifact chunk | |||
body := strings.Repeat("A", 1024) | |||
req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body)) | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req.Header.Add("Content-Range", "bytes 0-1023/1024") | |||
req.Header.Add("x-tfs-filelength", "1024") | |||
req.Header.Add("x-actions-results-md5", "1HsSe8LeLWh93ILaw1TEFQ==") // base64(md5(body)) | |||
req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body)). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a"). | |||
SetHeader("Content-Range", "bytes 0-1023/1024"). | |||
SetHeader("x-tfs-filelength", "1024"). | |||
SetHeader("x-actions-results-md5", "1HsSe8LeLWh93ILaw1TEFQ==") // base64(md5(body)) | |||
MakeRequest(t, req, http.StatusOK) | |||
t.Logf("Create artifact confirm") | |||
// confirm artifact upload | |||
req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact-retention-days") | |||
req = addTokenAuthHeader(req, "Bearer 8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact-retention-days"). | |||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") | |||
MakeRequest(t, req, http.StatusOK) | |||
} |
@@ -32,7 +32,7 @@ func TestActivityPubPerson(t *testing.T) { | |||
onGiteaRun(t, func(*testing.T, *url.URL) { | |||
userID := 2 | |||
username := "user2" | |||
req := NewRequestf(t, "GET", fmt.Sprintf("/api/v1/activitypub/user-id/%v", userID)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/user-id/%v", userID)) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
body := resp.Body.Bytes() | |||
assert.Contains(t, string(body), "@context") | |||
@@ -68,7 +68,7 @@ func TestActivityPubMissingPerson(t *testing.T) { | |||
}() | |||
onGiteaRun(t, func(*testing.T, *url.URL) { | |||
req := NewRequestf(t, "GET", "/api/v1/activitypub/user-id/999999999") | |||
req := NewRequest(t, "GET", "/api/v1/activitypub/user-id/999999999") | |||
resp := MakeRequest(t, req, http.StatusNotFound) | |||
assert.Contains(t, resp.Body.String(), "user does not exist") | |||
}) |
@@ -31,7 +31,8 @@ func TestAPIAdminOrgCreate(t *testing.T) { | |||
Location: "Shanghai", | |||
Visibility: "private", | |||
} | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs?token="+token, &org) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var apiOrg api.Organization | |||
@@ -65,7 +66,8 @@ func TestAPIAdminOrgCreateBadVisibility(t *testing.T) { | |||
Location: "Shanghai", | |||
Visibility: "notvalid", | |||
} | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs?token="+token, &org) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
}) | |||
} | |||
@@ -83,6 +85,7 @@ func TestAPIAdminOrgCreateNotAdmin(t *testing.T) { | |||
Location: "Shanghai", | |||
Visibility: "public", | |||
} | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs?token="+token, &org) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} |
@@ -27,11 +27,11 @@ func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) { | |||
keyOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user2"}) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteAdmin) | |||
urlStr := fmt.Sprintf("/api/v1/admin/users/%s/keys?token=%s", keyOwner.Name, token) | |||
urlStr := fmt.Sprintf("/api/v1/admin/users/%s/keys", keyOwner.Name) | |||
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{ | |||
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n", | |||
"title": "test-key", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var newPublicKey api.PublicKey | |||
@@ -43,8 +43,8 @@ func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) { | |||
OwnerID: keyOwner.ID, | |||
}) | |||
req = NewRequestf(t, "DELETE", "/api/v1/admin/users/%s/keys/%d?token=%s", | |||
keyOwner.Name, newPublicKey.ID, token) | |||
req = NewRequestf(t, "DELETE", "/api/v1/admin/users/%s/keys/%d", keyOwner.Name, newPublicKey.ID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
unittest.AssertNotExistsBean(t, &asymkey_model.PublicKey{ID: newPublicKey.ID}) | |||
} | |||
@@ -54,7 +54,8 @@ func TestAPIAdminDeleteMissingSSHKey(t *testing.T) { | |||
// user1 is an admin user | |||
token := getUserToken(t, "user1", auth_model.AccessTokenScopeWriteAdmin) | |||
req := NewRequestf(t, "DELETE", "/api/v1/admin/users/user1/keys/%d?token=%s", unittest.NonexistentID, token) | |||
req := NewRequestf(t, "DELETE", "/api/v1/admin/users/user1/keys/%d", unittest.NonexistentID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
} | |||
@@ -64,18 +65,18 @@ func TestAPIAdminDeleteUnauthorizedKey(t *testing.T) { | |||
normalUsername := "user2" | |||
token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeWriteAdmin) | |||
urlStr := fmt.Sprintf("/api/v1/admin/users/%s/keys?token=%s", adminUsername, token) | |||
urlStr := fmt.Sprintf("/api/v1/admin/users/%s/keys", adminUsername) | |||
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{ | |||
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n", | |||
"title": "test-key", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var newPublicKey api.PublicKey | |||
DecodeJSON(t, resp, &newPublicKey) | |||
token = getUserToken(t, normalUsername) | |||
req = NewRequestf(t, "DELETE", "/api/v1/admin/users/%s/keys/%d?token=%s", | |||
adminUsername, newPublicKey.ID, token) | |||
req = NewRequestf(t, "DELETE", "/api/v1/admin/users/%s/keys/%d", adminUsername, newPublicKey.ID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} | |||
@@ -85,8 +86,8 @@ func TestAPISudoUser(t *testing.T) { | |||
normalUsername := "user2" | |||
token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeReadUser) | |||
urlStr := fmt.Sprintf("/api/v1/user?sudo=%s&token=%s", normalUsername, token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user?sudo=%s", normalUsername)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var user api.User | |||
DecodeJSON(t, resp, &user) | |||
@@ -100,8 +101,8 @@ func TestAPISudoUserForbidden(t *testing.T) { | |||
normalUsername := "user2" | |||
token := getUserToken(t, normalUsername, auth_model.AccessTokenScopeReadAdmin) | |||
urlStr := fmt.Sprintf("/api/v1/user?sudo=%s&token=%s", adminUsername, token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user?sudo=%s", adminUsername)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} | |||
@@ -110,8 +111,8 @@ func TestAPIListUsers(t *testing.T) { | |||
adminUsername := "user1" | |||
token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeReadAdmin) | |||
urlStr := fmt.Sprintf("/api/v1/admin/users?token=%s", token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", "/api/v1/admin/users"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var users []api.User | |||
DecodeJSON(t, resp, &users) | |||
@@ -137,7 +138,8 @@ func TestAPIListUsersNonAdmin(t *testing.T) { | |||
defer tests.PrepareTestEnv(t)() | |||
nonAdminUsername := "user2" | |||
token := getUserToken(t, nonAdminUsername) | |||
req := NewRequestf(t, "GET", "/api/v1/admin/users?token=%s", token) | |||
req := NewRequest(t, "GET", "/api/v1/admin/users"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} | |||
@@ -145,8 +147,7 @@ func TestAPICreateUserInvalidEmail(t *testing.T) { | |||
defer tests.PrepareTestEnv(t)() | |||
adminUsername := "user1" | |||
token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeWriteAdmin) | |||
urlStr := fmt.Sprintf("/api/v1/admin/users?token=%s", token) | |||
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{ | |||
req := NewRequestWithValues(t, "POST", "/api/v1/admin/users", map[string]string{ | |||
"email": "invalid_email@domain.com\r\n", | |||
"full_name": "invalid user", | |||
"login_name": "invalidUser", | |||
@@ -155,7 +156,7 @@ func TestAPICreateUserInvalidEmail(t *testing.T) { | |||
"send_notify": "true", | |||
"source_id": "0", | |||
"username": "invalidUser", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
} | |||
@@ -167,7 +168,7 @@ func TestAPICreateAndDeleteUser(t *testing.T) { | |||
req := NewRequestWithValues( | |||
t, | |||
"POST", | |||
fmt.Sprintf("/api/v1/admin/users?token=%s", token), | |||
"/api/v1/admin/users", | |||
map[string]string{ | |||
"email": "deleteme@domain.com", | |||
"full_name": "delete me", | |||
@@ -178,10 +179,11 @@ func TestAPICreateAndDeleteUser(t *testing.T) { | |||
"source_id": "0", | |||
"username": "deleteme", | |||
}, | |||
) | |||
).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/admin/users/deleteme?token=%s", token)) | |||
req = NewRequest(t, "DELETE", "/api/v1/admin/users/deleteme"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
} | |||
@@ -189,7 +191,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?token=%s", "user2", token) | |||
urlStr := fmt.Sprintf("/api/v1/admin/users/%s", "user2") | |||
req := NewRequestWithValues(t, "PATCH", urlStr, map[string]string{ | |||
// required | |||
@@ -197,7 +199,7 @@ func TestAPIEditUser(t *testing.T) { | |||
"source_id": "0", | |||
// to change | |||
"full_name": "Full Name User 2", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
empty := "" | |||
@@ -205,7 +207,7 @@ func TestAPIEditUser(t *testing.T) { | |||
LoginName: "user2", | |||
SourceID: 0, | |||
Email: &empty, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
errMap := make(map[string]any) | |||
@@ -221,7 +223,7 @@ func TestAPIEditUser(t *testing.T) { | |||
SourceID: 0, | |||
// to change | |||
Restricted: &bTrue, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
user2 = unittest.AssertExistsAndLoadBean(t, &user_model.User{LoginName: "user2"}) | |||
assert.True(t, user2.IsRestricted) | |||
@@ -235,11 +237,11 @@ func TestAPICreateRepoForUser(t *testing.T) { | |||
req := NewRequestWithJSON( | |||
t, | |||
"POST", | |||
fmt.Sprintf("/api/v1/admin/users/%s/repos?token=%s", adminUsername, token), | |||
fmt.Sprintf("/api/v1/admin/users/%s/repos", adminUsername), | |||
&api.CreateRepoOption{ | |||
Name: "admincreatedrepo", | |||
}, | |||
) | |||
).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
} | |||
@@ -247,40 +249,38 @@ func TestAPIRenameUser(t *testing.T) { | |||
defer tests.PrepareTestEnv(t)() | |||
adminUsername := "user1" | |||
token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeWriteAdmin) | |||
urlStr := fmt.Sprintf("/api/v1/admin/users/%s/rename?token=%s", "user2", token) | |||
urlStr := fmt.Sprintf("/api/v1/admin/users/%s/rename", "user2") | |||
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{ | |||
// required | |||
"new_name": "User2", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
urlStr = fmt.Sprintf("/api/v1/admin/users/%s/rename?token=%s", "User2", token) | |||
urlStr = fmt.Sprintf("/api/v1/admin/users/%s/rename", "User2") | |||
req = NewRequestWithValues(t, "POST", urlStr, map[string]string{ | |||
// required | |||
"new_name": "User2-2-2", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
urlStr = fmt.Sprintf("/api/v1/admin/users/%s/rename?token=%s", "User2", token) | |||
req = NewRequestWithValues(t, "POST", urlStr, map[string]string{ | |||
// required | |||
"new_name": "user1", | |||
}) | |||
}).AddTokenAuth(token) | |||
// the old user name still be used by with a redirect | |||
MakeRequest(t, req, http.StatusTemporaryRedirect) | |||
urlStr = fmt.Sprintf("/api/v1/admin/users/%s/rename?token=%s", "User2-2-2", token) | |||
urlStr = fmt.Sprintf("/api/v1/admin/users/%s/rename", "User2-2-2") | |||
req = NewRequestWithValues(t, "POST", urlStr, map[string]string{ | |||
// required | |||
"new_name": "user1", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
urlStr = fmt.Sprintf("/api/v1/admin/users/%s/rename?token=%s", "User2-2-2", token) | |||
req = NewRequestWithValues(t, "POST", urlStr, map[string]string{ | |||
// required | |||
"new_name": "user2", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
} | |||
@@ -294,8 +294,9 @@ func TestAPICron(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadAdmin) | |||
urlStr := fmt.Sprintf("/api/v1/admin/cron?token=%s", token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", "/api/v1/admin/cron"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "28", resp.Header().Get("X-Total-Count")) | |||
@@ -313,13 +314,13 @@ func TestAPICron(t *testing.T) { | |||
// Archive cleanup is harmless, because in the test environment there are none | |||
// and is thus an NOOP operation and therefore doesn't interfere with any other | |||
// tests. | |||
urlStr := fmt.Sprintf("/api/v1/admin/cron/archive_cleanup?token=%s", token) | |||
req := NewRequest(t, "POST", urlStr) | |||
req := NewRequest(t, "POST", "/api/v1/admin/cron/archive_cleanup"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Check for the latest run time for this cron, to ensure it has been run. | |||
urlStr = fmt.Sprintf("/api/v1/admin/cron?token=%s", token) | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", "/api/v1/admin/cron"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var crons []api.Cron |
@@ -17,7 +17,8 @@ import ( | |||
func testAPIGetBranch(t *testing.T, branchName string, exists bool) { | |||
token := getUserToken(t, "user2", auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branches/%s?token=%s", branchName, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branches/%s", branchName). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, NoExpectedStatus) | |||
if !exists { | |||
assert.EqualValues(t, http.StatusNotFound, resp.Code) | |||
@@ -33,7 +34,8 @@ func testAPIGetBranch(t *testing.T, branchName string, exists bool) { | |||
func testAPIGetBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) *api.BranchProtection { | |||
token := getUserToken(t, "user2", auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branch_protections/%s?token=%s", branchName, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/branch_protections/%s", branchName). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, expectedHTTPStatus) | |||
if resp.Code == http.StatusOK { | |||
@@ -47,9 +49,9 @@ func testAPIGetBranchProtection(t *testing.T, branchName string, expectedHTTPSta | |||
func testAPICreateBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) { | |||
token := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/branch_protections?token="+token, &api.BranchProtection{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/branch_protections", &api.BranchProtection{ | |||
RuleName: branchName, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, expectedHTTPStatus) | |||
if resp.Code == http.StatusCreated { | |||
@@ -61,7 +63,8 @@ func testAPICreateBranchProtection(t *testing.T, branchName string, expectedHTTP | |||
func testAPIEditBranchProtection(t *testing.T, branchName string, body *api.BranchProtection, expectedHTTPStatus int) { | |||
token := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, "PATCH", "/api/v1/repos/user2/repo1/branch_protections/"+branchName+"?token="+token, body) | |||
req := NewRequestWithJSON(t, "PATCH", "/api/v1/repos/user2/repo1/branch_protections/"+branchName, body). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, expectedHTTPStatus) | |||
if resp.Code == http.StatusOK { | |||
@@ -73,13 +76,15 @@ func testAPIEditBranchProtection(t *testing.T, branchName string, body *api.Bran | |||
func testAPIDeleteBranchProtection(t *testing.T, branchName string, expectedHTTPStatus int) { | |||
token := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branch_protections/%s?token=%s", branchName, token) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branch_protections/%s", branchName). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, expectedHTTPStatus) | |||
} | |||
func testAPIDeleteBranch(t *testing.T, branchName string, expectedHTTPStatus int) { | |||
token := getUserToken(t, "user2", auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branches/%s?token=%s", branchName, token) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/user2/repo1/branches/%s", branchName). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, expectedHTTPStatus) | |||
} | |||
@@ -152,10 +157,10 @@ func testAPICreateBranches(t *testing.T, giteaURL *url.URL) { | |||
func testAPICreateBranch(t testing.TB, session *TestSession, user, repo, oldBranch, newBranch string, status int) bool { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/"+user+"/"+repo+"/branches?token="+token, &api.CreateBranchRepoOption{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/"+user+"/"+repo+"/branches", &api.CreateBranchRepoOption{ | |||
BranchName: newBranch, | |||
OldBranchName: oldBranch, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, status) | |||
var branch api.Branch |
@@ -39,15 +39,18 @@ func TestAPIGetCommentAttachment(t *testing.T) { | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4}) | |||
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
token := getUserToken(t, repoOwner.Name, auth_model.AccessTokenScopeWriteIssue) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d/assets/%d?token=%s", repoOwner.Name, repo.Name, comment.ID, attachment.ID, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d/assets/%d", repoOwner.Name, repo.Name, comment.ID, attachment.ID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadIssue) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d/assets/%d?token=%s", repoOwner.Name, repo.Name, comment.ID, attachment.ID, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d/assets/%d", repoOwner.Name, repo.Name, comment.ID, attachment.ID). | |||
AddTokenAuth(token) | |||
session.MakeRequest(t, req, http.StatusOK) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d/assets/%d?token=%s", repoOwner.Name, repo.Name, comment.ID, attachment.ID, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d/assets/%d", repoOwner.Name, repo.Name, comment.ID, attachment.ID). | |||
AddTokenAuth(token) | |||
resp := session.MakeRequest(t, req, http.StatusOK) | |||
var apiAttachment api.Attachment | |||
@@ -71,8 +74,8 @@ func TestAPIListCommentAttachments(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadIssue) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d/assets?token=%s", | |||
repoOwner.Name, repo.Name, comment.ID, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d/assets", repoOwner.Name, repo.Name, comment.ID). | |||
AddTokenAuth(token) | |||
resp := session.MakeRequest(t, req, http.StatusOK) | |||
var apiAttachments []*api.Attachment | |||
@@ -93,8 +96,6 @@ func TestAPICreateCommentAttachment(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/assets?token=%s", | |||
repoOwner.Name, repo.Name, comment.ID, token) | |||
filename := "image.png" | |||
buff := generateImg() | |||
@@ -109,8 +110,9 @@ func TestAPICreateCommentAttachment(t *testing.T) { | |||
err = writer.Close() | |||
assert.NoError(t, err) | |||
req := NewRequestWithBody(t, "POST", urlStr, body) | |||
req.Header.Add("Content-Type", writer.FormDataContentType()) | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/assets", repoOwner.Name, repo.Name, comment.ID), body). | |||
AddTokenAuth(token). | |||
SetHeader("Content-Type", writer.FormDataContentType()) | |||
resp := session.MakeRequest(t, req, http.StatusCreated) | |||
apiAttachment := new(api.Attachment) | |||
@@ -132,11 +134,11 @@ func TestAPIEditCommentAttachment(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/assets/%d?token=%s", | |||
repoOwner.Name, repo.Name, comment.ID, attachment.ID, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/assets/%d", | |||
repoOwner.Name, repo.Name, comment.ID, attachment.ID) | |||
req := NewRequestWithValues(t, "PATCH", urlStr, map[string]string{ | |||
"name": newAttachmentName, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := session.MakeRequest(t, req, http.StatusCreated) | |||
apiAttachment := new(api.Attachment) | |||
DecodeJSON(t, resp, &apiAttachment) | |||
@@ -155,10 +157,9 @@ func TestAPIDeleteCommentAttachment(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/assets/%d?token=%s", | |||
repoOwner.Name, repo.Name, comment.ID, attachment.ID, token) | |||
req := NewRequestf(t, "DELETE", urlStr) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/assets/%d", repoOwner.Name, repo.Name, comment.ID, attachment.ID)). | |||
AddTokenAuth(token) | |||
session.MakeRequest(t, req, http.StatusNoContent) | |||
unittest.AssertNotExistsBean(t, &repo_model.Attachment{ID: attachment.ID, CommentID: comment.ID}) |
@@ -77,8 +77,8 @@ func TestAPIListIssueComments(t *testing.T) { | |||
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
token := getUserToken(t, repoOwner.Name, auth_model.AccessTokenScopeReadIssue) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/comments?token=%s", | |||
repoOwner.Name, repo.Name, issue.Index, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/comments", repoOwner.Name, repo.Name, issue.Index). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var comments []*api.Comment | |||
@@ -97,11 +97,11 @@ func TestAPICreateComment(t *testing.T) { | |||
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
token := getUserToken(t, repoOwner.Name, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/comments?token=%s", | |||
repoOwner.Name, repo.Name, issue.Index, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/comments", | |||
repoOwner.Name, repo.Name, issue.Index) | |||
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{ | |||
"body": commentBody, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var updatedComment api.Comment | |||
@@ -121,7 +121,8 @@ func TestAPIGetComment(t *testing.T) { | |||
token := getUserToken(t, repoOwner.Name, auth_model.AccessTokenScopeReadIssue) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d", repoOwner.Name, repo.Name, comment.ID) | |||
MakeRequest(t, req, http.StatusOK) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d?token=%s", repoOwner.Name, repo.Name, comment.ID, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d", repoOwner.Name, repo.Name, comment.ID). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiComment api.Comment | |||
@@ -188,20 +189,20 @@ func TestAPIEditComment(t *testing.T) { | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4}) | |||
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
token := getUserToken(t, repoOwner.Name, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d?token=%s", | |||
repoOwner.Name, repo.Name, comment.ID, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d", | |||
repoOwner.Name, repo.Name, comment.ID) | |||
req := NewRequestWithValues(t, "PATCH", urlStr, map[string]string{ | |||
"body": newCommentBody, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
token := getUserToken(t, repoOwner.Name, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d?token=%s", | |||
repoOwner.Name, repo.Name, comment.ID, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d", | |||
repoOwner.Name, repo.Name, comment.ID) | |||
req := NewRequestWithValues(t, "PATCH", urlStr, map[string]string{ | |||
"body": newCommentBody, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var updatedComment api.Comment | |||
@@ -225,14 +226,14 @@ func TestAPIDeleteComment(t *testing.T) { | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4}) | |||
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
token := getUserToken(t, repoOwner.Name, auth_model.AccessTokenScopeWriteIssue) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/comments/%d?token=%s", | |||
repoOwner.Name, repo.Name, comment.ID, token) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/comments/%d", repoOwner.Name, repo.Name, comment.ID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
token := getUserToken(t, repoOwner.Name, auth_model.AccessTokenScopeWriteIssue) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/comments/%d?token=%s", | |||
repoOwner.Name, repo.Name, comment.ID, token) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/comments/%d", repoOwner.Name, repo.Name, comment.ID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
unittest.AssertNotExistsBean(t, &issues_model.Comment{ID: comment.ID}) | |||
@@ -247,8 +248,7 @@ func TestAPIListIssueTimeline(t *testing.T) { | |||
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
// make request | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/timeline", | |||
repoOwner.Name, repo.Name, issue.Index) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/timeline", repoOwner.Name, repo.Name, issue.Index) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
// check if lens of list returned by API and |
@@ -16,7 +16,7 @@ import ( | |||
"github.com/stretchr/testify/assert" | |||
) | |||
type makeRequestFunc func(testing.TB, *http.Request, int) *httptest.ResponseRecorder | |||
type makeRequestFunc func(testing.TB, *RequestWrapper, int) *httptest.ResponseRecorder | |||
func TestGPGKeys(t *testing.T) { | |||
defer tests.PrepareTestEnv(t)() | |||
@@ -79,7 +79,8 @@ func TestGPGKeys(t *testing.T) { | |||
t.Run("CheckState", func(t *testing.T) { | |||
var keys []*api.GPGKey | |||
req := NewRequest(t, "GET", "/api/v1/user/gpg_keys?token="+tokenWithGPGKeyScope) // GET all keys | |||
req := NewRequest(t, "GET", "/api/v1/user/gpg_keys"). // GET all keys | |||
AddTokenAuth(tokenWithGPGKeyScope) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &keys) | |||
assert.Len(t, keys, 1) | |||
@@ -95,7 +96,8 @@ func TestGPGKeys(t *testing.T) { | |||
assert.Empty(t, subKey.Emails) | |||
var key api.GPGKey | |||
req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(primaryKey1.ID, 10)+"?token="+tokenWithGPGKeyScope) // Primary key 1 | |||
req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(primaryKey1.ID, 10)). // Primary key 1 | |||
AddTokenAuth(tokenWithGPGKeyScope) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &key) | |||
assert.EqualValues(t, "38EA3BCED732982C", key.KeyID) | |||
@@ -103,7 +105,8 @@ func TestGPGKeys(t *testing.T) { | |||
assert.EqualValues(t, "user2@example.com", key.Emails[0].Email) | |||
assert.True(t, key.Emails[0].Verified) | |||
req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(subKey.ID, 10)+"?token="+tokenWithGPGKeyScope) // Subkey of 38EA3BCED732982C | |||
req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(subKey.ID, 10)). // Subkey of 38EA3BCED732982C | |||
AddTokenAuth(tokenWithGPGKeyScope) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &key) | |||
assert.EqualValues(t, "70D7C694D17D03AD", key.KeyID) | |||
@@ -114,7 +117,8 @@ func TestGPGKeys(t *testing.T) { | |||
t.Run("CheckCommits", func(t *testing.T) { | |||
t.Run("NotSigned", func(t *testing.T) { | |||
var branch api.Branch | |||
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/not-signed?token="+token) | |||
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/not-signed"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &branch) | |||
assert.False(t, branch.Commit.Verification.Verified) | |||
@@ -122,7 +126,8 @@ func TestGPGKeys(t *testing.T) { | |||
t.Run("SignedWithNotValidatedEmail", func(t *testing.T) { | |||
var branch api.Branch | |||
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign-not-yet-validated?token="+token) | |||
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign-not-yet-validated"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &branch) | |||
assert.False(t, branch.Commit.Verification.Verified) | |||
@@ -130,7 +135,8 @@ func TestGPGKeys(t *testing.T) { | |||
t.Run("SignedWithValidEmail", func(t *testing.T) { | |||
var branch api.Branch | |||
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign?token="+token) | |||
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &branch) | |||
assert.True(t, branch.Commit.Verification.Verified) | |||
@@ -139,29 +145,33 @@ func TestGPGKeys(t *testing.T) { | |||
} | |||
func testViewOwnGPGKeys(t *testing.T, makeRequest makeRequestFunc, token string, expected int) { | |||
req := NewRequest(t, "GET", "/api/v1/user/gpg_keys?token="+token) | |||
req := NewRequest(t, "GET", "/api/v1/user/gpg_keys"). | |||
AddTokenAuth(token) | |||
makeRequest(t, req, expected) | |||
} | |||
func testViewGPGKeys(t *testing.T, makeRequest makeRequestFunc, token string, expected int) { | |||
req := NewRequest(t, "GET", "/api/v1/users/user2/gpg_keys?token="+token) | |||
req := NewRequest(t, "GET", "/api/v1/users/user2/gpg_keys"). | |||
AddTokenAuth(token) | |||
makeRequest(t, req, expected) | |||
} | |||
func testGetGPGKey(t *testing.T, makeRequest makeRequestFunc, token string, expected int) { | |||
req := NewRequest(t, "GET", "/api/v1/user/gpg_keys/1?token="+token) | |||
req := NewRequest(t, "GET", "/api/v1/user/gpg_keys/1"). | |||
AddTokenAuth(token) | |||
makeRequest(t, req, expected) | |||
} | |||
func testDeleteGPGKey(t *testing.T, makeRequest makeRequestFunc, token string, expected int) { | |||
req := NewRequest(t, "DELETE", "/api/v1/user/gpg_keys/1?token="+token) | |||
req := NewRequest(t, "DELETE", "/api/v1/user/gpg_keys/1"). | |||
AddTokenAuth(token) | |||
makeRequest(t, req, expected) | |||
} | |||
func testCreateGPGKey(t *testing.T, makeRequest makeRequestFunc, token string, expected int, publicKey string) { | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/gpg_keys?token="+token, api.CreateGPGKeyOption{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/gpg_keys", api.CreateGPGKeyOption{ | |||
ArmoredKey: publicKey, | |||
}) | |||
}).AddTokenAuth(token) | |||
makeRequest(t, req, expected) | |||
} | |||
@@ -59,7 +59,8 @@ func doAPICreateRepository(ctx APITestContext, empty bool, callback ...func(*tes | |||
License: "WTFPL", | |||
Readme: "Default", | |||
} | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos?token="+ctx.Token, createRepoOption) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", createRepoOption). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -76,7 +77,8 @@ func doAPICreateRepository(ctx APITestContext, empty bool, callback ...func(*tes | |||
func doAPIEditRepository(ctx APITestContext, editRepoOption *api.EditRepoOption, callback ...func(*testing.T, api.Repository)) func(*testing.T) { | |||
return func(t *testing.T) { | |||
req := NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame), ctx.Token), editRepoOption) | |||
req := NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame)), editRepoOption). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -103,7 +105,8 @@ func doAPIAddCollaborator(ctx APITestContext, username string, mode perm.AccessM | |||
addCollaboratorOption := &api.AddCollaboratorOption{ | |||
Permission: &permission, | |||
} | |||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/collaborators/%s?token=%s", ctx.Username, ctx.Reponame, username, ctx.Token), addCollaboratorOption) | |||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/collaborators/%s", ctx.Username, ctx.Reponame, username), addCollaboratorOption). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -115,7 +118,8 @@ func doAPIAddCollaborator(ctx APITestContext, username string, mode perm.AccessM | |||
func doAPIForkRepository(ctx APITestContext, username string, callback ...func(*testing.T, api.Repository)) func(*testing.T) { | |||
return func(t *testing.T) { | |||
createForkOption := &api.CreateForkOption{} | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/forks?token=%s", username, ctx.Reponame, ctx.Token), createForkOption) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/forks", username, ctx.Reponame), createForkOption). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -131,9 +135,8 @@ func doAPIForkRepository(ctx APITestContext, username string, callback ...func(* | |||
func doAPIGetRepository(ctx APITestContext, callback ...func(*testing.T, api.Repository)) func(*testing.T) { | |||
return func(t *testing.T) { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", ctx.Username, ctx.Reponame, ctx.Token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s", ctx.Username, ctx.Reponame)). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -150,9 +153,8 @@ func doAPIGetRepository(ctx APITestContext, callback ...func(*testing.T, api.Rep | |||
func doAPIDeleteRepository(ctx APITestContext) func(*testing.T) { | |||
return func(t *testing.T) { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", ctx.Username, ctx.Reponame, ctx.Token) | |||
req := NewRequest(t, "DELETE", urlStr) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s", ctx.Username, ctx.Reponame)). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -163,14 +165,12 @@ func doAPIDeleteRepository(ctx APITestContext) func(*testing.T) { | |||
func doAPICreateUserKey(ctx APITestContext, keyname, keyFile string, callback ...func(*testing.T, api.PublicKey)) func(*testing.T) { | |||
return func(t *testing.T) { | |||
urlStr := fmt.Sprintf("/api/v1/user/keys?token=%s", ctx.Token) | |||
dataPubKey, err := os.ReadFile(keyFile + ".pub") | |||
assert.NoError(t, err) | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateKeyOption{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/keys", &api.CreateKeyOption{ | |||
Title: keyname, | |||
Key: string(dataPubKey), | |||
}) | |||
}).AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -186,9 +186,8 @@ func doAPICreateUserKey(ctx APITestContext, keyname, keyFile string, callback .. | |||
func doAPIDeleteUserKey(ctx APITestContext, keyID int64) func(*testing.T) { | |||
return func(t *testing.T) { | |||
urlStr := fmt.Sprintf("/api/v1/user/keys/%d?token=%s", keyID, ctx.Token) | |||
req := NewRequest(t, "DELETE", urlStr) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/keys/%d", keyID)). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -199,15 +198,13 @@ func doAPIDeleteUserKey(ctx APITestContext, keyID int64) func(*testing.T) { | |||
func doAPICreateDeployKey(ctx APITestContext, keyname, keyFile string, readOnly bool) func(*testing.T) { | |||
return func(t *testing.T) { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/keys?token=%s", ctx.Username, ctx.Reponame, ctx.Token) | |||
dataPubKey, err := os.ReadFile(keyFile + ".pub") | |||
assert.NoError(t, err) | |||
req := NewRequestWithJSON(t, "POST", urlStr, api.CreateKeyOption{ | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/keys", ctx.Username, ctx.Reponame), api.CreateKeyOption{ | |||
Title: keyname, | |||
Key: string(dataPubKey), | |||
ReadOnly: readOnly, | |||
}) | |||
}).AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
@@ -219,13 +216,11 @@ func doAPICreateDeployKey(ctx APITestContext, keyname, keyFile string, readOnly | |||
func doAPICreatePullRequest(ctx APITestContext, owner, repo, baseBranch, headBranch string) func(*testing.T) (api.PullRequest, error) { | |||
return func(t *testing.T) (api.PullRequest, error) { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", | |||
owner, repo, ctx.Token) | |||
req := NewRequestWithJSON(t, http.MethodPost, urlStr, &api.CreatePullRequestOption{ | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", owner, repo), &api.CreatePullRequestOption{ | |||
Head: headBranch, | |||
Base: baseBranch, | |||
Title: fmt.Sprintf("create a pr from %s to %s", headBranch, baseBranch), | |||
}) | |||
}).AddTokenAuth(ctx.Token) | |||
expected := http.StatusCreated | |||
if ctx.ExpectedCode != 0 { | |||
@@ -242,9 +237,8 @@ func doAPICreatePullRequest(ctx APITestContext, owner, repo, baseBranch, headBra | |||
func doAPIGetPullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) (api.PullRequest, error) { | |||
return func(t *testing.T) (api.PullRequest, error) { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d?token=%s", | |||
owner, repo, index, ctx.Token) | |||
req := NewRequest(t, http.MethodGet, urlStr) | |||
req := NewRequest(t, http.MethodGet, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", owner, repo, index)). | |||
AddTokenAuth(ctx.Token) | |||
expected := http.StatusOK | |||
if ctx.ExpectedCode != 0 { | |||
@@ -261,17 +255,16 @@ func doAPIGetPullRequest(ctx APITestContext, owner, repo string, index int64) fu | |||
func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) { | |||
return func(t *testing.T) { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", | |||
owner, repo, index, ctx.Token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge", owner, repo, index) | |||
var req *http.Request | |||
var req *RequestWrapper | |||
var resp *httptest.ResponseRecorder | |||
for i := 0; i < 6; i++ { | |||
req = NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{ | |||
MergeMessageField: "doAPIMergePullRequest Merge", | |||
Do: string(repo_model.MergeStyleMerge), | |||
}) | |||
}).AddTokenAuth(ctx.Token) | |||
resp = ctx.Session.MakeRequest(t, req, NoExpectedStatus) | |||
@@ -299,12 +292,11 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64) | |||
func doAPIManuallyMergePullRequest(ctx APITestContext, owner, repo, commitID string, index int64) func(*testing.T) { | |||
return func(t *testing.T) { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", | |||
owner, repo, index, ctx.Token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge", owner, repo, index) | |||
req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{ | |||
Do: string(repo_model.MergeStyleManuallyMerged), | |||
MergeCommitID: commitID, | |||
}) | |||
}).AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
@@ -316,38 +308,37 @@ func doAPIManuallyMergePullRequest(ctx APITestContext, owner, repo, commitID str | |||
func doAPIAutoMergePullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) { | |||
return func(t *testing.T) { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", | |||
owner, repo, index, ctx.Token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge", owner, repo, index) | |||
req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{ | |||
MergeMessageField: "doAPIMergePullRequest Merge", | |||
Do: string(repo_model.MergeStyleMerge), | |||
MergeWhenChecksSucceed: true, | |||
}) | |||
}).AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
} | |||
ctx.Session.MakeRequest(t, req, 200) | |||
ctx.Session.MakeRequest(t, req, http.StatusOK) | |||
} | |||
} | |||
func doAPICancelAutoMergePullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) { | |||
return func(t *testing.T) { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", | |||
owner, repo, index, ctx.Token) | |||
req := NewRequest(t, http.MethodDelete, urlStr) | |||
req := NewRequest(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge", owner, repo, index)). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
} | |||
ctx.Session.MakeRequest(t, req, 204) | |||
ctx.Session.MakeRequest(t, req, http.StatusNoContent) | |||
} | |||
} | |||
func doAPIGetBranch(ctx APITestContext, branch string, callback ...func(*testing.T, api.Branch)) func(*testing.T) { | |||
return func(t *testing.T) { | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/branches/%s?token=%s", ctx.Username, ctx.Reponame, branch, ctx.Token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/branches/%s", ctx.Username, ctx.Reponame, branch). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -364,8 +355,8 @@ func doAPIGetBranch(ctx APITestContext, branch string, callback ...func(*testing | |||
func doAPICreateFile(ctx APITestContext, treepath string, options *api.CreateFileOptions, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) { | |||
return func(t *testing.T) { | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", ctx.Username, ctx.Reponame, treepath, ctx.Token) | |||
req := NewRequestWithJSON(t, "POST", url, &options) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", ctx.Username, ctx.Reponame, treepath), &options). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -382,9 +373,8 @@ func doAPICreateFile(ctx APITestContext, treepath string, options *api.CreateFil | |||
func doAPICreateOrganization(ctx APITestContext, options *api.CreateOrgOption, callback ...func(*testing.T, api.Organization)) func(t *testing.T) { | |||
return func(t *testing.T) { | |||
url := fmt.Sprintf("/api/v1/orgs?token=%s", ctx.Token) | |||
req := NewRequestWithJSON(t, "POST", url, &options) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/orgs", &options). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -401,9 +391,8 @@ func doAPICreateOrganization(ctx APITestContext, options *api.CreateOrgOption, c | |||
func doAPICreateOrganizationRepository(ctx APITestContext, orgName string, options *api.CreateRepoOption, callback ...func(*testing.T, api.Repository)) func(t *testing.T) { | |||
return func(t *testing.T) { | |||
url := fmt.Sprintf("/api/v1/orgs/%s/repos?token=%s", orgName, ctx.Token) | |||
req := NewRequestWithJSON(t, "POST", url, &options) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/repos", orgName), &options). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -420,9 +409,8 @@ func doAPICreateOrganizationRepository(ctx APITestContext, orgName string, optio | |||
func doAPICreateOrganizationTeam(ctx APITestContext, orgName string, options *api.CreateTeamOption, callback ...func(*testing.T, api.Team)) func(t *testing.T) { | |||
return func(t *testing.T) { | |||
url := fmt.Sprintf("/api/v1/orgs/%s/teams?token=%s", orgName, ctx.Token) | |||
req := NewRequestWithJSON(t, "POST", url, &options) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", orgName), &options). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -439,9 +427,8 @@ func doAPICreateOrganizationTeam(ctx APITestContext, orgName string, options *ap | |||
func doAPIAddUserToOrganizationTeam(ctx APITestContext, teamID int64, username string) func(t *testing.T) { | |||
return func(t *testing.T) { | |||
url := fmt.Sprintf("/api/v1/teams/%d/members/%s?token=%s", teamID, username, ctx.Token) | |||
req := NewRequest(t, "PUT", url) | |||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/teams/%d/members/%s", teamID, username)). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return | |||
@@ -452,9 +439,8 @@ func doAPIAddUserToOrganizationTeam(ctx APITestContext, teamID int64, username s | |||
func doAPIAddRepoToOrganizationTeam(ctx APITestContext, teamID int64, orgName, repoName string) func(t *testing.T) { | |||
return func(t *testing.T) { | |||
url := fmt.Sprintf("/api/v1/teams/%d/repos/%s/%s?token=%s", teamID, orgName, repoName, ctx.Token) | |||
req := NewRequest(t, "PUT", url) | |||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/teams/%d/repos/%s/%s", teamID, orgName, repoName)). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return |
@@ -5,7 +5,6 @@ package integration | |||
import ( | |||
"encoding/base64" | |||
"fmt" | |||
"net/http" | |||
"net/url" | |||
"testing" | |||
@@ -57,14 +56,14 @@ func TestHTTPSigPubKey(t *testing.T) { | |||
defer test.MockVariableValue(&setting.SSH.MinimumKeySizeCheck, false)() | |||
session := loginUser(t, "user1") | |||
token := url.QueryEscape(getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser)) | |||
keysURL := fmt.Sprintf("/api/v1/user/keys?token=%s", token) | |||
keyType := "ssh-rsa" | |||
keyContent := "AAAAB3NzaC1yc2EAAAADAQABAAABAQCqOZB5vkRvXFXups1/0StDRdG8plbNSwsWEnNnP4Bvurxa0+z3W9B8GLKnDiLw5MbpbMNyBlpXw13GfuIeciy10DWTz0xUbiy3J3KabCaT36asIw2y7k6Z0jL0UBnrVENwq5/lUbZYqSZ4rRU744wkhh8TULpzM14npQCZwg6aEbG+MwjzddQ72fR+3BPBrKn5dTmmu8rH99O+U+Nuto81Tg7PA+NUupcHOmhdiEGq49plgVFXK98Vks5tiybL4GuzFyWgyX73Dg/QBMn2eMHt1EMv5Gs3i6GFhKKGo4rjDi9qI6PX5oDR4LTNe6cR8td8YhVD8WFZwLLl/vaYyIqd" | |||
rawKeyBody := api.CreateKeyOption{ | |||
Title: "test-key", | |||
Key: keyType + " " + keyContent, | |||
} | |||
req := NewRequestWithJSON(t, "POST", keysURL, rawKeyBody) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/keys", rawKeyBody). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// parse our private key and create the httpsig request | |||
@@ -73,7 +72,8 @@ func TestHTTPSigPubKey(t *testing.T) { | |||
// create the request | |||
token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadAdmin) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/admin/users?token=%s", token)) | |||
req = NewRequest(t, "GET", "/api/v1/admin/users"). | |||
AddTokenAuth(token) | |||
signer, _, err := httpsig.NewSSHSigner(sshSigner, httpsig.DigestSha512, []string{httpsig.RequestTarget, "(created)", "(expires)"}, httpsig.Signature, 10) | |||
if err != nil { | |||
@@ -81,7 +81,7 @@ func TestHTTPSigPubKey(t *testing.T) { | |||
} | |||
// sign the request | |||
err = signer.SignRequest(keyID, req, nil) | |||
err = signer.SignRequest(keyID, req.Request, nil) | |||
if err != nil { | |||
t.Fatal(err) | |||
} | |||
@@ -124,7 +124,7 @@ func TestHTTPSigCert(t *testing.T) { | |||
// add our cert to the request | |||
certString := base64.RawStdEncoding.EncodeToString(pkcert.(*ssh.Certificate).Marshal()) | |||
req.Header.Add("x-ssh-certificate", certString) | |||
req.SetHeader("x-ssh-certificate", certString) | |||
signer, _, err := httpsig.NewSSHSigner(certSigner, httpsig.DigestSha512, []string{httpsig.RequestTarget, "(created)", "(expires)", "x-ssh-certificate"}, httpsig.Signature, 10) | |||
if err != nil { | |||
@@ -132,7 +132,7 @@ func TestHTTPSigCert(t *testing.T) { | |||
} | |||
// sign the request | |||
err = signer.SignRequest(keyID, req, nil) | |||
err = signer.SignRequest(keyID, req.Request, nil) | |||
if err != nil { | |||
t.Fatal(err) | |||
} |
@@ -33,10 +33,9 @@ func TestAPIGetIssueAttachment(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets/%d?token=%s", | |||
repoOwner.Name, repo.Name, issue.Index, attachment.ID, token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets/%d", repoOwner.Name, repo.Name, issue.Index, attachment.ID)). | |||
AddTokenAuth(token) | |||
resp := session.MakeRequest(t, req, http.StatusOK) | |||
apiAttachment := new(api.Attachment) | |||
DecodeJSON(t, resp, &apiAttachment) | |||
@@ -54,10 +53,9 @@ func TestAPIListIssueAttachments(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets?token=%s", | |||
repoOwner.Name, repo.Name, issue.Index, token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets", repoOwner.Name, repo.Name, issue.Index)). | |||
AddTokenAuth(token) | |||
resp := session.MakeRequest(t, req, http.StatusOK) | |||
apiAttachment := new([]api.Attachment) | |||
DecodeJSON(t, resp, &apiAttachment) | |||
@@ -74,8 +72,6 @@ func TestAPICreateIssueAttachment(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets?token=%s", | |||
repoOwner.Name, repo.Name, issue.Index, token) | |||
filename := "image.png" | |||
buff := generateImg() | |||
@@ -90,7 +86,8 @@ func TestAPICreateIssueAttachment(t *testing.T) { | |||
err = writer.Close() | |||
assert.NoError(t, err) | |||
req := NewRequestWithBody(t, "POST", urlStr, body) | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets", repoOwner.Name, repo.Name, issue.Index), body). | |||
AddTokenAuth(token) | |||
req.Header.Add("Content-Type", writer.FormDataContentType()) | |||
resp := session.MakeRequest(t, req, http.StatusCreated) | |||
@@ -112,11 +109,11 @@ func TestAPIEditIssueAttachment(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets/%d?token=%s", | |||
repoOwner.Name, repo.Name, issue.Index, attachment.ID, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets/%d", | |||
repoOwner.Name, repo.Name, issue.Index, attachment.ID) | |||
req := NewRequestWithValues(t, "PATCH", urlStr, map[string]string{ | |||
"name": newAttachmentName, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := session.MakeRequest(t, req, http.StatusCreated) | |||
apiAttachment := new(api.Attachment) | |||
DecodeJSON(t, resp, &apiAttachment) | |||
@@ -134,10 +131,9 @@ func TestAPIDeleteIssueAttachment(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets/%d?token=%s", | |||
repoOwner.Name, repo.Name, issue.Index, attachment.ID, token) | |||
req := NewRequest(t, "DELETE", urlStr) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/assets/%d", repoOwner.Name, repo.Name, issue.Index, attachment.ID)). | |||
AddTokenAuth(token) | |||
session.MakeRequest(t, req, http.StatusNoContent) | |||
unittest.AssertNotExistsBean(t, &repo_model.Attachment{ID: attachment.ID, IssueID: issue.ID}) |
@@ -26,14 +26,14 @@ func TestAPIModifyLabels(t *testing.T) { | |||
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/labels?token=%s", owner.Name, repo.Name, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/labels", owner.Name, repo.Name) | |||
// CreateLabel | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateLabelOption{ | |||
Name: "TestL 1", | |||
Color: "abcdef", | |||
Description: "test label", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
apiLabel := new(api.Label) | |||
DecodeJSON(t, resp, &apiLabel) | |||
@@ -45,24 +45,26 @@ func TestAPIModifyLabels(t *testing.T) { | |||
Name: "TestL 2", | |||
Color: "#123456", | |||
Description: "jet another test label", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequestWithJSON(t, "POST", urlStr, &api.CreateLabelOption{ | |||
Name: "WrongTestL", | |||
Color: "#12345g", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// ListLabels | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", urlStr). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var apiLabels []*api.Label | |||
DecodeJSON(t, resp, &apiLabels) | |||
assert.Len(t, apiLabels, 2) | |||
// GetLabel | |||
singleURLStr := fmt.Sprintf("/api/v1/repos/%s/%s/labels/%d?token=%s", owner.Name, repo.Name, dbLabel.ID, token) | |||
req = NewRequest(t, "GET", singleURLStr) | |||
singleURLStr := fmt.Sprintf("/api/v1/repos/%s/%s/labels/%d", owner.Name, repo.Name, dbLabel.ID) | |||
req = NewRequest(t, "GET", singleURLStr). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiLabel) | |||
assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color) | |||
@@ -74,17 +76,18 @@ func TestAPIModifyLabels(t *testing.T) { | |||
req = NewRequestWithJSON(t, "PATCH", singleURLStr, &api.EditLabelOption{ | |||
Name: &newName, | |||
Color: &newColor, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiLabel) | |||
assert.EqualValues(t, newColor, apiLabel.Color) | |||
req = NewRequestWithJSON(t, "PATCH", singleURLStr, &api.EditLabelOption{ | |||
Color: &newColorWrong, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// DeleteLabel | |||
req = NewRequest(t, "DELETE", singleURLStr) | |||
req = NewRequest(t, "DELETE", singleURLStr). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
} | |||
@@ -98,11 +101,11 @@ func TestAPIAddIssueLabels(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels?token=%s", | |||
repo.OwnerName, repo.Name, issue.Index, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels", | |||
repo.OwnerName, repo.Name, issue.Index) | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{ | |||
Labels: []int64{1, 2}, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiLabels []*api.Label | |||
DecodeJSON(t, resp, &apiLabels) | |||
@@ -121,11 +124,11 @@ func TestAPIReplaceIssueLabels(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels?token=%s", | |||
owner.Name, repo.Name, issue.Index, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels", | |||
owner.Name, repo.Name, issue.Index) | |||
req := NewRequestWithJSON(t, "PUT", urlStr, &api.IssueLabelsOption{ | |||
Labels: []int64{label.ID}, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiLabels []*api.Label | |||
DecodeJSON(t, resp, &apiLabels) | |||
@@ -145,14 +148,14 @@ func TestAPIModifyOrgLabels(t *testing.T) { | |||
user := "user1" | |||
session := loginUser(t, user) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteOrganization) | |||
urlStr := fmt.Sprintf("/api/v1/orgs/%s/labels?token=%s", owner.Name, token) | |||
urlStr := fmt.Sprintf("/api/v1/orgs/%s/labels", owner.Name) | |||
// CreateLabel | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateLabelOption{ | |||
Name: "TestL 1", | |||
Color: "abcdef", | |||
Description: "test label", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
apiLabel := new(api.Label) | |||
DecodeJSON(t, resp, &apiLabel) | |||
@@ -164,24 +167,26 @@ func TestAPIModifyOrgLabels(t *testing.T) { | |||
Name: "TestL 2", | |||
Color: "#123456", | |||
Description: "jet another test label", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequestWithJSON(t, "POST", urlStr, &api.CreateLabelOption{ | |||
Name: "WrongTestL", | |||
Color: "#12345g", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// ListLabels | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", urlStr). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var apiLabels []*api.Label | |||
DecodeJSON(t, resp, &apiLabels) | |||
assert.Len(t, apiLabels, 4) | |||
// GetLabel | |||
singleURLStr := fmt.Sprintf("/api/v1/orgs/%s/labels/%d?token=%s", owner.Name, dbLabel.ID, token) | |||
req = NewRequest(t, "GET", singleURLStr) | |||
singleURLStr := fmt.Sprintf("/api/v1/orgs/%s/labels/%d", owner.Name, dbLabel.ID) | |||
req = NewRequest(t, "GET", singleURLStr). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiLabel) | |||
assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color) | |||
@@ -193,16 +198,17 @@ func TestAPIModifyOrgLabels(t *testing.T) { | |||
req = NewRequestWithJSON(t, "PATCH", singleURLStr, &api.EditLabelOption{ | |||
Name: &newName, | |||
Color: &newColor, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiLabel) | |||
assert.EqualValues(t, newColor, apiLabel.Color) | |||
req = NewRequestWithJSON(t, "PATCH", singleURLStr, &api.EditLabelOption{ | |||
Color: &newColorWrong, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// DeleteLabel | |||
req = NewRequest(t, "DELETE", singleURLStr) | |||
req = NewRequest(t, "DELETE", singleURLStr). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
} |
@@ -34,48 +34,53 @@ func TestAPIIssuesMilestone(t *testing.T) { | |||
// update values of issue | |||
milestoneState := "closed" | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%d?token=%s", owner.Name, repo.Name, milestone.ID, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%d", owner.Name, repo.Name, milestone.ID) | |||
req := NewRequestWithJSON(t, "PATCH", urlStr, structs.EditMilestoneOption{ | |||
State: &milestoneState, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiMilestone structs.Milestone | |||
DecodeJSON(t, resp, &apiMilestone) | |||
assert.EqualValues(t, "closed", apiMilestone.State) | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", urlStr). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var apiMilestone2 structs.Milestone | |||
DecodeJSON(t, resp, &apiMilestone2) | |||
assert.EqualValues(t, "closed", apiMilestone2.State) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/milestones?token=%s", owner.Name, repo.Name, token), structs.CreateMilestoneOption{ | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/milestones", owner.Name, repo.Name), structs.CreateMilestoneOption{ | |||
Title: "wow", | |||
Description: "closed one", | |||
State: "closed", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, &apiMilestone) | |||
assert.Equal(t, "wow", apiMilestone.Title) | |||
assert.Equal(t, structs.StateClosed, apiMilestone.State) | |||
var apiMilestones []structs.Milestone | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones?state=%s&token=%s", owner.Name, repo.Name, "all", token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones?state=%s", owner.Name, repo.Name, "all")). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiMilestones) | |||
assert.Len(t, apiMilestones, 4) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%s?token=%s", owner.Name, repo.Name, apiMilestones[2].Title, token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%s", owner.Name, repo.Name, apiMilestones[2].Title)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiMilestone) | |||
assert.EqualValues(t, apiMilestones[2], apiMilestone) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones?state=%s&name=%s&token=%s", owner.Name, repo.Name, "all", "milestone2", token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones?state=%s&name=%s", owner.Name, repo.Name, "all", "milestone2")). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiMilestones) | |||
assert.Len(t, apiMilestones, 1) | |||
assert.Equal(t, int64(2), apiMilestones[0].ID) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%d?token=%s", owner.Name, repo.Name, apiMilestone.ID, token)) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%d", owner.Name, repo.Name, apiMilestone.ID)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
} |
@@ -32,14 +32,12 @@ func TestAPIPinIssue(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
// Pin the Issue | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s", | |||
repo.OwnerName, repo.Name, issue.Index, token) | |||
req := NewRequest(t, "POST", urlStr) | |||
req := NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin", repo.OwnerName, repo.Name, issue.Index)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Check if the Issue is pinned | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index) | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var issueAPI api.Issue | |||
DecodeJSON(t, resp, &issueAPI) | |||
@@ -59,28 +57,24 @@ func TestAPIUnpinIssue(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
// Pin the Issue | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s", | |||
repo.OwnerName, repo.Name, issue.Index, token) | |||
req := NewRequest(t, "POST", urlStr) | |||
req := NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin", repo.OwnerName, repo.Name, issue.Index)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Check if the Issue is pinned | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index) | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var issueAPI api.Issue | |||
DecodeJSON(t, resp, &issueAPI) | |||
assert.Equal(t, 1, issueAPI.PinOrder) | |||
// Unpin the Issue | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s", | |||
repo.OwnerName, repo.Name, issue.Index, token) | |||
req = NewRequest(t, "DELETE", urlStr) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin", repo.OwnerName, repo.Name, issue.Index)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Check if the Issue is no longer pinned | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index) | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &issueAPI) | |||
assert.Equal(t, 0, issueAPI.PinOrder) | |||
@@ -100,42 +94,36 @@ func TestAPIMoveIssuePin(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
// Pin the first Issue | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s", | |||
repo.OwnerName, repo.Name, issue.Index, token) | |||
req := NewRequest(t, "POST", urlStr) | |||
req := NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin", repo.OwnerName, repo.Name, issue.Index)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Check if the first Issue is pinned at position 1 | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index) | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var issueAPI api.Issue | |||
DecodeJSON(t, resp, &issueAPI) | |||
assert.Equal(t, 1, issueAPI.PinOrder) | |||
// Pin the second Issue | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s", | |||
repo.OwnerName, repo.Name, issue2.Index, token) | |||
req = NewRequest(t, "POST", urlStr) | |||
req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin", repo.OwnerName, repo.Name, issue2.Index)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Move the first Issue to position 2 | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin/2?token=%s", | |||
repo.OwnerName, repo.Name, issue.Index, token) | |||
req = NewRequest(t, "PATCH", urlStr) | |||
req = NewRequest(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin/2", repo.OwnerName, repo.Name, issue.Index)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Check if the first Issue is pinned at position 2 | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index) | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var issueAPI3 api.Issue | |||
DecodeJSON(t, resp, &issueAPI3) | |||
assert.Equal(t, 2, issueAPI3.PinOrder) | |||
// Check if the second Issue is pinned at position 1 | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue2.Index) | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue2.Index)) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var issueAPI4 api.Issue | |||
DecodeJSON(t, resp, &issueAPI4) | |||
@@ -155,14 +143,12 @@ func TestAPIListPinnedIssues(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
// Pin the Issue | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s", | |||
repo.OwnerName, repo.Name, issue.Index, token) | |||
req := NewRequest(t, "POST", urlStr) | |||
req := NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin", repo.OwnerName, repo.Name, issue.Index)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Check if the Issue is in the List | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/pinned", repo.OwnerName, repo.Name) | |||
req = NewRequest(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/pinned", repo.OwnerName, repo.Name)) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var issueList []api.Issue | |||
DecodeJSON(t, resp, &issueList) | |||
@@ -178,8 +164,7 @@ func TestAPIListPinnedPullrequests(t *testing.T) { | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/pinned", repo.OwnerName, repo.Name) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/pulls/pinned", repo.OwnerName, repo.Name)) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var prList []api.PullRequest | |||
DecodeJSON(t, resp, &prList) | |||
@@ -193,8 +178,7 @@ func TestAPINewPinAllowed(t *testing.T) { | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) | |||
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/new_pin_allowed", owner.Name, repo.Name) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/new_pin_allowed", owner.Name, repo.Name)) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var newPinsAllowed api.NewIssuePinsAllowed |
@@ -33,25 +33,24 @@ func TestAPIIssuesReactions(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/reactions?token=%s", | |||
owner.Name, issue.Repo.Name, issue.Index, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/reactions", owner.Name, issue.Repo.Name, issue.Index) | |||
// Try to add not allowed reaction | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.EditReactionOption{ | |||
Reaction: "wrong", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
// Delete not allowed reaction | |||
req = NewRequestWithJSON(t, "DELETE", urlStr, &api.EditReactionOption{ | |||
Reaction: "zzz", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Add allowed reaction | |||
req = NewRequestWithJSON(t, "POST", urlStr, &api.EditReactionOption{ | |||
Reaction: "rocket", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var apiNewReaction api.Reaction | |||
DecodeJSON(t, resp, &apiNewReaction) | |||
@@ -60,7 +59,8 @@ func TestAPIIssuesReactions(t *testing.T) { | |||
MakeRequest(t, req, http.StatusForbidden) | |||
// Get end result of reaction list of issue #1 | |||
req = NewRequestf(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", urlStr). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var apiReactions []*api.Reaction | |||
DecodeJSON(t, resp, &apiReactions) | |||
@@ -93,19 +93,18 @@ func TestAPICommentReactions(t *testing.T) { | |||
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) | |||
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/reactions?token=%s", | |||
owner.Name, issue.Repo.Name, comment.ID, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/reactions", owner.Name, issue.Repo.Name, comment.ID) | |||
// Try to add not allowed reaction | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.EditReactionOption{ | |||
Reaction: "wrong", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
// Delete none existing reaction | |||
req = NewRequestWithJSON(t, "DELETE", urlStr, &api.EditReactionOption{ | |||
Reaction: "eyes", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
t.Run("UnrelatedCommentID", func(t *testing.T) { | |||
@@ -113,25 +112,25 @@ func TestAPICommentReactions(t *testing.T) { | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4}) | |||
repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
token := getUserToken(t, repoOwner.Name, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/reactions?token=%s", | |||
repoOwner.Name, repo.Name, comment.ID, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/comments/%d/reactions", repoOwner.Name, repo.Name, comment.ID) | |||
req = NewRequestWithJSON(t, "POST", urlStr, &api.EditReactionOption{ | |||
Reaction: "+1", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequestWithJSON(t, "DELETE", urlStr, &api.EditReactionOption{ | |||
Reaction: "+1", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequestf(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", urlStr). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
// Add allowed reaction | |||
req = NewRequestWithJSON(t, "POST", urlStr, &api.EditReactionOption{ | |||
Reaction: "+1", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var apiNewReaction api.Reaction | |||
DecodeJSON(t, resp, &apiNewReaction) | |||
@@ -140,7 +139,8 @@ func TestAPICommentReactions(t *testing.T) { | |||
MakeRequest(t, req, http.StatusForbidden) | |||
// Get end result of reaction list of issue #1 | |||
req = NewRequestf(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", urlStr). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var apiReactions []*api.Reaction | |||
DecodeJSON(t, resp, &apiReactions) |
@@ -27,7 +27,8 @@ func TestAPIListStopWatches(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository, auth_model.AccessTokenScopeReadUser) | |||
req := NewRequestf(t, "GET", "/api/v1/user/stopwatches?token=%s", token) | |||
req := NewRequest(t, "GET", "/api/v1/user/stopwatches"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiWatches []*api.StopWatch | |||
DecodeJSON(t, resp, &apiWatches) | |||
@@ -54,7 +55,8 @@ func TestAPIStopStopWatches(t *testing.T) { | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/issues/%d/stopwatch/stop?token=%s", owner.Name, issue.Repo.Name, issue.Index, token) | |||
req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/issues/%d/stopwatch/stop", owner.Name, issue.Repo.Name, issue.Index). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
MakeRequest(t, req, http.StatusConflict) | |||
} | |||
@@ -70,7 +72,8 @@ func TestAPICancelStopWatches(t *testing.T) { | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/%d/stopwatch/delete?token=%s", owner.Name, issue.Repo.Name, issue.Index, token) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/%d/stopwatch/delete", owner.Name, issue.Repo.Name, issue.Index). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
MakeRequest(t, req, http.StatusConflict) | |||
} | |||
@@ -86,7 +89,8 @@ func TestAPIStartStopWatches(t *testing.T) { | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/issues/%d/stopwatch/start?token=%s", owner.Name, issue.Repo.Name, issue.Index, token) | |||
req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/issues/%d/stopwatch/start", owner.Name, issue.Repo.Name, issue.Index). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
MakeRequest(t, req, http.StatusConflict) | |||
} |
@@ -37,8 +37,8 @@ func TestAPIIssueSubscriptions(t *testing.T) { | |||
testSubscription := func(issue *issues_model.Issue, isWatching bool) { | |||
issueRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID}) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/subscriptions/check?token=%s", issueRepo.OwnerName, issueRepo.Name, issue.Index, token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/subscriptions/check", issueRepo.OwnerName, issueRepo.Name, issue.Index)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
wi := new(api.WatchInfo) | |||
DecodeJSON(t, resp, wi) | |||
@@ -57,22 +57,26 @@ func TestAPIIssueSubscriptions(t *testing.T) { | |||
testSubscription(issue5, false) | |||
issue1Repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue1.RepoID}) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/subscriptions/%s?token=%s", issue1Repo.OwnerName, issue1Repo.Name, issue1.Index, owner.Name, token) | |||
req := NewRequest(t, "DELETE", urlStr) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/subscriptions/%s", issue1Repo.OwnerName, issue1Repo.Name, issue1.Index, owner.Name) | |||
req := NewRequest(t, "DELETE", urlStr). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
testSubscription(issue1, false) | |||
req = NewRequest(t, "DELETE", urlStr) | |||
req = NewRequest(t, "DELETE", urlStr). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
testSubscription(issue1, false) | |||
issue5Repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue5.RepoID}) | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/subscriptions/%s?token=%s", issue5Repo.OwnerName, issue5Repo.Name, issue5.Index, owner.Name, token) | |||
req = NewRequest(t, "PUT", urlStr) | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/subscriptions/%s", issue5Repo.OwnerName, issue5Repo.Name, issue5.Index, owner.Name) | |||
req = NewRequest(t, "PUT", urlStr). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
testSubscription(issue5, true) | |||
req = NewRequest(t, "PUT", urlStr) | |||
req = NewRequest(t, "PUT", urlStr). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
testSubscription(issue5, true) | |||
} |
@@ -84,12 +84,12 @@ func TestAPICreateIssue(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues?state=all&token=%s", owner.Name, repoBefore.Name, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues?state=all", owner.Name, repoBefore.Name) | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateIssueOption{ | |||
Body: body, | |||
Title: title, | |||
Assignee: owner.Name, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var apiIssue api.Issue | |||
DecodeJSON(t, resp, &apiIssue) | |||
@@ -117,7 +117,7 @@ func TestAPICreateIssueParallel(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues?state=all&token=%s", owner.Name, repoBefore.Name, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues?state=all", owner.Name, repoBefore.Name) | |||
var wg sync.WaitGroup | |||
for i := 0; i < 10; i++ { | |||
@@ -130,7 +130,7 @@ func TestAPICreateIssueParallel(t *testing.T) { | |||
Body: newBody, | |||
Title: newTitle, | |||
Assignee: owner.Name, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var apiIssue api.Issue | |||
DecodeJSON(t, resp, &apiIssue) | |||
@@ -171,7 +171,7 @@ func TestAPIEditIssue(t *testing.T) { | |||
body := "new content!" | |||
title := "new title from api set" | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d?token=%s", owner.Name, repoBefore.Name, issueBefore.Index, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", owner.Name, repoBefore.Name, issueBefore.Index) | |||
req := NewRequestWithJSON(t, "PATCH", urlStr, api.EditIssueOption{ | |||
State: &issueState, | |||
RemoveDeadline: &removeDeadline, | |||
@@ -180,7 +180,7 @@ func TestAPIEditIssue(t *testing.T) { | |||
Title: title, | |||
// ToDo change more | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var apiIssue api.Issue | |||
DecodeJSON(t, resp, &apiIssue) |
@@ -30,7 +30,8 @@ func TestAPIGetTrackedTimes(t *testing.T) { | |||
session := loginUser(t, user2.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadIssue) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/times?token=%s", user2.Name, issue2.Repo.Name, issue2.Index, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/times", user2.Name, issue2.Repo.Name, issue2.Index). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiTimes api.TrackedTimeList | |||
DecodeJSON(t, resp, &apiTimes) | |||
@@ -53,7 +54,8 @@ func TestAPIGetTrackedTimes(t *testing.T) { | |||
since := "2000-01-01T00%3A00%3A02%2B00%3A00" // 946684802 | |||
before := "2000-01-01T00%3A00%3A12%2B00%3A00" // 946684812 | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/times?since=%s&before=%s&token=%s", user2.Name, issue2.Repo.Name, issue2.Index, since, before, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/%d/times?since=%s&before=%s", user2.Name, issue2.Repo.Name, issue2.Index, since, before). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var filterAPITimes api.TrackedTimeList | |||
DecodeJSON(t, resp, &filterAPITimes) | |||
@@ -74,11 +76,13 @@ func TestAPIDeleteTrackedTime(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
// Deletion not allowed | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/%d/times/%d?token=%s", user2.Name, issue2.Repo.Name, issue2.Index, time6.ID, token) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/%d/times/%d", user2.Name, issue2.Repo.Name, issue2.Index, time6.ID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
time3 := unittest.AssertExistsAndLoadBean(t, &issues_model.TrackedTime{ID: 3}) | |||
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/%d/times/%d?token=%s", user2.Name, issue2.Repo.Name, issue2.Index, time3.ID, token) | |||
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/%d/times/%d", user2.Name, issue2.Repo.Name, issue2.Index, time3.ID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Delete non existing time | |||
MakeRequest(t, req, http.StatusNotFound) | |||
@@ -88,7 +92,8 @@ func TestAPIDeleteTrackedTime(t *testing.T) { | |||
assert.NoError(t, err) | |||
assert.Equal(t, int64(3661), trackedSeconds) | |||
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/%d/times?token=%s", user2.Name, issue2.Repo.Name, issue2.Index, token) | |||
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/issues/%d/times", user2.Name, issue2.Repo.Name, issue2.Index). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
@@ -108,13 +113,13 @@ func TestAPIAddTrackedTimes(t *testing.T) { | |||
session := loginUser(t, admin.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/times?token=%s", user2.Name, issue2.Repo.Name, issue2.Index, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/times", user2.Name, issue2.Repo.Name, issue2.Index) | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.AddTimeOption{ | |||
Time: 33, | |||
User: user2.Name, | |||
Created: time.Unix(947688818, 0), | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiNewTime api.TrackedTime | |||
DecodeJSON(t, resp, &apiNewTime) |
@@ -55,13 +55,14 @@ func TestCreateReadOnlyDeployKey(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
keysURL := fmt.Sprintf("/api/v1/repos/%s/%s/keys?token=%s", repoOwner.Name, repo.Name, token) | |||
keysURL := fmt.Sprintf("/api/v1/repos/%s/%s/keys", repoOwner.Name, repo.Name) | |||
rawKeyBody := api.CreateKeyOption{ | |||
Title: "read-only", | |||
Key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n", | |||
ReadOnly: true, | |||
} | |||
req := NewRequestWithJSON(t, "POST", keysURL, rawKeyBody) | |||
req := NewRequestWithJSON(t, "POST", keysURL, rawKeyBody). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var newDeployKey api.DeployKey | |||
@@ -75,12 +76,14 @@ func TestCreateReadOnlyDeployKey(t *testing.T) { | |||
// Using the ID of a key that does not belong to the repository must fail | |||
{ | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/keys/%d?token=%s", repoOwner.Name, repo.Name, newDeployKey.ID, token)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/keys/%d", repoOwner.Name, repo.Name, newDeployKey.ID)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
session5 := loginUser(t, "user5") | |||
token5 := getTokenForLoggedInUser(t, session5, auth_model.AccessTokenScopeWriteRepository) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/user5/repo4/keys/%d?token=%s", newDeployKey.ID, token5)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/user5/repo4/keys/%d", newDeployKey.ID)). | |||
AddTokenAuth(token5) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
} | |||
} | |||
@@ -92,12 +95,13 @@ func TestCreateReadWriteDeployKey(t *testing.T) { | |||
session := loginUser(t, repoOwner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
keysURL := fmt.Sprintf("/api/v1/repos/%s/%s/keys?token=%s", repoOwner.Name, repo.Name, token) | |||
keysURL := fmt.Sprintf("/api/v1/repos/%s/%s/keys", repoOwner.Name, repo.Name) | |||
rawKeyBody := api.CreateKeyOption{ | |||
Title: "read-write", | |||
Key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM= nocomment\n", | |||
} | |||
req := NewRequestWithJSON(t, "POST", keysURL, rawKeyBody) | |||
req := NewRequestWithJSON(t, "POST", keysURL, rawKeyBody). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var newDeployKey api.DeployKey | |||
@@ -116,14 +120,14 @@ func TestCreateUserKey(t *testing.T) { | |||
session := loginUser(t, "user1") | |||
token := url.QueryEscape(getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser)) | |||
keysURL := fmt.Sprintf("/api/v1/user/keys?token=%s", token) | |||
keyType := "ssh-rsa" | |||
keyContent := "AAAAB3NzaC1yc2EAAAADAQABAAABgQC4cn+iXnA4KvcQYSV88vGn0Yi91vG47t1P7okprVmhNTkipNRIHWr6WdCO4VDr/cvsRkuVJAsLO2enwjGWWueOO6BodiBgyAOZ/5t5nJNMCNuLGT5UIo/RI1b0WRQwxEZTRjt6mFNw6lH14wRd8ulsr9toSWBPMOGWoYs1PDeDL0JuTjL+tr1SZi/EyxCngpYszKdXllJEHyI79KQgeD0Vt3pTrkbNVTOEcCNqZePSVmUH8X8Vhugz3bnE0/iE9Pb5fkWO9c4AnM1FgI/8Bvp27Fw2ShryIXuR6kKvUqhVMTuOSDHwu6A8jLE5Owt3GAYugDpDYuwTVNGrHLXKpPzrGGPE/jPmaLCMZcsdkec95dYeU3zKODEm8UQZFhmJmDeWVJ36nGrGZHL4J5aTTaeFUJmmXDaJYiJ+K2/ioKgXqnXvltu0A9R8/LGy4nrTJRr4JMLuJFoUXvGm1gXQ70w2LSpk6yl71RNC0hCtsBe8BP8IhYCM0EP5jh7eCMQZNvM=" | |||
rawKeyBody := api.CreateKeyOption{ | |||
Title: "test-key", | |||
Key: keyType + " " + keyContent, | |||
} | |||
req := NewRequestWithJSON(t, "POST", keysURL, rawKeyBody) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/keys", rawKeyBody). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var newPublicKey api.PublicKey | |||
@@ -139,9 +143,8 @@ func TestCreateUserKey(t *testing.T) { | |||
}) | |||
// Search by fingerprint | |||
fingerprintURL := fmt.Sprintf("/api/v1/user/keys?token=%s&fingerprint=%s", token, newPublicKey.Fingerprint) | |||
req = NewRequest(t, "GET", fingerprintURL) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/keys?fingerprint=%s", newPublicKey.Fingerprint)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var fingerprintPublicKeys []api.PublicKey | |||
@@ -150,9 +153,8 @@ func TestCreateUserKey(t *testing.T) { | |||
assert.Equal(t, newPublicKey.ID, fingerprintPublicKeys[0].ID) | |||
assert.Equal(t, user.ID, fingerprintPublicKeys[0].Owner.ID) | |||
fingerprintURL = fmt.Sprintf("/api/v1/users/%s/keys?token=%s&fingerprint=%s", user.Name, token, newPublicKey.Fingerprint) | |||
req = NewRequest(t, "GET", fingerprintURL) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/keys?fingerprint=%s", user.Name, newPublicKey.Fingerprint)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &fingerprintPublicKeys) | |||
@@ -161,17 +163,16 @@ func TestCreateUserKey(t *testing.T) { | |||
assert.Equal(t, user.ID, fingerprintPublicKeys[0].Owner.ID) | |||
// Fail search by fingerprint | |||
fingerprintURL = fmt.Sprintf("/api/v1/user/keys?token=%s&fingerprint=%sA", token, newPublicKey.Fingerprint) | |||
req = NewRequest(t, "GET", fingerprintURL) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/keys?fingerprint=%sA", newPublicKey.Fingerprint)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &fingerprintPublicKeys) | |||
assert.Len(t, fingerprintPublicKeys, 0) | |||
// Fail searching for wrong users key | |||
fingerprintURL = fmt.Sprintf("/api/v1/users/%s/keys?token=%s&fingerprint=%s", "user2", token, newPublicKey.Fingerprint) | |||
req = NewRequest(t, "GET", fingerprintURL) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/keys?fingerprint=%s", "user2", newPublicKey.Fingerprint)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &fingerprintPublicKeys) | |||
@@ -179,11 +180,11 @@ func TestCreateUserKey(t *testing.T) { | |||
// Now login as user 2 | |||
session2 := loginUser(t, "user2") | |||
token2 := url.QueryEscape(getTokenForLoggedInUser(t, session2, auth_model.AccessTokenScopeWriteUser)) | |||
token2 := getTokenForLoggedInUser(t, session2, auth_model.AccessTokenScopeWriteUser) | |||
// Should find key even though not ours, but we shouldn't know whose it is | |||
fingerprintURL = fmt.Sprintf("/api/v1/user/keys?token=%s&fingerprint=%s", token2, newPublicKey.Fingerprint) | |||
req = NewRequest(t, "GET", fingerprintURL) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/keys?fingerprint=%s", newPublicKey.Fingerprint)). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &fingerprintPublicKeys) | |||
@@ -192,9 +193,8 @@ func TestCreateUserKey(t *testing.T) { | |||
assert.Nil(t, fingerprintPublicKeys[0].Owner) | |||
// Should find key even though not ours, but we shouldn't know whose it is | |||
fingerprintURL = fmt.Sprintf("/api/v1/users/%s/keys?token=%s&fingerprint=%s", user.Name, token2, newPublicKey.Fingerprint) | |||
req = NewRequest(t, "GET", fingerprintURL) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/keys?fingerprint=%s", user.Name, newPublicKey.Fingerprint)). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &fingerprintPublicKeys) | |||
@@ -203,8 +203,8 @@ func TestCreateUserKey(t *testing.T) { | |||
assert.Nil(t, fingerprintPublicKeys[0].Owner) | |||
// Fail when searching for key if it is not ours | |||
fingerprintURL = fmt.Sprintf("/api/v1/users/%s/keys?token=%s&fingerprint=%s", "user2", token2, newPublicKey.Fingerprint) | |||
req = NewRequest(t, "GET", fingerprintURL) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/keys?fingerprint=%s", "user2", newPublicKey.Fingerprint)). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &fingerprintPublicKeys) |
@@ -24,7 +24,7 @@ func TestNodeinfo(t *testing.T) { | |||
}() | |||
onGiteaRun(t, func(*testing.T, *url.URL) { | |||
req := NewRequestf(t, "GET", "/api/v1/nodeinfo") | |||
req := NewRequest(t, "GET", "/api/v1/nodeinfo") | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
VerifyJSONSchema(t, resp, "nodeinfo_2.1.json") | |||
@@ -35,7 +35,8 @@ 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&token=%s", since, token)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?since=%s", since)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiNL []api.NotificationThread | |||
DecodeJSON(t, resp, &apiNL) | |||
@@ -46,7 +47,8 @@ func TestAPINotification(t *testing.T) { | |||
// test filter | |||
before := "2000-01-01T01%3A06%3A59%2B00%3A00" // 946688819 | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?all=%s&before=%s&token=%s", "true", before, token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?all=%s&before=%s", "true", before)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiNL) | |||
@@ -62,7 +64,8 @@ func TestAPINotification(t *testing.T) { | |||
assert.False(t, apiNL[2].Pinned) | |||
// -- GET /repos/{owner}/{repo}/notifications -- | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?status-types=unread&token=%s", user2.Name, repo1.Name, token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?status-types=unread", user2.Name, repo1.Name)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiNL) | |||
@@ -70,7 +73,8 @@ func TestAPINotification(t *testing.T) { | |||
assert.EqualValues(t, 4, apiNL[0].ID) | |||
// -- GET /repos/{owner}/{repo}/notifications -- multiple status-types | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?status-types=unread&status-types=pinned&token=%s", user2.Name, repo1.Name, token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?status-types=unread&status-types=pinned", user2.Name, repo1.Name)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiNL) | |||
@@ -86,11 +90,13 @@ func TestAPINotification(t *testing.T) { | |||
// -- GET /notifications/threads/{id} -- | |||
// get forbidden | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/threads/%d?token=%s", 1, token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/threads/%d", 1)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
// get own | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/threads/%d?token=%s", thread5.ID, token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/threads/%d", thread5.ID)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var apiN api.NotificationThread | |||
DecodeJSON(t, resp, &apiN) | |||
@@ -110,28 +116,33 @@ func TestAPINotification(t *testing.T) { | |||
}{} | |||
// -- check notifications -- | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/new?token=%s", token)) | |||
req = NewRequest(t, "GET", "/api/v1/notifications/new"). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &new) | |||
assert.True(t, new.New > 0) | |||
// -- mark notifications as read -- | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?status-types=unread&token=%s", token)) | |||
req = NewRequest(t, "GET", "/api/v1/notifications?status-types=unread"). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiNL) | |||
assert.Len(t, apiNL, 2) | |||
lastReadAt := "2000-01-01T00%3A50%3A01%2B00%3A00" // 946687801 <- only Notification 4 is in this filter ... | |||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?last_read_at=%s&token=%s", user2.Name, repo1.Name, lastReadAt, token)) | |||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?last_read_at=%s", user2.Name, repo1.Name, lastReadAt)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusResetContent) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?status-types=unread&token=%s", token)) | |||
req = NewRequest(t, "GET", "/api/v1/notifications?status-types=unread"). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiNL) | |||
assert.Len(t, apiNL, 1) | |||
// -- PATCH /notifications/threads/{id} -- | |||
req = NewRequest(t, "PATCH", fmt.Sprintf("/api/v1/notifications/threads/%d?token=%s", thread5.ID, token)) | |||
req = NewRequest(t, "PATCH", fmt.Sprintf("/api/v1/notifications/threads/%d", thread5.ID)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusResetContent) | |||
assert.Equal(t, activities_model.NotificationStatusUnread, thread5.Status) | |||
@@ -139,7 +150,8 @@ func TestAPINotification(t *testing.T) { | |||
assert.Equal(t, activities_model.NotificationStatusRead, thread5.Status) | |||
// -- check notifications -- | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/new?token=%s", token)) | |||
req = NewRequest(t, "GET", "/api/v1/notifications/new"). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &new) | |||
assert.True(t, new.New == 0) | |||
@@ -155,7 +167,8 @@ func TestAPINotificationPUT(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteNotification) | |||
// Check notifications are as expected | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?all=true&token=%s", token)) | |||
req := NewRequest(t, "GET", "/api/v1/notifications?all=true"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiNL []api.NotificationThread | |||
DecodeJSON(t, resp, &apiNL) | |||
@@ -178,7 +191,8 @@ func TestAPINotificationPUT(t *testing.T) { | |||
// Notification ID 2 is the only one with status-type read & pinned | |||
// change it to unread. | |||
// | |||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/notifications?status-types=read&status-type=pinned&to-status=unread&token=%s", token)) | |||
req = NewRequest(t, "PUT", "/api/v1/notifications?status-types=read&status-type=pinned&to-status=unread"). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusResetContent) | |||
DecodeJSON(t, resp, &apiNL) | |||
assert.Len(t, apiNL, 1) | |||
@@ -189,7 +203,8 @@ func TestAPINotificationPUT(t *testing.T) { | |||
// | |||
// Now nofication ID 2 is the first in the list and is unread. | |||
// | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?all=true&token=%s", token)) | |||
req = NewRequest(t, "GET", "/api/v1/notifications?all=true"). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiNL) | |||
@@ -36,8 +36,8 @@ func testAPICreateOAuth2Application(t *testing.T) { | |||
ConfidentialClient: true, | |||
} | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/applications/oauth2", &appBody) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/applications/oauth2", &appBody). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var createdApp *api.OAuth2Application | |||
@@ -66,8 +66,8 @@ func testAPIListOAuth2Applications(t *testing.T) { | |||
ConfidentialClient: true, | |||
}) | |||
urlStr := fmt.Sprintf("/api/v1/user/applications/oauth2?token=%s", token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", "/api/v1/user/applications/oauth2"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var appList api.OAuth2ApplicationList | |||
@@ -93,14 +93,16 @@ func testAPIDeleteOAuth2Application(t *testing.T) { | |||
Name: "test-app-1", | |||
}) | |||
urlStr := fmt.Sprintf("/api/v1/user/applications/oauth2/%d?token=%s", oldApp.ID, token) | |||
req := NewRequest(t, "DELETE", urlStr) | |||
urlStr := fmt.Sprintf("/api/v1/user/applications/oauth2/%d", oldApp.ID) | |||
req := NewRequest(t, "DELETE", urlStr). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
unittest.AssertNotExistsBean(t, &auth_model.OAuth2Application{UID: oldApp.UID, Name: oldApp.Name}) | |||
// Delete again will return not found | |||
req = NewRequest(t, "DELETE", urlStr) | |||
req = NewRequest(t, "DELETE", urlStr). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
} | |||
@@ -118,8 +120,8 @@ func testAPIGetOAuth2Application(t *testing.T) { | |||
ConfidentialClient: true, | |||
}) | |||
urlStr := fmt.Sprintf("/api/v1/user/applications/oauth2/%d?token=%s", existApp.ID, token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/applications/oauth2/%d", existApp.ID)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var app api.OAuth2Application | |||
@@ -157,8 +159,8 @@ func testAPIUpdateOAuth2Application(t *testing.T) { | |||
} | |||
urlStr := fmt.Sprintf("/api/v1/user/applications/oauth2/%d", existApp.ID) | |||
req := NewRequestWithJSON(t, "PATCH", urlStr, &appBody) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithJSON(t, "PATCH", urlStr, &appBody). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var app api.OAuth2Application |
@@ -34,7 +34,8 @@ func TestAPIUpdateOrgAvatar(t *testing.T) { | |||
Image: base64.StdEncoding.EncodeToString(avatar), | |||
} | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/orgs/org3/avatar?token="+token, &opts) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/orgs/org3/avatar", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Test what happens if you don't have a valid Base64 string | |||
@@ -42,7 +43,8 @@ func TestAPIUpdateOrgAvatar(t *testing.T) { | |||
Image: "Invalid", | |||
} | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/orgs/org3/avatar?token="+token, &opts) | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/orgs/org3/avatar", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
// Test what happens if you use a file that is not an image | |||
@@ -56,7 +58,8 @@ func TestAPIUpdateOrgAvatar(t *testing.T) { | |||
Image: base64.StdEncoding.EncodeToString(text), | |||
} | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/orgs/org3/avatar?token="+token, &opts) | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/orgs/org3/avatar", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusInternalServerError) | |||
} | |||
@@ -67,6 +70,7 @@ func TestAPIDeleteOrgAvatar(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization) | |||
req := NewRequest(t, "DELETE", "/api/v1/orgs/org3/avatar?token="+token) | |||
req := NewRequest(t, "DELETE", "/api/v1/orgs/org3/avatar"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
} |
@@ -36,7 +36,8 @@ func TestAPIOrgCreate(t *testing.T) { | |||
Location: "Shanghai", | |||
Visibility: "limited", | |||
} | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/orgs?token="+token, &org) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/orgs", &org). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var apiOrg api.Organization | |||
@@ -71,12 +72,14 @@ func TestAPIOrgCreate(t *testing.T) { | |||
}) | |||
} | |||
req = NewRequestf(t, "GET", "/api/v1/orgs/%s?token=%s", org.UserName, token) | |||
req = NewRequestf(t, "GET", "/api/v1/orgs/%s", org.UserName). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiOrg) | |||
assert.EqualValues(t, org.UserName, apiOrg.Name) | |||
req = NewRequestf(t, "GET", "/api/v1/orgs/%s/repos?token=%s", org.UserName, token) | |||
req = NewRequestf(t, "GET", "/api/v1/orgs/%s/repos", org.UserName). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var repos []*api.Repository | |||
@@ -85,7 +88,8 @@ func TestAPIOrgCreate(t *testing.T) { | |||
assert.False(t, repo.Private) | |||
} | |||
req = NewRequestf(t, "GET", "/api/v1/orgs/%s/members?token=%s", org.UserName, token) | |||
req = NewRequestf(t, "GET", "/api/v1/orgs/%s/members", org.UserName). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
// user1 on this org is public | |||
@@ -108,7 +112,8 @@ func TestAPIOrgEdit(t *testing.T) { | |||
Location: "Beijing", | |||
Visibility: "private", | |||
} | |||
req := NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3?token="+token, &org) | |||
req := NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &org). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiOrg api.Organization | |||
@@ -135,7 +140,8 @@ func TestAPIOrgEditBadVisibility(t *testing.T) { | |||
Location: "Beijing", | |||
Visibility: "badvisibility", | |||
} | |||
req := NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3?token="+token, &org) | |||
req := NewRequestWithJSON(t, "PATCH", "/api/v1/orgs/org3", &org). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
}) | |||
} | |||
@@ -165,7 +171,8 @@ func TestAPIGetAll(t *testing.T) { | |||
token := getUserToken(t, "user1", auth_model.AccessTokenScopeReadOrganization) | |||
// accessing with a token will return all orgs | |||
req := NewRequestf(t, "GET", "/api/v1/orgs?token=%s", token) | |||
req := NewRequest(t, "GET", "/api/v1/orgs"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiOrgList []*api.Organization | |||
@@ -175,7 +182,7 @@ func TestAPIGetAll(t *testing.T) { | |||
assert.Equal(t, "limited", apiOrgList[1].Visibility) | |||
// accessing without a token will return only public orgs | |||
req = NewRequestf(t, "GET", "/api/v1/orgs") | |||
req = NewRequest(t, "GET", "/api/v1/orgs") | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiOrgList) | |||
@@ -190,22 +197,23 @@ func TestAPIOrgSearchEmptyTeam(t *testing.T) { | |||
orgName := "org_with_empty_team" | |||
// create org | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/orgs?token="+token, &api.CreateOrgOption{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/orgs", &api.CreateOrgOption{ | |||
UserName: orgName, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// create team with no member | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams?token=%s", orgName, token), &api.CreateTeamOption{ | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", orgName), &api.CreateTeamOption{ | |||
Name: "Empty", | |||
IncludesAllRepositories: true, | |||
Permission: "read", | |||
Units: []string{"repo.code", "repo.issues", "repo.ext_issues", "repo.wiki", "repo.pulls"}, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// case-insensitive search for teams that have no members | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/teams/search?q=%s&token=%s", orgName, "empty", token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/orgs/%s/teams/search?q=%s", orgName, "empty")). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
data := struct { | |||
Ok bool |
@@ -85,12 +85,12 @@ Djfa/2q5bH4699v++uMAAAAAAAAAAAAAAAAAAAAAAHbgA/eXQh8AKAAA` | |||
req := NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader([]byte{})) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader([]byte{})) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader([]byte{})). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeAlpine) | |||
@@ -216,8 +216,8 @@ Djfa/2q5bH4699v++uMAAAAAAAAAAAAAAAAAAAAAAHbgA/eXQh8AKAAA` | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s/x86_64/%s-%s.apk", rootURL, branch, repository, packageName, packageVersion)) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s/x86_64/%s-%s.apk", rootURL, branch, repository, packageName, packageVersion)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s/x86_64/%s-%s.apk", rootURL, branch, repository, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Deleting the last file of an architecture should remove that index |
@@ -132,8 +132,8 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { | |||
content := createPackage("0test", "1.0.0") | |||
req := NewRequestWithBody(t, "PUT", url+"/new", content) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url+"/new", content). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusBadRequest) | |||
var status cargo_router.StatusResponse | |||
@@ -142,8 +142,8 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { | |||
content = createPackage("test", "-1.0.0") | |||
req = NewRequestWithBody(t, "PUT", url+"/new", content) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url+"/new", content). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusBadRequest) | |||
DecodeJSON(t, resp, &status) | |||
@@ -161,8 +161,8 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { | |||
binary.Write(&buf, binary.LittleEndian, uint32(4)) | |||
buf.WriteString("te") | |||
req := NewRequestWithBody(t, "PUT", url+"/new", &buf) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url+"/new", &buf). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
}) | |||
@@ -172,8 +172,8 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { | |||
req := NewRequestWithBody(t, "PUT", url+"/new", createPackage(packageName, packageVersion)) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "PUT", url+"/new", createPackage(packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url+"/new", createPackage(packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var status cargo_router.StatusResponse | |||
@@ -201,8 +201,8 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { | |||
assert.NoError(t, err) | |||
assert.EqualValues(t, 4, pb.Size) | |||
req = NewRequestWithBody(t, "PUT", url+"/new", createPackage(packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url+"/new", createPackage(packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
t.Run("Index", func(t *testing.T) { | |||
@@ -288,8 +288,8 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { | |||
assert.NoError(t, err) | |||
assert.Len(t, pfs, 1) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s/download", url, neturl.PathEscape(packageName), neturl.PathEscape(pv.Version))) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s/download", url, neturl.PathEscape(packageName), neturl.PathEscape(pv.Version))). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "test", resp.Body.String()) | |||
@@ -318,8 +318,8 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { | |||
} | |||
for i, c := range cases { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s?q=%s&page=%d&per_page=%d", url, c.Query, c.Page, c.PerPage)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s?q=%s&page=%d&per_page=%d", url, c.Query, c.Page, c.PerPage)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result cargo_router.SearchResult | |||
@@ -333,8 +333,8 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { | |||
t.Run("Yank", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s/yank", url, neturl.PathEscape(packageName), neturl.PathEscape(packageVersion))) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s/yank", url, neturl.PathEscape(packageName), neturl.PathEscape(packageVersion))). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var status cargo_router.StatusResponse | |||
@@ -353,8 +353,8 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) { | |||
t.Run("Unyank", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "PUT", fmt.Sprintf("%s/%s/%s/unyank", url, neturl.PathEscape(packageName), neturl.PathEscape(packageVersion))) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "PUT", fmt.Sprintf("%s/%s/%s/unyank", url, neturl.PathEscape(packageName), neturl.PathEscape(packageVersion))). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var status cargo_router.StatusResponse |
@@ -93,7 +93,7 @@ nwIDAQAB | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "POST", "/dummy") | |||
u, err := auth.Verify(req, nil, nil, nil) | |||
u, err := auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.NoError(t, err) | |||
}) | |||
@@ -101,9 +101,9 @@ nwIDAQAB | |||
t.Run("NotExistingUser", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "POST", "/dummy") | |||
req.Header.Set("X-Ops-Userid", "not-existing-user") | |||
u, err := auth.Verify(req, nil, nil, nil) | |||
req := NewRequest(t, "POST", "/dummy"). | |||
SetHeader("X-Ops-Userid", "not-existing-user") | |||
u, err := auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.Error(t, err) | |||
}) | |||
@@ -111,14 +111,14 @@ nwIDAQAB | |||
t.Run("Timestamp", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "POST", "/dummy") | |||
req.Header.Set("X-Ops-Userid", user.Name) | |||
u, err := auth.Verify(req, nil, nil, nil) | |||
req := NewRequest(t, "POST", "/dummy"). | |||
SetHeader("X-Ops-Userid", user.Name) | |||
u, err := auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.Error(t, err) | |||
req.Header.Set("X-Ops-Timestamp", "2023-01-01T00:00:00Z") | |||
u, err = auth.Verify(req, nil, nil, nil) | |||
req.SetHeader("X-Ops-Timestamp", "2023-01-01T00:00:00Z") | |||
u, err = auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.Error(t, err) | |||
}) | |||
@@ -126,30 +126,30 @@ nwIDAQAB | |||
t.Run("SigningVersion", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "POST", "/dummy") | |||
req.Header.Set("X-Ops-Userid", user.Name) | |||
req.Header.Set("X-Ops-Timestamp", time.Now().UTC().Format(time.RFC3339)) | |||
u, err := auth.Verify(req, nil, nil, nil) | |||
req := NewRequest(t, "POST", "/dummy"). | |||
SetHeader("X-Ops-Userid", user.Name). | |||
SetHeader("X-Ops-Timestamp", time.Now().UTC().Format(time.RFC3339)) | |||
u, err := auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.Error(t, err) | |||
req.Header.Set("X-Ops-Sign", "version=none") | |||
u, err = auth.Verify(req, nil, nil, nil) | |||
req.SetHeader("X-Ops-Sign", "version=none") | |||
u, err = auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.Error(t, err) | |||
req.Header.Set("X-Ops-Sign", "version=1.4") | |||
u, err = auth.Verify(req, nil, nil, nil) | |||
req.SetHeader("X-Ops-Sign", "version=1.4") | |||
u, err = auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.Error(t, err) | |||
req.Header.Set("X-Ops-Sign", "version=1.0;algorithm=sha2") | |||
u, err = auth.Verify(req, nil, nil, nil) | |||
req.SetHeader("X-Ops-Sign", "version=1.0;algorithm=sha2") | |||
u, err = auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.Error(t, err) | |||
req.Header.Set("X-Ops-Sign", "version=1.0;algorithm=sha256") | |||
u, err = auth.Verify(req, nil, nil, nil) | |||
req.SetHeader("X-Ops-Sign", "version=1.0;algorithm=sha256") | |||
u, err = auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.Error(t, err) | |||
}) | |||
@@ -159,17 +159,18 @@ nwIDAQAB | |||
ts := time.Now().UTC().Format(time.RFC3339) | |||
req := NewRequest(t, "POST", "/dummy") | |||
req.Header.Set("X-Ops-Userid", user.Name) | |||
req.Header.Set("X-Ops-Timestamp", ts) | |||
req.Header.Set("X-Ops-Sign", "version=1.0;algorithm=sha1") | |||
req.Header.Set("X-Ops-Content-Hash", "unused") | |||
req.Header.Set("X-Ops-Authorization-4", "dummy") | |||
u, err := auth.Verify(req, nil, nil, nil) | |||
req := NewRequest(t, "POST", "/dummy"). | |||
SetHeader("X-Ops-Userid", user.Name). | |||
SetHeader("X-Ops-Timestamp", ts). | |||
SetHeader("X-Ops-Sign", "version=1.0;algorithm=sha1"). | |||
SetHeader("X-Ops-Content-Hash", "unused"). | |||
SetHeader("X-Ops-Authorization-4", "dummy") | |||
u, err := auth.Verify(req.Request, nil, nil, nil) | |||
assert.Nil(t, u) | |||
assert.Error(t, err) | |||
signRequest := func(t *testing.T, req *http.Request, version string) { | |||
signRequest := func(t *testing.T, rw *RequestWrapper, version string) { | |||
req := rw.Request | |||
username := req.Header.Get("X-Ops-Userid") | |||
if version != "1.0" && version != "1.3" { | |||
sum := sha1.Sum([]byte(username)) | |||
@@ -255,7 +256,7 @@ nwIDAQAB | |||
defer tests.PrintCurrentTest(t)() | |||
signRequest(t, req, v) | |||
u, err = auth.Verify(req, nil, nil, nil) | |||
u, err = auth.Verify(req.Request, nil, nil, nil) | |||
assert.NotNil(t, u) | |||
assert.NoError(t, err) | |||
}) | |||
@@ -291,9 +292,9 @@ nwIDAQAB | |||
zw.Close() | |||
mpw.Close() | |||
req := NewRequestWithBody(t, "POST", root+"/cookbooks", &body) | |||
req.Header.Add("Content-Type", mpw.FormDataContentType()) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "POST", root+"/cookbooks", &body). | |||
SetHeader("Content-Type", mpw.FormDataContentType()). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, expectedStatus) | |||
} | |||
@@ -394,8 +395,8 @@ nwIDAQAB | |||
} | |||
for i, c := range cases { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/search?q=%s&start=%d&items=%d", root, c.Query, c.Start, c.Items)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/search?q=%s&start=%d&items=%d", root, c.Query, c.Start, c.Items)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result Result | |||
@@ -445,8 +446,8 @@ nwIDAQAB | |||
} | |||
for i, c := range cases { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/cookbooks?start=%d&items=%d&sort=%s", root, c.Start, c.Items, c.Sort)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/cookbooks?start=%d&items=%d&sort=%s", root, c.Start, c.Items, c.Sort)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result Result | |||
@@ -533,8 +534,8 @@ nwIDAQAB | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/cookbooks/%s/versions/%s", root, packageName, "1.0.2")) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/cookbooks/%s/versions/%s", root, packageName, "1.0.2")) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/cookbooks/%s/versions/%s", root, packageName, "1.0.2")). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
pv, err := packages.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages.TypeChef, packageName, "1.0.2") | |||
@@ -548,8 +549,8 @@ nwIDAQAB | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/cookbooks/%s", root, packageName)) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/cookbooks/%s", root, packageName)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/cookbooks/%s", root, packageName)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeChef) |
@@ -59,8 +59,8 @@ 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 = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/packages.json", url)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result composer.ServiceIndexResponse | |||
@@ -75,8 +75,8 @@ func TestPackageComposer(t *testing.T) { | |||
t.Run("MissingVersion", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
}) | |||
@@ -85,8 +85,8 @@ func TestPackageComposer(t *testing.T) { | |||
uploadURL := url + "?version=" + packageVersion | |||
req := NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeComposer) | |||
@@ -110,8 +110,8 @@ func TestPackageComposer(t *testing.T) { | |||
assert.NoError(t, err) | |||
assert.Equal(t, int64(len(content)), pb.Size) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
}) | |||
@@ -128,8 +128,8 @@ func TestPackageComposer(t *testing.T) { | |||
assert.NoError(t, err) | |||
assert.Len(t, pfs, 1) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/files/%s/%s/%s", url, neturl.PathEscape(packageName), neturl.PathEscape(pvs[0].LowerVersion), neturl.PathEscape(pfs[0].LowerName))) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/files/%s/%s/%s", url, neturl.PathEscape(packageName), neturl.PathEscape(pvs[0].LowerVersion), neturl.PathEscape(pfs[0].LowerName))). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, content, resp.Body.Bytes()) | |||
@@ -162,8 +162,8 @@ func TestPackageComposer(t *testing.T) { | |||
} | |||
for i, c := range cases { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/search.json?q=%s&type=%s&page=%d&per_page=%d", url, c.Query, c.Type, c.Page, c.PerPage)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/search.json?q=%s&type=%s&page=%d&per_page=%d", url, c.Query, c.Type, c.Page, c.PerPage)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result composer.SearchResultResponse | |||
@@ -177,8 +177,8 @@ func TestPackageComposer(t *testing.T) { | |||
t.Run("EnumeratePackages", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", url+"/list.json") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", url+"/list.json"). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result map[string][]string | |||
@@ -193,8 +193,8 @@ func TestPackageComposer(t *testing.T) { | |||
t.Run("PackageMetadata", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/p2/%s/%s.json", url, vendorName, projectName)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/p2/%s/%s.json", url, vendorName, projectName)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result composer.PackageMetadataResponse |
@@ -62,11 +62,6 @@ const ( | |||
CC=gcc-10` | |||
) | |||
func addTokenAuthHeader(request *http.Request, token string) *http.Request { | |||
request.Header.Set("Authorization", token) | |||
return request | |||
} | |||
func buildConanfileContent(name, version string) string { | |||
return `from conans import ConanFile, CMake, tools | |||
@@ -90,16 +85,16 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha | |||
recipeURL := fmt.Sprintf("%s/v1/conans/%s/%s/%s/%s", baseURL, name, version, user, channel) | |||
req := NewRequest(t, "GET", recipeURL) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "GET", recipeURL). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/digest", recipeURL)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/digest", recipeURL)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/download_urls", recipeURL)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/download_urls", recipeURL)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/upload_urls", recipeURL)) | |||
@@ -108,8 +103,7 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("%s/upload_urls", recipeURL), map[string]int64{ | |||
conanfileName: int64(len(contentConanfile)), | |||
"removed.txt": 0, | |||
}) | |||
req = addTokenAuthHeader(req, token) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
uploadURLs := make(map[string]string) | |||
@@ -121,22 +115,22 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha | |||
uploadURL := uploadURLs[conanfileName] | |||
assert.NotEmpty(t, uploadURL) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, strings.NewReader(contentConanfile)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, strings.NewReader(contentConanfile)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
packageURL := fmt.Sprintf("%s/packages/%s", recipeURL, conanPackageReference) | |||
req = NewRequest(t, "GET", packageURL) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", packageURL). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/digest", packageURL)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/digest", packageURL)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/download_urls", packageURL)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/download_urls", packageURL)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/upload_urls", packageURL)) | |||
@@ -145,8 +139,7 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("%s/upload_urls", packageURL), map[string]int64{ | |||
conaninfoName: int64(len(contentConaninfo)), | |||
"removed.txt": 0, | |||
}) | |||
req = addTokenAuthHeader(req, token) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
uploadURLs = make(map[string]string) | |||
@@ -158,8 +151,8 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha | |||
uploadURL = uploadURLs[conaninfoName] | |||
assert.NotEmpty(t, uploadURL) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, strings.NewReader(contentConaninfo)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, strings.NewReader(contentConaninfo)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
} | |||
@@ -168,12 +161,12 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha | |||
recipeURL := fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s", baseURL, name, version, user, channel, recipeRevision) | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/files/%s", recipeURL, conanfileName), strings.NewReader(contentConanfile)) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/files/%s", recipeURL, conanfileName), strings.NewReader(contentConanfile)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/files", recipeURL)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/files", recipeURL)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var list *struct { | |||
@@ -185,16 +178,16 @@ 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 = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/files", packageURL)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/files/%s", packageURL, conaninfoName), strings.NewReader(contentConaninfo)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/files/%s", packageURL, conaninfoName), strings.NewReader(contentConaninfo)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/files", packageURL)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/files", packageURL)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
list = nil | |||
@@ -235,21 +228,19 @@ func TestPackageConan(t *testing.T) { | |||
t.Run("Authenticate", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/users/authenticate", url)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/users/authenticate", url)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
body := resp.Body.String() | |||
assert.NotEmpty(t, body) | |||
token = fmt.Sprintf("Bearer %s", body) | |||
token = resp.Body.String() | |||
assert.NotEmpty(t, token) | |||
}) | |||
t.Run("CheckCredentials", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/users/check_credentials", url)) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/users/check_credentials", url)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
}) | |||
@@ -440,8 +431,7 @@ func TestPackageConan(t *testing.T) { | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("%s/v1/conans/%s/%s/%s/%s/packages/delete", url, name, version1, user1, c.Channel), map[string][]string{ | |||
"package_ids": c.References, | |||
}) | |||
req = addTokenAuthHeader(req, token) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
references, err = conan_model.GetPackageReferences(db.DefaultContext, user.ID, rref) | |||
@@ -466,8 +456,8 @@ func TestPackageConan(t *testing.T) { | |||
assert.NoError(t, err) | |||
assert.NotEmpty(t, revisions) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/v1/conans/%s/%s/%s/%s", url, name, version1, user1, c.Channel)) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/v1/conans/%s/%s/%s/%s", url, name, version1, user1, c.Channel)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
revisions, err = conan_model.GetRecipeRevisions(db.DefaultContext, user.ID, rref) | |||
@@ -493,8 +483,8 @@ func TestPackageConan(t *testing.T) { | |||
t.Run("Authenticate", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/users/authenticate", url)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/users/authenticate", url)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
body := resp.Body.String() | |||
@@ -506,8 +496,8 @@ 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 = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/users/check_credentials", url)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
}) | |||
@@ -672,14 +662,14 @@ func TestPackageConan(t *testing.T) { | |||
checkPackageRevisionCount(2) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s/packages/%s/revisions/%s", url, name, version1, user1, channel1, revision1, conanPackageReference, revision1)) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s/packages/%s/revisions/%s", url, name, version1, user1, channel1, revision1, conanPackageReference, revision1)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
checkPackageRevisionCount(1) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s/packages/%s", url, name, version1, user1, channel1, revision1, conanPackageReference)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s/packages/%s", url, name, version1, user1, channel1, revision1, conanPackageReference)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
checkPackageRevisionCount(0) | |||
@@ -688,8 +678,8 @@ func TestPackageConan(t *testing.T) { | |||
checkPackageReferenceCount(1) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s/packages", url, name, version1, user1, channel1, revision2)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s/packages", url, name, version1, user1, channel1, revision2)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
checkPackageReferenceCount(0) | |||
@@ -708,14 +698,14 @@ func TestPackageConan(t *testing.T) { | |||
checkRecipeRevisionCount(2) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s", url, name, version1, user1, channel1, revision1)) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s", url, name, version1, user1, channel1, revision1)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
checkRecipeRevisionCount(1) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s", url, name, version1, user1, channel1)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s", url, name, version1, user1, channel1)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
checkRecipeRevisionCount(0) |
@@ -66,12 +66,12 @@ func TestPackageConda(t *testing.T) { | |||
req := NewRequestWithBody(t, "PUT", root+"/"+filename, bytes.NewReader(buf.Bytes())) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "PUT", root+"/"+filename, bytes.NewReader(buf.Bytes())) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", root+"/"+filename, bytes.NewReader(buf.Bytes())). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequestWithBody(t, "PUT", root+"/"+filename, bytes.NewReader(buf.Bytes())) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", root+"/"+filename, bytes.NewReader(buf.Bytes())). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeConda) | |||
@@ -107,12 +107,12 @@ func TestPackageConda(t *testing.T) { | |||
req := NewRequestWithBody(t, "PUT", root+"/"+channel+"/"+filename, bytes.NewReader(buf.Bytes())) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "PUT", root+"/"+channel+"/"+filename, bytes.NewReader(buf.Bytes())) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", root+"/"+channel+"/"+filename, bytes.NewReader(buf.Bytes())). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequestWithBody(t, "PUT", root+"/"+channel+"/"+filename, bytes.NewReader(buf.Bytes())) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", root+"/"+channel+"/"+filename, bytes.NewReader(buf.Bytes())). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeConda) |
@@ -103,8 +103,8 @@ func TestPackageContainer(t *testing.T) { | |||
anonymousToken = fmt.Sprintf("Bearer %s", tokenResponse.Token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)) | |||
addTokenAuthHeader(req, anonymousToken) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)). | |||
AddTokenAuth(anonymousToken) | |||
MakeRequest(t, req, http.StatusOK) | |||
}) | |||
@@ -116,8 +116,8 @@ func TestPackageContainer(t *testing.T) { | |||
assert.ElementsMatch(t, authenticate, resp.Header().Values("WWW-Authenticate")) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2/token", setting.AppURL)). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
tokenResponse := &TokenResponse{} | |||
@@ -127,8 +127,8 @@ func TestPackageContainer(t *testing.T) { | |||
userToken = fmt.Sprintf("Bearer %s", tokenResponse.Token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusOK) | |||
}) | |||
}) | |||
@@ -136,8 +136,8 @@ 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)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%sv2", setting.AppURL)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "registry/2.0", resp.Header().Get("Docker-Distribution-Api-Version")) | |||
}) | |||
@@ -149,16 +149,16 @@ 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)) | |||
addTokenAuthHeader(req, anonymousToken) | |||
req := NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)). | |||
AddTokenAuth(anonymousToken) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, unknownDigest), bytes.NewReader(blobContent)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, unknownDigest), bytes.NewReader(blobContent)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, blobDigest), bytes.NewReader(blobContent)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, blobDigest), bytes.NewReader(blobContent)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
assert.Equal(t, fmt.Sprintf("/v2/%s/%s/blobs/%s", user.Name, image, blobDigest), resp.Header().Get("Location")) | |||
@@ -179,8 +179,8 @@ 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)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusAccepted) | |||
uuid := resp.Header().Get("Docker-Upload-Uuid") | |||
@@ -193,18 +193,17 @@ func TestPackageContainer(t *testing.T) { | |||
uploadURL := resp.Header().Get("Location") | |||
assert.NotEmpty(t, uploadURL) | |||
req = NewRequestWithBody(t, "PATCH", setting.AppURL+uploadURL[1:]+"000", bytes.NewReader(blobContent)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequestWithBody(t, "PATCH", setting.AppURL+uploadURL[1:]+"000", bytes.NewReader(blobContent)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequestWithBody(t, "PATCH", setting.AppURL+uploadURL[1:], bytes.NewReader(blobContent)) | |||
addTokenAuthHeader(req, userToken) | |||
req.Header.Set("Content-Range", "1-10") | |||
req = NewRequestWithBody(t, "PATCH", setting.AppURL+uploadURL[1:], bytes.NewReader(blobContent)). | |||
AddTokenAuth(userToken). | |||
SetHeader("Content-Range", "1-10") | |||
MakeRequest(t, req, http.StatusRequestedRangeNotSatisfiable) | |||
contentRange := fmt.Sprintf("0-%d", len(blobContent)-1) | |||
req.Header.Set("Content-Range", contentRange) | |||
req.SetHeader("Content-Range", contentRange) | |||
resp = MakeRequest(t, req, http.StatusAccepted) | |||
assert.Equal(t, uuid, resp.Header().Get("Docker-Upload-Uuid")) | |||
@@ -212,8 +211,8 @@ func TestPackageContainer(t *testing.T) { | |||
uploadURL = resp.Header().Get("Location") | |||
req = NewRequest(t, "GET", setting.AppURL+uploadURL[1:]) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "GET", setting.AppURL+uploadURL[1:]). | |||
AddTokenAuth(userToken) | |||
resp = MakeRequest(t, req, http.StatusNoContent) | |||
assert.Equal(t, uuid, resp.Header().Get("Docker-Upload-Uuid")) | |||
@@ -223,8 +222,8 @@ func TestPackageContainer(t *testing.T) { | |||
assert.NoError(t, err) | |||
assert.EqualValues(t, len(blobContent), pbu.BytesReceived) | |||
req = NewRequest(t, "PUT", fmt.Sprintf("%s?digest=%s", setting.AppURL+uploadURL[1:], blobDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "PUT", fmt.Sprintf("%s?digest=%s", setting.AppURL+uploadURL[1:], blobDigest)). | |||
AddTokenAuth(userToken) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
assert.Equal(t, fmt.Sprintf("/v2/%s/%s/blobs/%s", user.Name, image, blobDigest), resp.Header().Get("Location")) | |||
@@ -233,8 +232,8 @@ 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)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads", url)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusAccepted) | |||
uuid := resp.Header().Get("Docker-Upload-Uuid") | |||
@@ -243,19 +242,19 @@ func TestPackageContainer(t *testing.T) { | |||
uploadURL := resp.Header().Get("Location") | |||
assert.NotEmpty(t, uploadURL) | |||
req = NewRequest(t, "GET", setting.AppURL+uploadURL[1:]) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "GET", setting.AppURL+uploadURL[1:]). | |||
AddTokenAuth(userToken) | |||
resp = MakeRequest(t, req, http.StatusNoContent) | |||
assert.Equal(t, uuid, resp.Header().Get("Docker-Upload-Uuid")) | |||
assert.Equal(t, "0-0", resp.Header().Get("Range")) | |||
req = NewRequest(t, "DELETE", setting.AppURL+uploadURL[1:]) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "DELETE", setting.AppURL+uploadURL[1:]). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "GET", setting.AppURL+uploadURL[1:]) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "GET", setting.AppURL+uploadURL[1:]). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
}) | |||
@@ -264,31 +263,31 @@ func TestPackageContainer(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
privateBlobDigest := "sha256:6ccce4863b70f258d691f59609d31b4502e1ba5199942d3bc5d35d17a4ce771d" | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("%sv2/%s/%s/blobs/uploads?digest=%s", setting.AppURL, privateUser.Name, image, privateBlobDigest), strings.NewReader("gitea")) | |||
req = AddBasicAuthHeader(req, privateUser.Name) | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("%sv2/%s/%s/blobs/uploads?digest=%s", setting.AppURL, privateUser.Name, image, privateBlobDigest), strings.NewReader("gitea")). | |||
AddBasicAuth(privateUser.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s", url, unknownDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s", url, unknownDigest)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusAccepted) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s", url, privateBlobDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s", url, privateBlobDigest)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusAccepted) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s", url, blobDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s", url, blobDigest)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
assert.Equal(t, fmt.Sprintf("/v2/%s/%s/blobs/%s", user.Name, image, blobDigest), resp.Header().Get("Location")) | |||
assert.Equal(t, blobDigest, resp.Header().Get("Docker-Content-Digest")) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s&from=%s", url, unknownDigest, "unknown/image")) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s&from=%s", url, unknownDigest, "unknown/image")). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusAccepted) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s&from=%s/%s", url, blobDigest, user.Name, image)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "POST", fmt.Sprintf("%s/blobs/uploads?mount=%s&from=%s/%s", url, blobDigest, user.Name, image)). | |||
AddTokenAuth(userToken) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
assert.Equal(t, fmt.Sprintf("/v2/%s/%s/blobs/%s", user.Name, image, blobDigest), resp.Header().Get("Location")) | |||
@@ -300,18 +299,18 @@ func TestPackageContainer(t *testing.T) { | |||
t.Run("UploadManifest", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, configDigest), strings.NewReader(configContent)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, configDigest), strings.NewReader(configContent)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, tag), strings.NewReader(manifestContent)) | |||
addTokenAuthHeader(req, anonymousToken) | |||
req.Header.Set("Content-Type", "application/vnd.docker.distribution.manifest.v2+json") | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, tag), strings.NewReader(manifestContent)). | |||
AddTokenAuth(anonymousToken). | |||
SetHeader("Content-Type", "application/vnd.docker.distribution.manifest.v2+json") | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, tag), strings.NewReader(manifestContent)) | |||
addTokenAuthHeader(req, userToken) | |||
req.Header.Set("Content-Type", "application/vnd.docker.distribution.manifest.v2+json") | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, tag), strings.NewReader(manifestContent)). | |||
AddTokenAuth(userToken). | |||
SetHeader("Content-Type", "application/vnd.docker.distribution.manifest.v2+json") | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
assert.Equal(t, manifestDigest, resp.Header().Get("Docker-Content-Digest")) | |||
@@ -353,8 +352,8 @@ func TestPackageContainer(t *testing.T) { | |||
} | |||
} | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusOK) | |||
pv, err = packages_model.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, tag) | |||
@@ -362,9 +361,9 @@ func TestPackageContainer(t *testing.T) { | |||
assert.EqualValues(t, 1, pv.DownloadCount) | |||
// Overwrite existing tag should keep the download count | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, tag), strings.NewReader(manifestContent)) | |||
addTokenAuthHeader(req, userToken) | |||
req.Header.Set("Content-Type", oci.MediaTypeImageManifest) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, tag), strings.NewReader(manifestContent)). | |||
AddTokenAuth(userToken). | |||
SetHeader("Content-Type", oci.MediaTypeImageManifest) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pv, err = packages_model.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, image, tag) | |||
@@ -375,12 +374,12 @@ 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)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/unknown-tag", url)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/%s", url, tag)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/%s", url, tag)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, fmt.Sprintf("%d", len(manifestContent)), resp.Header().Get("Content-Length")) | |||
@@ -390,12 +389,12 @@ func TestPackageContainer(t *testing.T) { | |||
t.Run("GetManifest", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/manifests/unknown-tag", url)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/manifests/unknown-tag", url)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, fmt.Sprintf("%d", len(manifestContent)), resp.Header().Get("Content-Length")) | |||
@@ -409,15 +408,15 @@ func TestPackageContainer(t *testing.T) { | |||
t.Run("UploadUntaggedManifest", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, untaggedManifestDigest), strings.NewReader(untaggedManifestContent)) | |||
addTokenAuthHeader(req, userToken) | |||
req.Header.Set("Content-Type", oci.MediaTypeImageManifest) | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, untaggedManifestDigest), strings.NewReader(untaggedManifestContent)). | |||
AddTokenAuth(userToken). | |||
SetHeader("Content-Type", oci.MediaTypeImageManifest) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
assert.Equal(t, untaggedManifestDigest, resp.Header().Get("Docker-Content-Digest")) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/%s", url, untaggedManifestDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/%s", url, untaggedManifestDigest)). | |||
AddTokenAuth(userToken) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, fmt.Sprintf("%d", len(untaggedManifestContent)), resp.Header().Get("Content-Length")) | |||
@@ -449,9 +448,9 @@ func TestPackageContainer(t *testing.T) { | |||
t.Run("UploadIndexManifest", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, multiTag), strings.NewReader(indexManifestContent)) | |||
addTokenAuthHeader(req, userToken) | |||
req.Header.Set("Content-Type", oci.MediaTypeImageIndex) | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/%s", url, multiTag), strings.NewReader(indexManifestContent)). | |||
AddTokenAuth(userToken). | |||
SetHeader("Content-Type", oci.MediaTypeImageIndex) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
assert.Equal(t, indexManifestDigest, resp.Header().Get("Docker-Content-Digest")) | |||
@@ -498,31 +497,31 @@ func TestPackageContainer(t *testing.T) { | |||
t.Run("HeadBlob", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "HEAD", fmt.Sprintf("%s/blobs/%s", url, unknownDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "HEAD", fmt.Sprintf("%s/blobs/%s", url, unknownDigest)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/blobs/%s", url, blobDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/blobs/%s", url, blobDigest)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, fmt.Sprintf("%d", 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)) | |||
addTokenAuthHeader(req, anonymousToken) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/blobs/%s", url, blobDigest)). | |||
AddTokenAuth(anonymousToken) | |||
MakeRequest(t, req, http.StatusOK) | |||
}) | |||
t.Run("GetBlob", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/blobs/%s", url, unknownDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/blobs/%s", url, unknownDigest)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/blobs/%s", url, blobDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/blobs/%s", url, blobDigest)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, fmt.Sprintf("%d", len(blobContent)), resp.Header().Get("Content-Length")) | |||
@@ -566,8 +565,8 @@ func TestPackageContainer(t *testing.T) { | |||
} | |||
for _, c := range cases { | |||
req := NewRequest(t, "GET", c.URL) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "GET", c.URL). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
type TagList struct { | |||
@@ -583,7 +582,8 @@ func TestPackageContainer(t *testing.T) { | |||
assert.Equal(t, c.ExpectedLink, resp.Header().Get("Link")) | |||
} | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s?type=container&q=%s&token=%s", user.Name, image, token)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s?type=container&q=%s", user.Name, image)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiPackages []*api.Package | |||
@@ -595,36 +595,36 @@ func TestPackageContainer(t *testing.T) { | |||
t.Run("Blob", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/blobs/%s", url, blobDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/blobs/%s", url, blobDigest)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusAccepted) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/blobs/%s", url, blobDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/blobs/%s", url, blobDigest)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
t.Run("ManifestByDigest", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/manifests/%s", url, untaggedManifestDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/manifests/%s", url, untaggedManifestDigest)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusAccepted) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/%s", url, untaggedManifestDigest)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/%s", url, untaggedManifestDigest)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
t.Run("ManifestByTag", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/manifests/%s", url, multiTag)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/manifests/%s", url, multiTag)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusAccepted) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/%s", url, multiTag)) | |||
addTokenAuthHeader(req, userToken) | |||
req = NewRequest(t, "HEAD", fmt.Sprintf("%s/manifests/%s", url, multiTag)). | |||
AddTokenAuth(userToken) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
}) | |||
@@ -647,8 +647,8 @@ func TestPackageContainer(t *testing.T) { | |||
go func() { | |||
defer wg.Done() | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, digest), bytes.NewReader(content)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, digest), bytes.NewReader(content)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
assert.Equal(t, digest, resp.Header().Get("Docker-Content-Digest")) | |||
@@ -664,8 +664,8 @@ func TestPackageContainer(t *testing.T) { | |||
return func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%sv2/_catalog", setting.AppURL)) | |||
addTokenAuthHeader(req, userToken) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%sv2/_catalog", setting.AppURL)). | |||
AddTokenAuth(userToken) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
type RepositoryList struct { |
@@ -74,15 +74,13 @@ func TestPackageCran(t *testing.T) { | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive( | |||
"dummy.txt", | |||
[]byte{}, | |||
)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
)).AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive( | |||
"package/DESCRIPTION", | |||
createDescription(packageName, packageVersion), | |||
)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
)).AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeCran) | |||
@@ -105,24 +103,23 @@ func TestPackageCran(t *testing.T) { | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive( | |||
"package/DESCRIPTION", | |||
createDescription(packageName, packageVersion), | |||
)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
)).AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
t.Run("Download", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/src/contrib/%s_%s.tar.gz", url, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/src/contrib/%s_%s.tar.gz", url, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
}) | |||
t.Run("Enumerate", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", url+"/src/contrib/PACKAGES") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", url+"/src/contrib/PACKAGES"). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Contains(t, resp.Header().Get("Content-Type"), "text/plain") | |||
@@ -131,8 +128,8 @@ func TestPackageCran(t *testing.T) { | |||
assert.Contains(t, body, fmt.Sprintf("Package: %s", packageName)) | |||
assert.Contains(t, body, fmt.Sprintf("Version: %s", packageVersion)) | |||
req = NewRequest(t, "GET", url+"/src/contrib/PACKAGES.gz") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", url+"/src/contrib/PACKAGES.gz"). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
assert.Contains(t, resp.Header().Get("Content-Type"), "application/x-gzip") | |||
@@ -160,15 +157,13 @@ func TestPackageCran(t *testing.T) { | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive( | |||
"dummy.txt", | |||
[]byte{}, | |||
)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
)).AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequestWithBody(t, "PUT", uploadURL+"?platform=&rversion=", createArchive( | |||
"package/DESCRIPTION", | |||
createDescription(packageName, packageVersion), | |||
)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
)).AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
uploadURL += "?platform=windows&rversion=4.2" | |||
@@ -176,8 +171,7 @@ func TestPackageCran(t *testing.T) { | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive( | |||
"package/DESCRIPTION", | |||
createDescription(packageName, packageVersion), | |||
)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
)).AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeCran) | |||
@@ -191,8 +185,7 @@ func TestPackageCran(t *testing.T) { | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive( | |||
"package/DESCRIPTION", | |||
createDescription(packageName, packageVersion), | |||
)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
)).AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
@@ -210,8 +203,8 @@ func TestPackageCran(t *testing.T) { | |||
} | |||
for _, c := range cases { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/bin/%s/contrib/%s/%s_%s.zip", url, c.Platform, c.RVersion, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/bin/%s/contrib/%s/%s_%s.zip", url, c.Platform, c.RVersion, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, c.ExpectedStatus) | |||
} | |||
}) | |||
@@ -222,8 +215,8 @@ func TestPackageCran(t *testing.T) { | |||
req := NewRequest(t, "GET", url+"/bin/windows/contrib/4.1/PACKAGES") | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", url+"/bin/windows/contrib/4.2/PACKAGES") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", url+"/bin/windows/contrib/4.2/PACKAGES"). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Contains(t, resp.Header().Get("Content-Type"), "text/plain") | |||
@@ -232,8 +225,8 @@ func TestPackageCran(t *testing.T) { | |||
assert.Contains(t, body, fmt.Sprintf("Package: %s", packageName)) | |||
assert.Contains(t, body, fmt.Sprintf("Version: %s", packageVersion)) | |||
req = NewRequest(t, "GET", url+"/bin/windows/contrib/4.2/PACKAGES.gz") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", url+"/bin/windows/contrib/4.2/PACKAGES.gz"). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
assert.Contains(t, resp.Header().Get("Content-Type"), "application/x-gzip") |
@@ -89,16 +89,16 @@ func TestPackageDebian(t *testing.T) { | |||
req := NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader([]byte{})) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader([]byte{})) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader([]byte{})). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive("", "", "")) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive("", "", "")). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive(packageName, packageVersion, architecture)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive(packageName, packageVersion, architecture)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pv, err := packages.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages.TypeDebian, packageName, packageVersion) | |||
@@ -145,8 +145,8 @@ func TestPackageDebian(t *testing.T) { | |||
return seen | |||
}) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive(packageName, packageVersion, architecture)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, createArchive(packageName, packageVersion, architecture)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
@@ -162,8 +162,8 @@ func TestPackageDebian(t *testing.T) { | |||
t.Run("Packages", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", uploadURL, createArchive(packageName, packageVersion2, architecture)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", uploadURL, createArchive(packageName, packageVersion2, architecture)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
url := fmt.Sprintf("%s/dists/%s/%s/binary-%s/Packages", rootURL, distribution, component, architecture) | |||
@@ -243,12 +243,12 @@ func TestPackageDebian(t *testing.T) { | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/pool/%s/%s/%s/%s/%s", rootURL, distribution, component, packageName, packageVersion, architecture)) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/pool/%s/%s/%s/%s/%s", rootURL, distribution, component, packageName, packageVersion, architecture)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/pool/%s/%s/%s/%s/%s", rootURL, distribution, component, packageName, packageVersion, architecture)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/pool/%s/%s/%s/%s/%s", rootURL, distribution, component, packageName, packageVersion2, architecture)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/pool/%s/%s/%s/%s/%s", rootURL, distribution, component, packageName, packageVersion2, architecture)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/dists/%s/%s/binary-%s/Packages", rootURL, distribution, component, architecture)) |
@@ -35,8 +35,8 @@ func TestPackageGeneric(t *testing.T) { | |||
t.Run("Upload", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", url+"/"+filename, bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url+"/"+filename, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeGeneric) | |||
@@ -62,16 +62,16 @@ func TestPackageGeneric(t *testing.T) { | |||
t.Run("Exists", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", url+"/"+filename, bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url+"/"+filename, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
t.Run("Additional", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", url+"/dummy.bin", bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url+"/dummy.bin", bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// Check deduplication | |||
@@ -84,16 +84,16 @@ func TestPackageGeneric(t *testing.T) { | |||
t.Run("InvalidParameter", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("/api/packages/%s/generic/%s/%s/%s", user.Name, "invalid+package name", packageVersion, filename), bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("/api/packages/%s/generic/%s/%s/%s", user.Name, "invalid+package name", packageVersion, filename), bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("/api/packages/%s/generic/%s/%s/%s", user.Name, packageName, "%20test ", filename), bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("/api/packages/%s/generic/%s/%s/%s", user.Name, packageName, "%20test ", filename), bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("/api/packages/%s/generic/%s/%s/%s", user.Name, packageName, packageVersion, "inval+id.na me"), bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("/api/packages/%s/generic/%s/%s/%s", user.Name, packageName, packageVersion, "inval+id.na me"), bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
}) | |||
}) | |||
@@ -187,15 +187,15 @@ func TestPackageGeneric(t *testing.T) { | |||
req := NewRequest(t, "DELETE", url+"/"+filename) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "DELETE", url+"/"+filename) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", url+"/"+filename). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "GET", url+"/"+filename) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "DELETE", url+"/"+filename) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", url+"/"+filename). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeGeneric) | |||
@@ -205,8 +205,8 @@ func TestPackageGeneric(t *testing.T) { | |||
t.Run("RemovesVersion", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req = NewRequest(t, "DELETE", url+"/dummy.bin") | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", url+"/dummy.bin"). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeGeneric) | |||
@@ -218,15 +218,15 @@ func TestPackageGeneric(t *testing.T) { | |||
t.Run("Version", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", url+"/"+filename, bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url+"/"+filename, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "DELETE", url) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "DELETE", url) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", url). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeGeneric) | |||
@@ -236,8 +236,8 @@ func TestPackageGeneric(t *testing.T) { | |||
req = NewRequest(t, "GET", url+"/"+filename) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "DELETE", url) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", url). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
}) |
@@ -51,16 +51,16 @@ func TestPackageGo(t *testing.T) { | |||
req := NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
content = createArchive(map[string][]byte{ | |||
packageName + "@" + packageVersion + "/go.mod": []byte(goModContent), | |||
}) | |||
req = NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeGo) | |||
@@ -83,8 +83,8 @@ func TestPackageGo(t *testing.T) { | |||
assert.NoError(t, err) | |||
assert.Equal(t, int64(len(content)), pb.Size) | |||
req = NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
time.Sleep(time.Second) | |||
@@ -93,8 +93,8 @@ func TestPackageGo(t *testing.T) { | |||
packageName + "@" + packageVersion2 + "/go.mod": []byte(goModContent), | |||
}) | |||
req = NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
}) | |||
@@ -68,8 +68,8 @@ dependencies: | |||
uploadURL := url + "/api/charts" | |||
req := NewRequestWithBody(t, "POST", uploadURL, bytes.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "POST", uploadURL, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeHelm) | |||
@@ -93,8 +93,8 @@ dependencies: | |||
assert.NoError(t, err) | |||
assert.Equal(t, int64(len(content)), pb.Size) | |||
req = NewRequestWithBody(t, "POST", uploadURL, bytes.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "POST", uploadURL, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
}) | |||
@@ -110,8 +110,8 @@ dependencies: | |||
checkDownloadCount(0) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s", url, filename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s", url, filename)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, content, resp.Body.Bytes()) | |||
@@ -122,8 +122,8 @@ dependencies: | |||
t.Run("Index", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/index.yaml", url)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/index.yaml", url)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
type ChartVersion struct { |
@@ -35,8 +35,8 @@ func TestPackageMaven(t *testing.T) { | |||
filename := fmt.Sprintf("%s-%s.jar", packageName, packageVersion) | |||
putFile := func(t *testing.T, path, content string, expectedStatus int) { | |||
req := NewRequestWithBody(t, "PUT", root+path, strings.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", root+path, strings.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, expectedStatus) | |||
} | |||
@@ -84,14 +84,14 @@ func TestPackageMaven(t *testing.T) { | |||
t.Run("Download", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "HEAD", fmt.Sprintf("%s/%s/%s", root, packageVersion, filename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "HEAD", fmt.Sprintf("%s/%s/%s", root, packageVersion, filename)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
checkHeaders(t, resp.Header(), "application/java-archive", 4) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s", root, packageVersion, filename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s", root, packageVersion, filename)). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
checkHeaders(t, resp.Header(), "application/java-archive", 4) | |||
@@ -165,14 +165,14 @@ func TestPackageMaven(t *testing.T) { | |||
t.Run("DownloadPOM", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "HEAD", fmt.Sprintf("%s/%s/%s.pom", root, packageVersion, filename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "HEAD", fmt.Sprintf("%s/%s/%s.pom", root, packageVersion, filename)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
checkHeaders(t, resp.Header(), "text/xml", int64(len(pomContent))) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s.pom", root, packageVersion, filename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s.pom", root, packageVersion, filename)). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
checkHeaders(t, resp.Header(), "text/xml", int64(len(pomContent))) | |||
@@ -188,8 +188,8 @@ func TestPackageMaven(t *testing.T) { | |||
t.Run("DownloadChecksums", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/1.2.3/%s", root, filename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/1.2.3/%s", root, filename)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
for key, checksum := range map[string]string{ | |||
@@ -198,8 +198,8 @@ func TestPackageMaven(t *testing.T) { | |||
"sha256": "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08", | |||
"sha512": "ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff", | |||
} { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s.%s", root, packageVersion, filename, key)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s.%s", root, packageVersion, filename, key)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, checksum, resp.Body.String()) | |||
@@ -209,8 +209,8 @@ func TestPackageMaven(t *testing.T) { | |||
t.Run("DownloadMetadata", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", root+"/maven-metadata.xml") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", root+"/maven-metadata.xml"). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
expectedMetadata := `<?xml version="1.0" encoding="UTF-8"?>` + "\n<metadata><groupId>com.gitea</groupId><artifactId>test-project</artifactId><versioning><release>1.0.1</release><latest>1.0.1</latest><versions><version>1.0.1</version></versions></versioning></metadata>" | |||
@@ -225,8 +225,8 @@ func TestPackageMaven(t *testing.T) { | |||
"sha256": "3f48322f81c4b2c3bb8649ae1e5c9801476162b520e1c2734ac06b2c06143208", | |||
"sha512": "cb075aa2e2ef1a83cdc14dd1e08c505b72d633399b39e73a21f00f0deecb39a3e2c79f157c1163f8a3854828750706e0dec3a0f5e4778e91f8ec2cf351a855f2", | |||
} { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/maven-metadata.xml.%s", root, key)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/maven-metadata.xml.%s", root, key)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, checksum, resp.Body.String()) |
@@ -87,8 +87,8 @@ func TestPackageNpm(t *testing.T) { | |||
t.Run("Upload", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", root, strings.NewReader(buildUpload(packageVersion))) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequestWithBody(t, "PUT", root, strings.NewReader(buildUpload(packageVersion))). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeNpm) | |||
@@ -119,23 +119,23 @@ func TestPackageNpm(t *testing.T) { | |||
t.Run("UploadExists", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", root, strings.NewReader(buildUpload(packageVersion))) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequestWithBody(t, "PUT", root, strings.NewReader(buildUpload(packageVersion))). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
t.Run("Download", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/-/%s/%s", root, packageVersion, filename)) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/-/%s/%s", root, packageVersion, filename)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
b, _ := base64.StdEncoding.DecodeString(data) | |||
assert.Equal(t, b, resp.Body.Bytes()) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/-/%s", root, filename)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/-/%s", root, filename)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, b, resp.Body.Bytes()) | |||
@@ -149,12 +149,12 @@ func TestPackageNpm(t *testing.T) { | |||
t.Run("PackageMetadata", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/packages/%s/npm/%s", user.Name, "does-not-exist")) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/packages/%s/npm/%s", user.Name, "does-not-exist")). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", root) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", root). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result npm.PackageMetadata | |||
@@ -184,8 +184,8 @@ func TestPackageNpm(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
test := func(t *testing.T, status int, tag, version string) { | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/%s", tagsRoot, tag), strings.NewReader(`"`+version+`"`)) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/%s", tagsRoot, tag), strings.NewReader(`"`+version+`"`)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, status) | |||
} | |||
@@ -199,8 +199,8 @@ func TestPackageNpm(t *testing.T) { | |||
t.Run("ListTags", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", tagsRoot) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "GET", tagsRoot). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result map[string]string | |||
@@ -216,8 +216,8 @@ func TestPackageNpm(t *testing.T) { | |||
t.Run("PackageMetadataDistTags", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", root) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "GET", root). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result npm.PackageMetadata | |||
@@ -234,8 +234,8 @@ func TestPackageNpm(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
test := func(t *testing.T, status int, tag string) { | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", tagsRoot, tag)) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", tagsRoot, tag)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, status) | |||
} | |||
@@ -279,15 +279,15 @@ func TestPackageNpm(t *testing.T) { | |||
t.Run("Delete", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", root, strings.NewReader(buildUpload(packageVersion+"-dummy"))) | |||
req = addTokenAuthHeader(req, token) | |||
req := NewRequestWithBody(t, "PUT", root, strings.NewReader(buildUpload(packageVersion+"-dummy"))). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "PUT", root+"/-rev/dummy") | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "PUT", root+"/-rev/dummy") | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "PUT", root+"/-rev/dummy"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
t.Run("Version", func(t *testing.T) { | |||
@@ -300,8 +300,8 @@ func TestPackageNpm(t *testing.T) { | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/-/%s/%s/-rev/dummy", root, packageVersion, filename)) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/-/%s/%s/-rev/dummy", root, packageVersion, filename)) | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/-/%s/%s/-rev/dummy", root, packageVersion, filename)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
pvs, err = packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeNpm) | |||
@@ -319,8 +319,8 @@ func TestPackageNpm(t *testing.T) { | |||
req := NewRequest(t, "DELETE", root+"/-rev/dummy") | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "DELETE", root+"/-rev/dummy") | |||
req = addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "DELETE", root+"/-rev/dummy"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
pvs, err = packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeNpm) |
@@ -31,9 +31,8 @@ import ( | |||
"github.com/stretchr/testify/assert" | |||
) | |||
func addNuGetAPIKeyHeader(request *http.Request, token string) *http.Request { | |||
request.Header.Set("X-NuGet-ApiKey", token) | |||
return request | |||
func addNuGetAPIKeyHeader(req *RequestWrapper, token string) { | |||
req.SetHeader("X-NuGet-ApiKey", token) | |||
} | |||
func decodeXML(t testing.TB, resp *httptest.ResponseRecorder, v any) { | |||
@@ -141,9 +140,9 @@ func TestPackageNuGet(t *testing.T) { | |||
req := NewRequest(t, "GET", url) | |||
if c.UseBasicAuth { | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req.AddBasicAuth(user.Name) | |||
} else if c.UseTokenAuth { | |||
req = addNuGetAPIKeyHeader(req, token) | |||
addNuGetAPIKeyHeader(req, token) | |||
} | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
@@ -178,9 +177,9 @@ func TestPackageNuGet(t *testing.T) { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/index.json", url)) | |||
if c.UseBasicAuth { | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req.AddBasicAuth(user.Name) | |||
} else if c.UseTokenAuth { | |||
req = addNuGetAPIKeyHeader(req, token) | |||
addNuGetAPIKeyHeader(req, token) | |||
} | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
@@ -219,8 +218,8 @@ func TestPackageNuGet(t *testing.T) { | |||
t.Run("DependencyPackage", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeNuGet) | |||
@@ -244,8 +243,8 @@ func TestPackageNuGet(t *testing.T) { | |||
assert.NoError(t, err) | |||
assert.Equal(t, int64(len(content)), pb.Size) | |||
req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
@@ -278,16 +277,16 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
return &buf | |||
} | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage("unknown-package", "SymbolsPackage")) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), 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 = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage(packageName, "DummyPackage")). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage(packageName, "SymbolsPackage")) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage(packageName, "SymbolsPackage")). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeNuGet) | |||
@@ -330,8 +329,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
} | |||
} | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage(packageName, "SymbolsPackage")) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/symbolpackage", url), createSymbolPackage(packageName, "SymbolsPackage")). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
}) | |||
@@ -348,16 +347,16 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
checkDownloadCount(0) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s.%s.nupkg", url, packageName, packageVersion, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s.%s.nupkg", url, packageName, packageVersion, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, content, resp.Body.Bytes()) | |||
checkDownloadCount(1) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s.%s.snupkg", url, packageName, packageVersion, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s.%s.snupkg", url, packageName, packageVersion, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
checkDownloadCount(1) | |||
@@ -368,12 +367,12 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/symbols/%s/%sFFFFFFFF/gitea.pdb", url, symbolFilename, symbolID)) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/symbols/%s/%sFFFFFFFF/%s", url, symbolFilename, "00000000000000000000000000000000", symbolFilename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/symbols/%s/%sFFFFFFFF/%s", url, symbolFilename, "00000000000000000000000000000000", symbolFilename)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/symbols/%s/%sFFFFffff/%s", url, symbolFilename, symbolID, symbolFilename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/symbols/%s/%sFFFFffff/%s", url, symbolFilename, symbolID, symbolFilename)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
checkDownloadCount(1) | |||
@@ -414,8 +413,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
{"test", 1, 10, 1, 0}, | |||
} | |||
req := NewRequestWithBody(t, "PUT", url, createPackage(packageName, "1.0.99")) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url, createPackage(packageName, "1.0.99")). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
t.Run("v2", func(t *testing.T) { | |||
@@ -423,8 +422,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
defer tests.PrintCurrentTest(t)() | |||
for i, c := range cases { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/Search()?searchTerm='%s'&$skip=%d&$top=%d", url, c.Query, c.Skip, c.Take)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/Search()?searchTerm='%s'&$skip=%d&$top=%d", url, c.Query, c.Skip, c.Take)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result FeedResponse | |||
@@ -433,8 +432,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
assert.Equal(t, c.ExpectedTotal, result.Count, "case %d: unexpected total hits", i) | |||
assert.Len(t, result.Entries, c.ExpectedResults, "case %d: unexpected result count", i) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/Search()/$count?searchTerm='%s'&$skip=%d&$top=%d", url, c.Query, c.Skip, c.Take)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/Search()/$count?searchTerm='%s'&$skip=%d&$top=%d", url, c.Query, c.Skip, c.Take)). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, strconv.FormatInt(c.ExpectedTotal, 10), resp.Body.String(), "case %d: unexpected total hits", i) | |||
@@ -445,8 +444,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
defer tests.PrintCurrentTest(t)() | |||
for i, c := range cases { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/Packages()?$filter=substringof('%s',tolower(Id))&$skip=%d&$top=%d", url, c.Query, c.Skip, c.Take)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/Packages()?$filter=substringof('%s',tolower(Id))&$skip=%d&$top=%d", url, c.Query, c.Skip, c.Take)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result FeedResponse | |||
@@ -455,8 +454,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
assert.Equal(t, c.ExpectedTotal, result.Count, "case %d: unexpected total hits", i) | |||
assert.Len(t, result.Entries, c.ExpectedResults, "case %d: unexpected result count", i) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/Packages()/$count?$filter=substringof('%s',tolower(Id))&$skip=%d&$top=%d", url, c.Query, c.Skip, c.Take)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/Packages()/$count?$filter=substringof('%s',tolower(Id))&$skip=%d&$top=%d", url, c.Query, c.Skip, c.Take)). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, strconv.FormatInt(c.ExpectedTotal, 10), resp.Body.String(), "case %d: unexpected total hits", i) | |||
@@ -464,8 +463,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
}) | |||
t.Run("Next", func(t *testing.T) { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/Search()?searchTerm='test'&$skip=0&$top=1", url)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/Search()?searchTerm='test'&$skip=0&$top=1", url)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result FeedResponse | |||
@@ -479,8 +478,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
defer tests.PrintCurrentTest(t)() | |||
for i, c := range cases { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/query?q=%s&skip=%d&take=%d", url, c.Query, c.Skip, c.Take)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/query?q=%s&skip=%d&take=%d", url, c.Query, c.Skip, c.Take)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result nuget.SearchResultResponse | |||
@@ -493,12 +492,12 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
t.Run("EnforceGrouped", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequestWithBody(t, "PUT", url, createPackage(packageName+".dummy", "1.0.0")) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url, createPackage(packageName+".dummy", "1.0.0")). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/query?q=%s", url, packageName)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/query?q=%s", url, packageName)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result nuget.SearchResultResponse | |||
@@ -514,14 +513,14 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
} | |||
} | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s", url, packageName+".dummy", "1.0.0")) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s", url, packageName+".dummy", "1.0.0")). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
}) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s", url, packageName, "1.0.99")) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s", url, packageName, "1.0.99")). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
@@ -533,8 +532,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
t.Run("RegistrationIndex", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/registration/%s/index.json", url, packageName)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/registration/%s/index.json", url, packageName)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result nuget.RegistrationIndexResponse | |||
@@ -560,8 +559,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
t.Run("v2", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/Packages(Id='%s',Version='%s')", url, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/Packages(Id='%s',Version='%s')", url, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result FeedEntry | |||
@@ -577,8 +576,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
t.Run("v3", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/registration/%s/%s.json", url, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/registration/%s/%s.json", url, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result nuget.RegistrationLeafResponse | |||
@@ -595,8 +594,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
t.Run("v2", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/FindPackagesById()?id='%s'&$top=1", url, packageName)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/FindPackagesById()?id='%s'&$top=1", url, packageName)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result FeedResponse | |||
@@ -606,8 +605,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
assert.Equal(t, packageVersion, result.Entries[0].Properties.Version) | |||
assert.Condition(t, containsOneNextLink(t, result.Links)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/FindPackagesById()/$count?id='%s'", url, packageName)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/FindPackagesById()/$count?id='%s'", url, packageName)). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "1", resp.Body.String()) | |||
@@ -616,8 +615,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
t.Run("v3", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/index.json", url, packageName)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/index.json", url, packageName)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var result nuget.PackageVersionsResponse | |||
@@ -631,8 +630,8 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
t.Run("Delete", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s", url, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s", url, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeNuGet) | |||
@@ -643,20 +642,20 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`) | |||
t.Run("DownloadNotExists", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s.%s.nupkg", url, packageName, packageVersion, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s.%s.nupkg", url, packageName, packageVersion, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s.%s.snupkg", url, packageName, packageVersion, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s.%s.snupkg", url, packageName, packageVersion, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
t.Run("DeleteNotExists", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/package/%s/%s", url, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/package/%s/%s", url, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
} |
@@ -66,8 +66,8 @@ description: ` + packageDescription | |||
req := NewRequest(t, "GET", uploadURL) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "GET", uploadURL) | |||
addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", uploadURL). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
type UploadRequest struct { | |||
@@ -88,16 +88,16 @@ description: ` + packageDescription | |||
_ = writer.Close() | |||
req := NewRequestWithBody(t, "POST", url, body) | |||
req.Header.Add("Content-Type", writer.FormDataContentType()) | |||
addTokenAuthHeader(req, token) | |||
req := NewRequestWithBody(t, "POST", url, body). | |||
SetHeader("Content-Type", writer.FormDataContentType()). | |||
AddTokenAuth(token) | |||
return MakeRequest(t, req, expectedStatus) | |||
} | |||
resp = uploadFile(t, result.URL, content, http.StatusNoContent) | |||
req = NewRequest(t, "GET", resp.Header().Get("Location")) | |||
addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", resp.Header().Get("Location")). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypePub) |
@@ -54,9 +54,9 @@ func TestPackagePyPI(t *testing.T) { | |||
_ = writer.Close() | |||
req := NewRequestWithBody(t, "POST", root, body) | |||
req.Header.Add("Content-Type", writer.FormDataContentType()) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "POST", root, body). | |||
SetHeader("Content-Type", writer.FormDataContentType()). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, expectedStatus) | |||
} | |||
@@ -137,8 +137,8 @@ func TestPackagePyPI(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
downloadFile := func(filename string) { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/files/%s/%s/%s", root, packageName, packageVersion, filename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/files/%s/%s/%s", root, packageName, packageVersion, filename)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, []byte(content), resp.Body.Bytes()) | |||
@@ -156,8 +156,8 @@ func TestPackagePyPI(t *testing.T) { | |||
t.Run("PackageMetadata", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/simple/%s", root, packageName)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/simple/%s", root, packageName)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
htmlDoc := NewHTMLParser(t, resp.Body) |
@@ -105,8 +105,8 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`, user.Name, user.Name, setting.AppN | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeRpm) | |||
@@ -130,8 +130,8 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`, user.Name, user.Name, setting.AppN | |||
assert.NoError(t, err) | |||
assert.Equal(t, int64(len(content)), pb.Size) | |||
req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "PUT", url, bytes.NewReader(content)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
@@ -404,16 +404,16 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`, user.Name, user.Name, setting.AppN | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/package/%s/%s/%s", rootURL, packageName, packageVersion, packageArchitecture)) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/package/%s/%s/%s", rootURL, packageName, packageVersion, packageArchitecture)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/package/%s/%s/%s", rootURL, packageName, packageVersion, packageArchitecture)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeRpm) | |||
assert.NoError(t, err) | |||
assert.Empty(t, pvs) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/package/%s/%s/%s", rootURL, packageName, packageVersion, packageArchitecture)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("%s/package/%s/%s/%s", rootURL, packageName, packageVersion, packageArchitecture)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
} |
@@ -115,8 +115,8 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA`) | |||
root := fmt.Sprintf("/api/packages/%s/rubygems", user.Name) | |||
uploadFile := func(t *testing.T, expectedStatus int) { | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("%s/api/v1/gems", root), bytes.NewReader(gemContent)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "POST", fmt.Sprintf("%s/api/v1/gems", root), bytes.NewReader(gemContent)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, expectedStatus) | |||
} | |||
@@ -156,8 +156,8 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA`) | |||
t.Run("Download", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/gems/%s", root, packageFilename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/gems/%s", root, packageFilename)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, gemContent, resp.Body.Bytes()) | |||
@@ -171,8 +171,8 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA`) | |||
t.Run("DownloadGemspec", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/quick/Marshal.4.8/%sspec.rz", root, packageFilename)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/quick/Marshal.4.8/%sspec.rz", root, packageFilename)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
b, _ := base64.StdEncoding.DecodeString(`eJxi4Si1EndPzbWyCi5ITc5My0xOLMnMz2M8zMIRLeGpxGWsZ6RnzGbF5hqSyempxJWeWZKayGbN | |||
@@ -191,8 +191,8 @@ gAAAAP//MS06Gw==`) | |||
defer tests.PrintCurrentTest(t)() | |||
enumeratePackages := func(t *testing.T, endpoint string, expectedContent []byte) { | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s", root, endpoint)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s", root, endpoint)). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, expectedContent, resp.Body.Bytes()) | |||
@@ -215,9 +215,9 @@ gAAAAP//MS06Gw==`) | |||
writer.WriteField("version", packageVersion) | |||
writer.Close() | |||
req := NewRequestWithBody(t, "DELETE", fmt.Sprintf("%s/api/v1/gems/yank", root), &body) | |||
req.Header.Add("Content-Type", writer.FormDataContentType()) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "DELETE", fmt.Sprintf("%s/api/v1/gems/yank", root), &body). | |||
SetHeader("Content-Type", writer.FormDataContentType()). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeRubyGems) |
@@ -62,9 +62,9 @@ func TestPackageSwift(t *testing.T) { | |||
assert.Equal(t, "application/problem+json", resp.Header().Get("Content-Type")) | |||
} | |||
req := NewRequestWithBody(t, "PUT", url+"/scope/package/1.0.0", strings.NewReader("")) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req.Header.Add("Accept", "application/unknown") | |||
req := NewRequestWithBody(t, "PUT", url+"/scope/package/1.0.0", strings.NewReader("")). | |||
AddBasicAuth(user.Name). | |||
SetHeader("Accept", "application/unknown") | |||
resp := MakeRequest(t, req, http.StatusBadRequest) | |||
assert.Equal(t, "1", resp.Header().Get("Content-Version")) | |||
@@ -87,10 +87,10 @@ func TestPackageSwift(t *testing.T) { | |||
mpw.Close() | |||
req := NewRequestWithBody(t, "PUT", url, &body) | |||
req.Header.Add("Content-Type", mpw.FormDataContentType()) | |||
req.Header.Add("Accept", swift_router.AcceptJSON) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url, &body). | |||
SetHeader("Content-Type", mpw.FormDataContentType()). | |||
SetHeader("Accept", swift_router.AcceptJSON). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, expectedStatus) | |||
} | |||
@@ -106,8 +106,8 @@ func TestPackageSwift(t *testing.T) { | |||
} | |||
for _, triple := range []string{"/sc_ope/package/1.0.0", "/scope/pack~age/1.0.0", "/scope/package/1_0.0"} { | |||
req := NewRequestWithBody(t, "PUT", url+triple, bytes.NewReader([]byte{})) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url+triple, bytes.NewReader([]byte{})). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusBadRequest) | |||
assert.Equal(t, "1", resp.Header().Get("Content-Version")) | |||
@@ -168,9 +168,9 @@ func TestPackageSwift(t *testing.T) { | |||
t.Run("Download", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s/%s.zip", url, packageScope, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req.Header.Add("Accept", swift_router.AcceptZip) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s/%s.zip", url, packageScope, packageName, packageVersion)). | |||
AddBasicAuth(user.Name). | |||
SetHeader("Accept", swift_router.AcceptZip) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "1", resp.Header().Get("Content-Version")) | |||
@@ -188,9 +188,9 @@ func TestPackageSwift(t *testing.T) { | |||
t.Run("EnumeratePackageVersions", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s", url, packageScope, packageName)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req.Header.Add("Accept", swift_router.AcceptJSON) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s", url, packageScope, packageName)). | |||
AddBasicAuth(user.Name). | |||
SetHeader("Accept", swift_router.AcceptJSON) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
versionURL := setting.AppURL + url[1:] + fmt.Sprintf("/%s/%s/%s", packageScope, packageName, packageVersion) | |||
@@ -207,8 +207,8 @@ func TestPackageSwift(t *testing.T) { | |||
assert.Contains(t, result.Releases, packageVersion) | |||
assert.Equal(t, versionURL, result.Releases[packageVersion].URL) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s.json", url, packageScope, packageName)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s.json", url, packageScope, packageName)). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, body, resp.Body.String()) | |||
@@ -217,9 +217,9 @@ func TestPackageSwift(t *testing.T) { | |||
t.Run("PackageVersionMetadata", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s/%s", url, packageScope, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req.Header.Add("Accept", swift_router.AcceptJSON) | |||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s/%s", url, packageScope, packageName, packageVersion)). | |||
AddBasicAuth(user.Name). | |||
SetHeader("Accept", swift_router.AcceptJSON) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "1", resp.Header().Get("Content-Version")) | |||
@@ -249,8 +249,8 @@ func TestPackageSwift(t *testing.T) { | |||
assert.Equal(t, "Swift", result.Metadata.ProgrammingLanguage.Name) | |||
assert.Equal(t, packageAuthor, result.Metadata.Author.GivenName) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s/%s.json", url, packageScope, packageName, packageVersion)) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s/%s.json", url, packageScope, packageName, packageVersion)). | |||
AddBasicAuth(user.Name) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, body, resp.Body.String()) | |||
@@ -262,9 +262,9 @@ func TestPackageSwift(t *testing.T) { | |||
t.Run("Default", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", manifestURL) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req.Header.Add("Accept", swift_router.AcceptSwift) | |||
req := NewRequest(t, "GET", manifestURL). | |||
AddBasicAuth(user.Name). | |||
SetHeader("Accept", swift_router.AcceptSwift) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "1", resp.Header().Get("Content-Version")) | |||
@@ -275,24 +275,24 @@ func TestPackageSwift(t *testing.T) { | |||
t.Run("DifferentVersion", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", manifestURL+"?swift-version=5.6") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", manifestURL+"?swift-version=5.6"). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "1", resp.Header().Get("Content-Version")) | |||
assert.Equal(t, "text/x-swift", resp.Header().Get("Content-Type")) | |||
assert.Equal(t, contentManifest2, resp.Body.String()) | |||
req = NewRequest(t, "GET", manifestURL+"?swift-version=5.6.0") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", manifestURL+"?swift-version=5.6.0"). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
}) | |||
t.Run("Redirect", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", manifestURL+"?swift-version=1.0") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", manifestURL+"?swift-version=1.0"). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusSeeOther) | |||
assert.Equal(t, "1", resp.Header().Get("Content-Version")) | |||
@@ -303,8 +303,8 @@ func TestPackageSwift(t *testing.T) { | |||
t.Run("LookupPackageIdentifiers", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", url+"/identifiers") | |||
req.Header.Add("Accept", swift_router.AcceptJSON) | |||
req := NewRequest(t, "GET", url+"/identifiers"). | |||
SetHeader("Accept", swift_router.AcceptJSON) | |||
resp := MakeRequest(t, req, http.StatusBadRequest) | |||
assert.Equal(t, "1", resp.Header().Get("Content-Version")) | |||
@@ -313,8 +313,8 @@ func TestPackageSwift(t *testing.T) { | |||
req = NewRequest(t, "GET", url+"/identifiers?url=https://unknown.host/") | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", url+"/identifiers?url="+packageRepositoryURL) | |||
req.Header.Add("Accept", swift_router.AcceptJSON) | |||
req = NewRequest(t, "GET", url+"/identifiers?url="+packageRepositoryURL). | |||
SetHeader("Accept", swift_router.AcceptJSON) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var result *swift_router.LookupPackageIdentifiersResponse |
@@ -41,14 +41,15 @@ func TestPackageAPI(t *testing.T) { | |||
filename := "file.bin" | |||
url := fmt.Sprintf("/api/packages/%s/generic/%s/%s/%s", user.Name, packageName, packageVersion, filename) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader([]byte{})) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader([]byte{})). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
t.Run("ListPackages", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s?token=%s", user.Name, tokenReadPackage)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s", user.Name)). | |||
AddTokenAuth(tokenReadPackage) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiPackages []*api.Package | |||
@@ -65,10 +66,12 @@ func TestPackageAPI(t *testing.T) { | |||
t.Run("GetPackage", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/dummy/%s/%s?token=%s", user.Name, packageName, packageVersion, tokenReadPackage)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/dummy/%s/%s", user.Name, packageName, packageVersion)). | |||
AddTokenAuth(tokenReadPackage) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s?token=%s", user.Name, packageName, packageVersion, tokenReadPackage)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)). | |||
AddTokenAuth(tokenReadPackage) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var p *api.Package | |||
@@ -87,7 +90,8 @@ func TestPackageAPI(t *testing.T) { | |||
assert.NoError(t, err) | |||
// no repository link | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s?token=%s", user.Name, packageName, packageVersion, tokenReadPackage)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)). | |||
AddTokenAuth(tokenReadPackage) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var ap1 *api.Package | |||
@@ -97,7 +101,8 @@ func TestPackageAPI(t *testing.T) { | |||
// link to public repository | |||
assert.NoError(t, packages_model.SetRepositoryLink(db.DefaultContext, p.ID, 1)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s?token=%s", user.Name, packageName, packageVersion, tokenReadPackage)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)). | |||
AddTokenAuth(tokenReadPackage) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var ap2 *api.Package | |||
@@ -108,7 +113,8 @@ func TestPackageAPI(t *testing.T) { | |||
// link to private repository | |||
assert.NoError(t, packages_model.SetRepositoryLink(db.DefaultContext, p.ID, 2)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s?token=%s", user.Name, packageName, packageVersion, tokenReadPackage)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)). | |||
AddTokenAuth(tokenReadPackage) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var ap3 *api.Package | |||
@@ -122,10 +128,12 @@ func TestPackageAPI(t *testing.T) { | |||
t.Run("ListPackageFiles", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/dummy/%s/%s/files?token=%s", user.Name, packageName, packageVersion, tokenReadPackage)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/dummy/%s/%s/files", user.Name, packageName, packageVersion)). | |||
AddTokenAuth(tokenReadPackage) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s/files?token=%s", user.Name, packageName, packageVersion, tokenReadPackage)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s/files", user.Name, packageName, packageVersion)). | |||
AddTokenAuth(tokenReadPackage) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var files []*api.PackageFile | |||
@@ -143,10 +151,12 @@ func TestPackageAPI(t *testing.T) { | |||
t.Run("DeletePackage", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/packages/%s/dummy/%s/%s?token=%s", user.Name, packageName, packageVersion, tokenDeletePackage)) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/packages/%s/dummy/%s/%s", user.Name, packageName, packageVersion)). | |||
AddTokenAuth(tokenDeletePackage) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s?token=%s", user.Name, packageName, packageVersion, tokenDeletePackage)) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)). | |||
AddTokenAuth(tokenDeletePackage) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
} | |||
@@ -170,7 +180,7 @@ func TestPackageAccess(t *testing.T) { | |||
url := fmt.Sprintf("/api/packages/%s/generic/test-package/1.0/%s.bin", owner.Name, filename) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader([]byte{1})) | |||
if doer != nil { | |||
AddBasicAuthHeader(req, doer.Name) | |||
req.AddBasicAuth(doer.Name) | |||
} | |||
MakeRequest(t, req, expectedStatus) | |||
} | |||
@@ -179,7 +189,7 @@ func TestPackageAccess(t *testing.T) { | |||
url := fmt.Sprintf("/api/packages/%s/generic/test-package/1.0/admin.bin", owner.Name) | |||
req := NewRequest(t, "GET", url) | |||
if doer != nil { | |||
AddBasicAuthHeader(req, doer.Name) | |||
req.AddBasicAuth(doer.Name) | |||
} | |||
MakeRequest(t, req, expectedStatus) | |||
} | |||
@@ -374,7 +384,8 @@ func TestPackageAccess(t *testing.T) { | |||
{limitedOrgNoMember, http.StatusOK}, | |||
{publicOrgNoMember, http.StatusOK}, | |||
} { | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s?token=%s", target.Owner.Name, tokenReadPackage)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s", target.Owner.Name)). | |||
AddTokenAuth(tokenReadPackage) | |||
MakeRequest(t, req, target.ExpectedStatus) | |||
} | |||
}) | |||
@@ -396,8 +407,8 @@ func TestPackageQuota(t *testing.T) { | |||
uploadPackage := func(doer *user_model.User, version string, expectedStatus int) { | |||
url := fmt.Sprintf("/api/packages/%s/generic/test-package/%s/file.bin", user.Name, version) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader([]byte{1})) | |||
AddBasicAuthHeader(req, doer.Name) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader([]byte{1})). | |||
AddBasicAuth(doer.Name) | |||
MakeRequest(t, req, expectedStatus) | |||
} | |||
@@ -424,8 +435,8 @@ func TestPackageQuota(t *testing.T) { | |||
uploadBlob := func(doer *user_model.User, data string, expectedStatus int) { | |||
url := fmt.Sprintf("/v2/%s/quota-test/blobs/uploads?digest=sha256:%x", user.Name, sha256.Sum256([]byte(data))) | |||
req := NewRequestWithBody(t, "POST", url, strings.NewReader(data)) | |||
AddBasicAuthHeader(req, doer.Name) | |||
req := NewRequestWithBody(t, "POST", url, strings.NewReader(data)). | |||
AddBasicAuth(doer.Name) | |||
MakeRequest(t, req, expectedStatus) | |||
} | |||
@@ -454,18 +465,18 @@ func TestPackageCleanup(t *testing.T) { | |||
// Upload and delete a generic package and upload a container blob | |||
data, _ := util.CryptoRandomBytes(5) | |||
url := fmt.Sprintf("/api/packages/%s/generic/cleanup-test/1.1.1/file.bin", user.Name) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(data)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(data)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "DELETE", url) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "DELETE", url). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
data, _ = util.CryptoRandomBytes(5) | |||
url = fmt.Sprintf("/v2/%s/cleanup-test/blobs/uploads?digest=sha256:%x", user.Name, sha256.Sum256(data)) | |||
req = NewRequestWithBody(t, "POST", url, bytes.NewReader(data)) | |||
AddBasicAuthHeader(req, user.Name) | |||
req = NewRequestWithBody(t, "POST", url, bytes.NewReader(data)). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
pbs, err := packages_model.FindExpiredUnreferencedBlobs(db.DefaultContext, duration) | |||
@@ -592,8 +603,8 @@ func TestPackageCleanup(t *testing.T) { | |||
for _, v := range c.Versions { | |||
url := fmt.Sprintf("/api/packages/%s/generic/package/%s/file.bin", user.Name, v.Version) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader([]byte{1})) | |||
AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader([]byte{1})). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusCreated) | |||
if v.Created != 0 { |
@@ -64,8 +64,8 @@ func TestPackageVagrant(t *testing.T) { | |||
req := NewRequest(t, "GET", authenticateURL) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequest(t, "GET", authenticateURL) | |||
addTokenAuthHeader(req, token) | |||
req = NewRequest(t, "GET", authenticateURL). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
}) | |||
@@ -82,8 +82,8 @@ func TestPackageVagrant(t *testing.T) { | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)) | |||
addTokenAuthHeader(req, token) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "HEAD", boxURL) | |||
@@ -111,8 +111,8 @@ func TestPackageVagrant(t *testing.T) { | |||
assert.NoError(t, err) | |||
assert.Equal(t, int64(len(content)), pb.Size) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)) | |||
addTokenAuthHeader(req, token) | |||
req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusConflict) | |||
}) | |||
@@ -29,7 +29,8 @@ func TestAPIPullReview(t *testing.T) { | |||
// test ListPullReviews | |||
session := loginUser(t, "user2") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token) | |||
req := NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/reviews", repo.OwnerName, repo.Name, pullIssue.Index). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var reviews []*api.PullReview | |||
@@ -54,20 +55,23 @@ func TestAPIPullReview(t *testing.T) { | |||
assert.True(t, reviews[5].Official) | |||
// test GetPullReview | |||
req = NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/reviews/%d?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, reviews[3].ID, token) | |||
req = NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/reviews/%d", repo.OwnerName, repo.Name, pullIssue.Index, reviews[3].ID). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var review api.PullReview | |||
DecodeJSON(t, resp, &review) | |||
assert.EqualValues(t, *reviews[3], review) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/pulls/%d/reviews/%d?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, reviews[5].ID, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/pulls/%d/reviews/%d", repo.OwnerName, repo.Name, pullIssue.Index, reviews[5].ID). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &review) | |||
assert.EqualValues(t, *reviews[5], review) | |||
// test GetPullReviewComments | |||
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 7}) | |||
req = NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/reviews/%d/comments?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, 10, token) | |||
req = NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/reviews/%d/comments", repo.OwnerName, repo.Name, pullIssue.Index, 10). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var reviewComments []*api.PullReviewComment | |||
DecodeJSON(t, resp, &reviewComments) | |||
@@ -79,7 +83,7 @@ func TestAPIPullReview(t *testing.T) { | |||
assert.EqualValues(t, comment.HTMLURL(db.DefaultContext), reviewComments[0].HTMLURL) | |||
// test CreatePullReview | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.CreatePullReviewOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews", repo.OwnerName, repo.Name, pullIssue.Index), &api.CreatePullReviewOptions{ | |||
Body: "body1", | |||
// Event: "" # will result in PENDING | |||
Comments: []api.CreatePullReviewComment{ | |||
@@ -100,7 +104,7 @@ func TestAPIPullReview(t *testing.T) { | |||
NewLineNum: 1, | |||
}, | |||
}, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &review) | |||
assert.EqualValues(t, 6, review.ID) | |||
@@ -108,10 +112,10 @@ func TestAPIPullReview(t *testing.T) { | |||
assert.EqualValues(t, 3, review.CodeCommentsCount) | |||
// test SubmitPullReview | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, review.ID, token), &api.SubmitPullReviewOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d", repo.OwnerName, repo.Name, pullIssue.Index, review.ID), &api.SubmitPullReviewOptions{ | |||
Event: "APPROVED", | |||
Body: "just two nits", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &review) | |||
assert.EqualValues(t, 6, review.ID) | |||
@@ -119,35 +123,37 @@ func TestAPIPullReview(t *testing.T) { | |||
assert.EqualValues(t, 3, review.CodeCommentsCount) | |||
// test dismiss review | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d/dismissals?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, review.ID, token), &api.DismissPullReviewOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d/dismissals", repo.OwnerName, repo.Name, pullIssue.Index, review.ID), &api.DismissPullReviewOptions{ | |||
Message: "test", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &review) | |||
assert.EqualValues(t, 6, review.ID) | |||
assert.True(t, review.Dismissed) | |||
// test dismiss review | |||
req = NewRequest(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d/undismissals?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, review.ID, token)) | |||
req = NewRequest(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d/undismissals", repo.OwnerName, repo.Name, pullIssue.Index, review.ID)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &review) | |||
assert.EqualValues(t, 6, review.ID) | |||
assert.False(t, review.Dismissed) | |||
// test DeletePullReview | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.CreatePullReviewOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews", repo.OwnerName, repo.Name, pullIssue.Index), &api.CreatePullReviewOptions{ | |||
Body: "just a comment", | |||
Event: "COMMENT", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &review) | |||
assert.EqualValues(t, "COMMENT", review.State) | |||
assert.EqualValues(t, 0, review.CodeCommentsCount) | |||
req = NewRequestf(t, http.MethodDelete, "/api/v1/repos/%s/%s/pulls/%d/reviews/%d?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, review.ID, token) | |||
req = NewRequestf(t, http.MethodDelete, "/api/v1/repos/%s/%s/pulls/%d/reviews/%d", repo.OwnerName, repo.Name, pullIssue.Index, review.ID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// test CreatePullReview Comment without body but with comments | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.CreatePullReviewOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews", repo.OwnerName, repo.Name, pullIssue.Index), &api.CreatePullReviewOptions{ | |||
// Body: "", | |||
Event: "COMMENT", | |||
Comments: []api.CreatePullReviewComment{ | |||
@@ -163,7 +169,7 @@ func TestAPIPullReview(t *testing.T) { | |||
NewLineNum: 0, | |||
}, | |||
}, | |||
}) | |||
}).AddTokenAuth(token) | |||
var commentReview api.PullReview | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
@@ -175,11 +181,11 @@ func TestAPIPullReview(t *testing.T) { | |||
// test CreatePullReview Comment with body but without comments | |||
commentBody := "This is a body of the comment." | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.CreatePullReviewOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews", repo.OwnerName, repo.Name, pullIssue.Index), &api.CreatePullReviewOptions{ | |||
Body: commentBody, | |||
Event: "COMMENT", | |||
Comments: []api.CreatePullReviewComment{}, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &commentReview) | |||
@@ -189,11 +195,11 @@ func TestAPIPullReview(t *testing.T) { | |||
assert.False(t, commentReview.Dismissed) | |||
// test CreatePullReview Comment without body and no comments | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.CreatePullReviewOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews", repo.OwnerName, repo.Name, pullIssue.Index), &api.CreatePullReviewOptions{ | |||
Body: "", | |||
Event: "COMMENT", | |||
Comments: []api.CreatePullReviewComment{}, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
errMap := make(map[string]any) | |||
json.Unmarshal(resp.Body.Bytes(), &errMap) | |||
@@ -205,7 +211,8 @@ func TestAPIPullReview(t *testing.T) { | |||
assert.NoError(t, pullIssue12.LoadAttributes(db.DefaultContext)) | |||
repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: pullIssue12.RepoID}) | |||
req = NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo3.OwnerName, repo3.Name, pullIssue12.Index, token) | |||
req = NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/reviews", repo3.OwnerName, repo3.Name, pullIssue12.Index). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &reviews) | |||
assert.EqualValues(t, 11, reviews[0].ID) | |||
@@ -232,41 +239,41 @@ func TestAPIPullReviewRequest(t *testing.T) { | |||
// Test add Review Request | |||
session := loginUser(t, "user2") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.PullReviewRequestOptions{ | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo.OwnerName, repo.Name, pullIssue.Index), &api.PullReviewRequestOptions{ | |||
Reviewers: []string{"user4@example.com", "user8"}, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// poster of pr can't be reviewer | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.PullReviewRequestOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo.OwnerName, repo.Name, pullIssue.Index), &api.PullReviewRequestOptions{ | |||
Reviewers: []string{"user1"}, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// test user not exist | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.PullReviewRequestOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo.OwnerName, repo.Name, pullIssue.Index), &api.PullReviewRequestOptions{ | |||
Reviewers: []string{"testOther"}, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test Remove Review Request | |||
session2 := loginUser(t, "user4") | |||
token2 := getTokenForLoggedInUser(t, session2, auth_model.AccessTokenScopeWriteRepository) | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token2), &api.PullReviewRequestOptions{ | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo.OwnerName, repo.Name, pullIssue.Index), &api.PullReviewRequestOptions{ | |||
Reviewers: []string{"user4"}, | |||
}) | |||
}).AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// doer is not admin | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token2), &api.PullReviewRequestOptions{ | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo.OwnerName, repo.Name, pullIssue.Index), &api.PullReviewRequestOptions{ | |||
Reviewers: []string{"user8"}, | |||
}) | |||
}).AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.PullReviewRequestOptions{ | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo.OwnerName, repo.Name, pullIssue.Index), &api.PullReviewRequestOptions{ | |||
Reviewers: []string{"user8"}, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Test team review request | |||
@@ -275,33 +282,35 @@ func TestAPIPullReviewRequest(t *testing.T) { | |||
repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: pullIssue12.RepoID}) | |||
// Test add Team Review Request | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo3.OwnerName, repo3.Name, pullIssue12.Index, token), &api.PullReviewRequestOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo3.OwnerName, repo3.Name, pullIssue12.Index), &api.PullReviewRequestOptions{ | |||
TeamReviewers: []string{"team1", "owners"}, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// Test add Team Review Request to not allowned | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo3.OwnerName, repo3.Name, pullIssue12.Index, token), &api.PullReviewRequestOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo3.OwnerName, repo3.Name, pullIssue12.Index), &api.PullReviewRequestOptions{ | |||
TeamReviewers: []string{"test_team"}, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// Test add Team Review Request to not exist | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo3.OwnerName, repo3.Name, pullIssue12.Index, token), &api.PullReviewRequestOptions{ | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo3.OwnerName, repo3.Name, pullIssue12.Index), &api.PullReviewRequestOptions{ | |||
TeamReviewers: []string{"not_exist_team"}, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test Remove team Review Request | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo3.OwnerName, repo3.Name, pullIssue12.Index, token), &api.PullReviewRequestOptions{ | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo3.OwnerName, repo3.Name, pullIssue12.Index), &api.PullReviewRequestOptions{ | |||
TeamReviewers: []string{"team1"}, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// empty request test | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo3.OwnerName, repo3.Name, pullIssue12.Index, token), &api.PullReviewRequestOptions{}) | |||
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo3.OwnerName, repo3.Name, pullIssue12.Index), &api.PullReviewRequestOptions{}). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers?token=%s", repo3.OwnerName, repo3.Name, pullIssue12.Index, token), &api.PullReviewRequestOptions{}) | |||
req = NewRequestWithJSON(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/requested_reviewers", repo3.OwnerName, repo3.Name, pullIssue12.Index), &api.PullReviewRequestOptions{}). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
} |
@@ -31,7 +31,8 @@ func TestAPIViewPulls(t *testing.T) { | |||
ctx := NewAPITestContext(t, "user2", repo.Name, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/pulls?state=all&token="+ctx.Token, owner.Name, repo.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/pulls?state=all", owner.Name, repo.Name). | |||
AddTokenAuth(ctx.Token) | |||
resp := ctx.Session.MakeRequest(t, req, http.StatusOK) | |||
var pulls []*api.PullRequest | |||
@@ -76,10 +77,10 @@ func TestAPIMergePullWIP(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", owner.Name, repo.Name, pr.Index, token), &forms.MergePullRequestForm{ | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge", owner.Name, repo.Name, pr.Index), &forms.MergePullRequestForm{ | |||
MergeMessageField: pr.Issue.Title, | |||
Do: string(repo_model.MergeStyleMerge), | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusMethodNotAllowed) | |||
} | |||
@@ -95,11 +96,11 @@ 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?token=%s", owner10.Name, repo10.Name, token), &api.CreatePullRequestOption{ | |||
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), | |||
Base: "master", | |||
Title: "create a failure pr", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) // second request should fail | |||
} | |||
@@ -126,7 +127,8 @@ func TestAPICreatePullWithFieldsSuccess(t *testing.T) { | |||
Labels: []int64{5}, | |||
} | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", owner10.Name, repo10.Name, token), opts) | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", owner10.Name, repo10.Name), opts). | |||
AddTokenAuth(token) | |||
res := MakeRequest(t, req, http.StatusCreated) | |||
pull := new(api.PullRequest) | |||
@@ -158,7 +160,8 @@ func TestAPICreatePullWithFieldsFailure(t *testing.T) { | |||
Base: "master", | |||
} | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", owner10.Name, repo10.Name, token), opts) | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", owner10.Name, repo10.Name), opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
opts.Title = "is required" | |||
@@ -182,35 +185,34 @@ func TestAPIEditPull(t *testing.T) { | |||
session := loginUser(t, owner10.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", owner10.Name, repo10.Name, token), &api.CreatePullRequestOption{ | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", owner10.Name, repo10.Name), &api.CreatePullRequestOption{ | |||
Head: "develop", | |||
Base: "master", | |||
Title: "create a success pr", | |||
}) | |||
}).AddTokenAuth(token) | |||
pull := new(api.PullRequest) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, pull) | |||
assert.EqualValues(t, "master", pull.Base.Name) | |||
req = NewRequestWithJSON(t, http.MethodPatch, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d?token=%s", owner10.Name, repo10.Name, pull.Index, token), &api.EditPullRequestOption{ | |||
req = NewRequestWithJSON(t, http.MethodPatch, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", owner10.Name, repo10.Name, pull.Index), &api.EditPullRequestOption{ | |||
Base: "feature/1", | |||
Title: "edit a this pr", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, pull) | |||
assert.EqualValues(t, "feature/1", pull.Base.Name) | |||
req = NewRequestWithJSON(t, http.MethodPatch, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d?token=%s", owner10.Name, repo10.Name, pull.Index, token), &api.EditPullRequestOption{ | |||
req = NewRequestWithJSON(t, http.MethodPatch, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", owner10.Name, repo10.Name, pull.Index), &api.EditPullRequestOption{ | |||
Base: "not-exist", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
} | |||
func doAPIGetPullFiles(ctx APITestContext, pr *api.PullRequest, callback func(*testing.T, []*api.ChangedFile)) func(*testing.T) { | |||
return func(t *testing.T) { | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/files?token=%s", ctx.Username, ctx.Reponame, pr.Index, ctx.Token) | |||
req := NewRequest(t, http.MethodGet, url) | |||
req := NewRequest(t, http.MethodGet, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/files", ctx.Username, ctx.Reponame, pr.Index)). | |||
AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode == 0 { | |||
ctx.ExpectedCode = http.StatusOK | |||
} |
@@ -59,11 +59,12 @@ func TestAPIListReleases(t *testing.T) { | |||
// test filter | |||
testFilterByLen := func(auth bool, query url.Values, expectedLength int, msgAndArgs ...string) { | |||
link.RawQuery = query.Encode() | |||
req := NewRequest(t, "GET", link.String()) | |||
if auth { | |||
query.Set("token", token) | |||
req.AddTokenAuth(token) | |||
} | |||
link.RawQuery = query.Encode() | |||
resp = MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiReleases) | |||
assert.Len(t, apiReleases, expectedLength, msgAndArgs) | |||
} | |||
@@ -77,8 +78,7 @@ func TestAPIListReleases(t *testing.T) { | |||
} | |||
func createNewReleaseUsingAPI(t *testing.T, session *TestSession, token string, owner *user_model.User, repo *repo_model.Repository, name, target, title, desc string) *api.Release { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/releases?token=%s", | |||
owner.Name, repo.Name, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/releases", owner.Name, repo.Name) | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateReleaseOption{ | |||
TagName: name, | |||
Title: title, | |||
@@ -86,7 +86,7 @@ func createNewReleaseUsingAPI(t *testing.T, session *TestSession, token string, | |||
IsDraft: false, | |||
IsPrerelease: false, | |||
Target: target, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var newRelease api.Release | |||
@@ -122,9 +122,9 @@ func TestAPICreateAndUpdateRelease(t *testing.T) { | |||
newRelease := createNewReleaseUsingAPI(t, session, token, owner, repo, "v0.0.1", target, "v0.0.1", "test") | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/releases/%d?token=%s", | |||
owner.Name, repo.Name, newRelease.ID, token) | |||
req := NewRequest(t, "GET", urlStr) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/releases/%d", owner.Name, repo.Name, newRelease.ID) | |||
req := NewRequest(t, "GET", urlStr). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var release api.Release | |||
@@ -141,7 +141,7 @@ func TestAPICreateAndUpdateRelease(t *testing.T) { | |||
IsDraft: &release.IsDraft, | |||
IsPrerelease: &release.IsPrerelease, | |||
Target: release.Target, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &newRelease) | |||
@@ -189,10 +189,7 @@ func TestAPIGetLatestRelease(t *testing.T) { | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) | |||
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/releases/latest", | |||
owner.Name, repo.Name) | |||
req := NewRequestf(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/releases/latest", owner.Name, repo.Name)) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var release *api.Release | |||
@@ -209,10 +206,7 @@ func TestAPIGetReleaseByTag(t *testing.T) { | |||
tag := "v1.1" | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/%s", | |||
owner.Name, repo.Name, tag) | |||
req := NewRequestf(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/%s", owner.Name, repo.Name, tag)) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var release *api.Release | |||
@@ -222,10 +216,7 @@ func TestAPIGetReleaseByTag(t *testing.T) { | |||
nonexistingtag := "nonexistingtag" | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/%s", | |||
owner.Name, repo.Name, nonexistingtag) | |||
req = NewRequestf(t, "GET", urlStr) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/%s", owner.Name, repo.Name, nonexistingtag)) | |||
resp = MakeRequest(t, req, http.StatusNotFound) | |||
var err *api.APIError | |||
@@ -244,15 +235,18 @@ func TestAPIDeleteReleaseByTagName(t *testing.T) { | |||
createNewReleaseUsingAPI(t, session, token, owner, repo, "release-tag", "", "Release Tag", "test") | |||
// delete release | |||
req := NewRequestf(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/release-tag?token=%s", owner.Name, repo.Name, token)) | |||
req := NewRequestf(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/release-tag", owner.Name, repo.Name)). | |||
AddTokenAuth(token) | |||
_ = MakeRequest(t, req, http.StatusNoContent) | |||
// make sure release is deleted | |||
req = NewRequestf(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/release-tag?token=%s", owner.Name, repo.Name, token)) | |||
req = NewRequestf(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/release-tag", owner.Name, repo.Name)). | |||
AddTokenAuth(token) | |||
_ = MakeRequest(t, req, http.StatusNotFound) | |||
// delete release tag too | |||
req = NewRequestf(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/tags/release-tag?token=%s", owner.Name, repo.Name, token)) | |||
req = NewRequestf(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/tags/release-tag", owner.Name, repo.Name)). | |||
AddTokenAuth(token) | |||
_ = MakeRequest(t, req, http.StatusNoContent) | |||
} | |||
@@ -278,7 +272,8 @@ func TestAPIUploadAssetRelease(t *testing.T) { | |||
err = writer.Close() | |||
assert.NoError(t, err) | |||
req := NewRequestWithBody(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/releases/%d/assets?name=test-asset&token=%s", owner.Name, repo.Name, r.ID, token), body) | |||
req := NewRequestWithBody(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/releases/%d/assets?name=test-asset", owner.Name, repo.Name, r.ID), body). | |||
AddTokenAuth(token) | |||
req.Header.Add("Content-Type", writer.FormDataContentType()) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
@@ -38,7 +38,8 @@ func TestAPIUpdateRepoAvatar(t *testing.T) { | |||
Image: base64.StdEncoding.EncodeToString(avatar), | |||
} | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/avatar?token=%s", repo.OwnerName, repo.Name, token), &opts) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/avatar", repo.OwnerName, repo.Name), &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Test what happens if you don't have a valid Base64 string | |||
@@ -46,7 +47,8 @@ func TestAPIUpdateRepoAvatar(t *testing.T) { | |||
Image: "Invalid", | |||
} | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/avatar?token=%s", repo.OwnerName, repo.Name, token), &opts) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/avatar", repo.OwnerName, repo.Name), &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
// Test what happens if you use a file that is not an image | |||
@@ -60,7 +62,8 @@ func TestAPIUpdateRepoAvatar(t *testing.T) { | |||
Image: base64.StdEncoding.EncodeToString(text), | |||
} | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/avatar?token=%s", repo.OwnerName, repo.Name, token), &opts) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/avatar", repo.OwnerName, repo.Name), &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusInternalServerError) | |||
} | |||
@@ -71,6 +74,7 @@ func TestAPIDeleteRepoAvatar(t *testing.T) { | |||
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) | |||
token := getUserToken(t, user2.LowerName, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/avatar?token=%s", repo.OwnerName, repo.Name, token)) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/avatar", repo.OwnerName, repo.Name)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
} |
@@ -31,7 +31,8 @@ func TestAPIRepoCollaboratorPermission(t *testing.T) { | |||
testCtx := NewAPITestContext(t, repo2Owner.Name, repo2.Name, auth_model.AccessTokenScopeWriteRepository) | |||
t.Run("RepoOwnerShouldBeOwner", func(t *testing.T) { | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission?token=%s", repo2Owner.Name, repo2.Name, repo2Owner.Name, testCtx.Token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, repo2Owner.Name). | |||
AddTokenAuth(testCtx.Token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var repoPermission api.RepoCollaboratorPermission | |||
@@ -43,7 +44,8 @@ func TestAPIRepoCollaboratorPermission(t *testing.T) { | |||
t.Run("CollaboratorWithReadAccess", func(t *testing.T) { | |||
t.Run("AddUserAsCollaboratorWithReadAccess", doAPIAddCollaborator(testCtx, user4.Name, perm.AccessModeRead)) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission?token=%s", repo2Owner.Name, repo2.Name, user4.Name, testCtx.Token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user4.Name). | |||
AddTokenAuth(testCtx.Token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var repoPermission api.RepoCollaboratorPermission | |||
@@ -55,7 +57,8 @@ func TestAPIRepoCollaboratorPermission(t *testing.T) { | |||
t.Run("CollaboratorWithWriteAccess", func(t *testing.T) { | |||
t.Run("AddUserAsCollaboratorWithWriteAccess", doAPIAddCollaborator(testCtx, user4.Name, perm.AccessModeWrite)) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission?token=%s", repo2Owner.Name, repo2.Name, user4.Name, testCtx.Token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user4.Name). | |||
AddTokenAuth(testCtx.Token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var repoPermission api.RepoCollaboratorPermission | |||
@@ -67,7 +70,8 @@ func TestAPIRepoCollaboratorPermission(t *testing.T) { | |||
t.Run("CollaboratorWithAdminAccess", func(t *testing.T) { | |||
t.Run("AddUserAsCollaboratorWithAdminAccess", doAPIAddCollaborator(testCtx, user4.Name, perm.AccessModeAdmin)) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission?token=%s", repo2Owner.Name, repo2.Name, user4.Name, testCtx.Token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user4.Name). | |||
AddTokenAuth(testCtx.Token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var repoPermission api.RepoCollaboratorPermission | |||
@@ -77,7 +81,8 @@ func TestAPIRepoCollaboratorPermission(t *testing.T) { | |||
}) | |||
t.Run("CollaboratorNotFound", func(t *testing.T) { | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission?token=%s", repo2Owner.Name, repo2.Name, "non-existent-user", testCtx.Token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, "non-existent-user"). | |||
AddTokenAuth(testCtx.Token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
@@ -87,7 +92,8 @@ func TestAPIRepoCollaboratorPermission(t *testing.T) { | |||
_session := loginUser(t, user5.Name) | |||
_testCtx := NewAPITestContext(t, user5.Name, repo2.Name, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission?token=%s", repo2Owner.Name, repo2.Name, user5.Name, _testCtx.Token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user5.Name). | |||
AddTokenAuth(_testCtx.Token) | |||
resp := _session.MakeRequest(t, req, http.StatusOK) | |||
var repoPermission api.RepoCollaboratorPermission | |||
@@ -102,7 +108,8 @@ func TestAPIRepoCollaboratorPermission(t *testing.T) { | |||
_session := loginUser(t, user5.Name) | |||
_testCtx := NewAPITestContext(t, user5.Name, repo2.Name, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission?token=%s", repo2Owner.Name, repo2.Name, user5.Name, _testCtx.Token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user5.Name). | |||
AddTokenAuth(_testCtx.Token) | |||
resp := _session.MakeRequest(t, req, http.StatusOK) | |||
var repoPermission api.RepoCollaboratorPermission | |||
@@ -118,7 +125,8 @@ func TestAPIRepoCollaboratorPermission(t *testing.T) { | |||
_session := loginUser(t, user10.Name) | |||
_testCtx := NewAPITestContext(t, user10.Name, repo2.Name, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission?token=%s", repo2Owner.Name, repo2.Name, user11.Name, _testCtx.Token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/collaborators/%s/permission", repo2Owner.Name, repo2.Name, user11.Name). | |||
AddTokenAuth(_testCtx.Token) | |||
resp := _session.MakeRequest(t, req, http.StatusOK) | |||
var repoPermission api.RepoCollaboratorPermission |
@@ -155,8 +155,8 @@ func TestAPIRepoEdit(t *testing.T) { | |||
// Test editing a repo1 which user2 owns, changing name and many properties | |||
origRepoEditOption := getRepoEditOptionFromRepo(repo1) | |||
repoEditOption := getNewRepoEditOption(origRepoEditOption) | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, repo1.Name, token2) | |||
req := NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req := NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var repo api.Repository | |||
DecodeJSON(t, resp, &repo) | |||
@@ -186,8 +186,9 @@ func TestAPIRepoEdit(t *testing.T) { | |||
} | |||
*repoEditOption.HasWiki = true | |||
repoEditOption.ExternalWiki = nil | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, *repoEditOption.Name, token2) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &repo) | |||
assert.NotNil(t, repo) | |||
@@ -209,7 +210,8 @@ func TestAPIRepoEdit(t *testing.T) { | |||
repoEditOption.ExternalWiki = &api.ExternalWiki{ | |||
ExternalWikiURL: "http://www.somewebsite.com", | |||
} | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &repo) | |||
assert.NotNil(t, repo) | |||
@@ -223,7 +225,8 @@ func TestAPIRepoEdit(t *testing.T) { | |||
repoEditOption.ExternalTracker.ExternalTrackerStyle = "regexp" | |||
repoEditOption.ExternalTracker.ExternalTrackerRegexpPattern = `(\d+)` | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &repo) | |||
assert.NotNil(t, repo) | |||
@@ -234,15 +237,18 @@ func TestAPIRepoEdit(t *testing.T) { | |||
// Do some tests with invalid URL for external tracker and wiki | |||
repoEditOption.ExternalTracker.ExternalTrackerURL = "htp://www.somewebsite.com" | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
repoEditOption.ExternalTracker.ExternalTrackerURL = "http://www.somewebsite.com" | |||
repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user/{repo}?issue={index}" | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user}/{repo}?issue={index}" | |||
repoEditOption.ExternalWiki.ExternalWikiURL = "htp://www.somewebsite.com" | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// Test small repo change through API with issue and wiki option not set; They shall not be touched. | |||
@@ -251,7 +257,8 @@ func TestAPIRepoEdit(t *testing.T) { | |||
repoEditOption.ExternalTracker = nil | |||
repoEditOption.HasWiki = nil | |||
repoEditOption.ExternalWiki = nil | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &repo) | |||
assert.NotNil(t, repo) | |||
@@ -265,39 +272,38 @@ func TestAPIRepoEdit(t *testing.T) { | |||
assert.NotNil(t, *repo1editedOption.ExternalWiki) | |||
// reset repo in db | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, *repoEditOption.Name, token2) | |||
req = NewRequestWithJSON(t, "PATCH", url, &origRepoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). | |||
AddTokenAuth(token2) | |||
_ = MakeRequest(t, req, http.StatusOK) | |||
// Test editing a non-existing repo | |||
name := "repodoesnotexist" | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, name, token2) | |||
req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{Name: &name}) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, name), &api.EditRepoOption{Name: &name}). | |||
AddTokenAuth(token2) | |||
_ = MakeRequest(t, req, http.StatusNotFound) | |||
// Test editing repo16 by user4 who does not have write access | |||
origRepoEditOption = getRepoEditOptionFromRepo(repo16) | |||
repoEditOption = getNewRepoEditOption(origRepoEditOption) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, repo16.Name, token4) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Tests a repo with no token given so will fail | |||
origRepoEditOption = getRepoEditOptionFromRepo(repo16) | |||
repoEditOption = getNewRepoEditOption(origRepoEditOption) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption) | |||
_ = MakeRequest(t, req, http.StatusNotFound) | |||
// Test using access token for a private repo that the user of the token owns | |||
origRepoEditOption = getRepoEditOptionFromRepo(repo16) | |||
repoEditOption = getNewRepoEditOption(origRepoEditOption) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, repo16.Name, token2) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name), &repoEditOption). | |||
AddTokenAuth(token2) | |||
_ = MakeRequest(t, req, http.StatusOK) | |||
// reset repo in db | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, *repoEditOption.Name, token2) | |||
req = NewRequestWithJSON(t, "PATCH", url, &origRepoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, *repoEditOption.Name), &origRepoEditOption). | |||
AddTokenAuth(token2) | |||
_ = MakeRequest(t, req, http.StatusOK) | |||
// Test making a repo public that is private | |||
@@ -306,53 +312,54 @@ func TestAPIRepoEdit(t *testing.T) { | |||
repoEditOption = &api.EditRepoOption{ | |||
Private: &bFalse, | |||
} | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, repo16.Name, token2) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). | |||
AddTokenAuth(token2) | |||
_ = MakeRequest(t, req, http.StatusOK) | |||
repo16 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 16}) | |||
assert.False(t, repo16.IsPrivate) | |||
// Make it private again | |||
repoEditOption.Private = &bTrue | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption). | |||
AddTokenAuth(token2) | |||
_ = MakeRequest(t, req, http.StatusOK) | |||
// Test to change empty repo | |||
assert.False(t, repo15.IsArchived) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, repo15.Name, token2) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo15.Name) | |||
req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ | |||
Archived: &bTrue, | |||
}) | |||
}).AddTokenAuth(token2) | |||
_ = MakeRequest(t, req, http.StatusOK) | |||
repo15 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 15}) | |||
assert.True(t, repo15.IsArchived) | |||
req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{ | |||
Archived: &bFalse, | |||
}) | |||
}).AddTokenAuth(token2) | |||
_ = MakeRequest(t, req, http.StatusOK) | |||
// Test using org repo "org3/repo3" where user2 is a collaborator | |||
origRepoEditOption = getRepoEditOptionFromRepo(repo3) | |||
repoEditOption = getNewRepoEditOption(origRepoEditOption) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", org3.Name, repo3.Name, token2) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusOK) | |||
// reset repo in db | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", org3.Name, *repoEditOption.Name, token2) | |||
req = NewRequestWithJSON(t, "PATCH", url, &origRepoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, *repoEditOption.Name), &origRepoEditOption). | |||
AddTokenAuth(token2) | |||
_ = MakeRequest(t, req, http.StatusOK) | |||
// Test using org repo "org3/repo3" with no user token | |||
origRepoEditOption = getRepoEditOptionFromRepo(repo3) | |||
repoEditOption = getNewRepoEditOption(origRepoEditOption) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", org3.Name, repo3.Name), &repoEditOption) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using repo "user2/repo1" where user4 is a NOT collaborator | |||
origRepoEditOption = getRepoEditOptionFromRepo(repo1) | |||
repoEditOption = getNewRepoEditOption(origRepoEditOption) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, repo1.Name, token4) | |||
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo1.Name), &repoEditOption). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
}) | |||
} |
@@ -164,8 +164,8 @@ func TestAPICreateFile(t *testing.T) { | |||
createFileOptions.BranchName = branch | |||
fileID++ | |||
treePath := fmt.Sprintf("new/file%d.txt", fileID) | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req := NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &createFileOptions). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
gitRepo, _ := git.OpenRepository(stdCtx.Background(), repo1.RepoPath()) | |||
commitID, _ := gitRepo.GetBranchCommitID(createFileOptions.NewBranchName) | |||
@@ -191,8 +191,8 @@ func TestAPICreateFile(t *testing.T) { | |||
createFileOptions.NewBranchName = "new_branch" | |||
fileID++ | |||
treePath := fmt.Sprintf("new/file%d.txt", fileID) | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req := NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &createFileOptions). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var fileResponse api.FileResponse | |||
DecodeJSON(t, resp, &fileResponse) | |||
@@ -209,8 +209,8 @@ func TestAPICreateFile(t *testing.T) { | |||
createFileOptions.Message = "" | |||
fileID++ | |||
treePath = fmt.Sprintf("new/file%d.txt", fileID) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &createFileOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, &fileResponse) | |||
expectedMessage := "Add " + treePath + "\n" | |||
@@ -219,8 +219,8 @@ func TestAPICreateFile(t *testing.T) { | |||
// Test trying to create a file that already exists, should fail | |||
createFileOptions = getCreateFileOptions() | |||
treePath = "README.md" | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &createFileOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
expectedAPIError := context.APIError{ | |||
Message: "repository file already exists [path: " + treePath + "]", | |||
@@ -234,48 +234,46 @@ func TestAPICreateFile(t *testing.T) { | |||
createFileOptions = getCreateFileOptions() | |||
fileID++ | |||
treePath = fmt.Sprintf("new/file%d.txt", fileID) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token4) | |||
req = NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath), &createFileOptions). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Tests a repo with no token given so will fail | |||
createFileOptions = getCreateFileOptions() | |||
fileID++ | |||
treePath = fmt.Sprintf("new/file%d.txt", fileID) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath) | |||
req = NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath), &createFileOptions) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using access token for a private repo that the user of the token owns | |||
createFileOptions = getCreateFileOptions() | |||
fileID++ | |||
treePath = fmt.Sprintf("new/file%d.txt", fileID) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath), &createFileOptions). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// Test using org repo "org3/repo3" where user2 is a collaborator | |||
createFileOptions = getCreateFileOptions() | |||
fileID++ | |||
treePath = fmt.Sprintf("new/file%d.txt", fileID) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", org3.Name, repo3.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath), &createFileOptions). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// Test using org repo "org3/repo3" with no user token | |||
createFileOptions = getCreateFileOptions() | |||
fileID++ | |||
treePath = fmt.Sprintf("new/file%d.txt", fileID) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath) | |||
req = NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath), &createFileOptions) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using repo "user2/repo1" where user4 is a NOT collaborator | |||
createFileOptions = getCreateFileOptions() | |||
fileID++ | |||
treePath = fmt.Sprintf("new/file%d.txt", fileID) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token4) | |||
req = NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &createFileOptions). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
// Test creating a file in an empty repository | |||
@@ -283,8 +281,8 @@ func TestAPICreateFile(t *testing.T) { | |||
createFileOptions = getCreateFileOptions() | |||
fileID++ | |||
treePath = fmt.Sprintf("new/file%d.txt", fileID) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, "empty-repo", treePath, token2) | |||
req = NewRequestWithJSON(t, "POST", url, &createFileOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, "empty-repo", treePath), &createFileOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
emptyRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "empty-repo"}) // public repo | |||
gitRepo, _ := git.OpenRepository(stdCtx.Background(), emptyRepo.RepoPath()) |
@@ -64,8 +64,8 @@ func TestAPIDeleteFile(t *testing.T) { | |||
createFile(user2, repo1, treePath) | |||
deleteFileOptions := getDeleteFileOptions() | |||
deleteFileOptions.BranchName = branch | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req := NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req := NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &deleteFileOptions). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var fileResponse api.FileResponse | |||
DecodeJSON(t, resp, &fileResponse) | |||
@@ -80,8 +80,8 @@ func TestAPIDeleteFile(t *testing.T) { | |||
deleteFileOptions := getDeleteFileOptions() | |||
deleteFileOptions.BranchName = repo1.DefaultBranch | |||
deleteFileOptions.NewBranchName = "new_branch" | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req := NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req := NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &deleteFileOptions). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var fileResponse api.FileResponse | |||
DecodeJSON(t, resp, &fileResponse) | |||
@@ -95,8 +95,8 @@ func TestAPIDeleteFile(t *testing.T) { | |||
createFile(user2, repo1, treePath) | |||
deleteFileOptions = getDeleteFileOptions() | |||
deleteFileOptions.Message = "" | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req = NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &deleteFileOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &fileResponse) | |||
expectedMessage := "Delete " + treePath + "\n" | |||
@@ -108,8 +108,8 @@ func TestAPIDeleteFile(t *testing.T) { | |||
createFile(user2, repo1, treePath) | |||
deleteFileOptions = getDeleteFileOptions() | |||
deleteFileOptions.SHA = "badsha" | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req = NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &deleteFileOptions). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
// Test creating a file in repo16 by user4 who does not have write access | |||
@@ -117,8 +117,8 @@ func TestAPIDeleteFile(t *testing.T) { | |||
treePath = fmt.Sprintf("delete/file%d.txt", fileID) | |||
createFile(user2, repo16, treePath) | |||
deleteFileOptions = getDeleteFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token4) | |||
req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req = NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath), &deleteFileOptions). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Tests a repo with no token given so will fail | |||
@@ -126,8 +126,7 @@ func TestAPIDeleteFile(t *testing.T) { | |||
treePath = fmt.Sprintf("delete/file%d.txt", fileID) | |||
createFile(user2, repo16, treePath) | |||
deleteFileOptions = getDeleteFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath) | |||
req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req = NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath), &deleteFileOptions) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using access token for a private repo that the user of the token owns | |||
@@ -135,8 +134,8 @@ func TestAPIDeleteFile(t *testing.T) { | |||
treePath = fmt.Sprintf("delete/file%d.txt", fileID) | |||
createFile(user2, repo16, treePath) | |||
deleteFileOptions = getDeleteFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req = NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath), &deleteFileOptions). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test using org repo "org3/repo3" where user2 is a collaborator | |||
@@ -144,8 +143,8 @@ func TestAPIDeleteFile(t *testing.T) { | |||
treePath = fmt.Sprintf("delete/file%d.txt", fileID) | |||
createFile(org3, repo3, treePath) | |||
deleteFileOptions = getDeleteFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", org3.Name, repo3.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req = NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath), &deleteFileOptions). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test using org repo "org3/repo3" with no user token | |||
@@ -153,8 +152,7 @@ func TestAPIDeleteFile(t *testing.T) { | |||
treePath = fmt.Sprintf("delete/file%d.txt", fileID) | |||
createFile(org3, repo3, treePath) | |||
deleteFileOptions = getDeleteFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath) | |||
req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req = NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath), &deleteFileOptions) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using repo "user2/repo1" where user4 is a NOT collaborator | |||
@@ -162,8 +160,8 @@ func TestAPIDeleteFile(t *testing.T) { | |||
treePath = fmt.Sprintf("delete/file%d.txt", fileID) | |||
createFile(user2, repo1, treePath) | |||
deleteFileOptions = getDeleteFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token4) | |||
req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) | |||
req = NewRequestWithJSON(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &deleteFileOptions). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
}) | |||
} |
@@ -132,8 +132,8 @@ func TestAPIUpdateFile(t *testing.T) { | |||
createFile(user2, repo1, treePath) | |||
updateFileOptions := getUpdateFileOptions() | |||
updateFileOptions.BranchName = branch | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req := NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &updateFileOptions). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
gitRepo, _ := git.OpenRepository(stdCtx.Background(), repo1.RepoPath()) | |||
commitID, _ := gitRepo.GetBranchCommitID(updateFileOptions.NewBranchName) | |||
@@ -156,8 +156,8 @@ func TestAPIUpdateFile(t *testing.T) { | |||
fileID++ | |||
treePath := fmt.Sprintf("update/file%d.txt", fileID) | |||
createFile(user2, repo1, treePath) | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req := NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &updateFileOptions). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var fileResponse api.FileResponse | |||
DecodeJSON(t, resp, &fileResponse) | |||
@@ -177,8 +177,8 @@ func TestAPIUpdateFile(t *testing.T) { | |||
createFile(user2, repo1, treePath) | |||
updateFileOptions.FromPath = treePath | |||
treePath = "rename/" + treePath | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &updateFileOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &fileResponse) | |||
expectedSHA = "08bd14b2e2852529157324de9c226b3364e76136" | |||
@@ -195,8 +195,8 @@ func TestAPIUpdateFile(t *testing.T) { | |||
fileID++ | |||
treePath = fmt.Sprintf("update/file%d.txt", fileID) | |||
createFile(user2, repo1, treePath) | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &updateFileOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &fileResponse) | |||
expectedMessage := "Update " + treePath + "\n" | |||
@@ -209,8 +209,8 @@ func TestAPIUpdateFile(t *testing.T) { | |||
updateFileOptions = getUpdateFileOptions() | |||
correctSHA := updateFileOptions.SHA | |||
updateFileOptions.SHA = "badsha" | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &updateFileOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
expectedAPIError := context.APIError{ | |||
Message: "sha does not match [given: " + updateFileOptions.SHA + ", expected: " + correctSHA + "]", | |||
@@ -225,8 +225,8 @@ func TestAPIUpdateFile(t *testing.T) { | |||
treePath = fmt.Sprintf("update/file%d.txt", fileID) | |||
createFile(user2, repo16, treePath) | |||
updateFileOptions = getUpdateFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token4) | |||
req = NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath), &updateFileOptions). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Tests a repo with no token given so will fail | |||
@@ -234,8 +234,7 @@ func TestAPIUpdateFile(t *testing.T) { | |||
treePath = fmt.Sprintf("update/file%d.txt", fileID) | |||
createFile(user2, repo16, treePath) | |||
updateFileOptions = getUpdateFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath) | |||
req = NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath), &updateFileOptions) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using access token for a private repo that the user of the token owns | |||
@@ -243,8 +242,8 @@ func TestAPIUpdateFile(t *testing.T) { | |||
treePath = fmt.Sprintf("update/file%d.txt", fileID) | |||
createFile(user2, repo16, treePath) | |||
updateFileOptions = getUpdateFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath), &updateFileOptions). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test using org repo "org3/repo3" where user2 is a collaborator | |||
@@ -252,8 +251,8 @@ func TestAPIUpdateFile(t *testing.T) { | |||
treePath = fmt.Sprintf("update/file%d.txt", fileID) | |||
createFile(org3, repo3, treePath) | |||
updateFileOptions = getUpdateFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", org3.Name, repo3.Name, treePath, token2) | |||
req = NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath), &updateFileOptions). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test using org repo "org3/repo3" with no user token | |||
@@ -261,8 +260,7 @@ func TestAPIUpdateFile(t *testing.T) { | |||
treePath = fmt.Sprintf("update/file%d.txt", fileID) | |||
createFile(org3, repo3, treePath) | |||
updateFileOptions = getUpdateFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath) | |||
req = NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath), &updateFileOptions) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using repo "user2/repo1" where user4 is a NOT collaborator | |||
@@ -270,8 +268,8 @@ func TestAPIUpdateFile(t *testing.T) { | |||
treePath = fmt.Sprintf("update/file%d.txt", fileID) | |||
createFile(user2, repo1, treePath) | |||
updateFileOptions = getUpdateFileOptions() | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token4) | |||
req = NewRequestWithJSON(t, "PUT", url, &updateFileOptions) | |||
req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &updateFileOptions). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
}) | |||
} |
@@ -93,8 +93,8 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[0].Path = createTreePath | |||
changeFilesOptions.Files[1].Path = updateTreePath | |||
changeFilesOptions.Files[2].Path = deleteTreePath | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents?token=%s", user2.Name, repo1.Name, token2) | |||
req := NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents", user2.Name, repo1.Name), &changeFilesOptions). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
gitRepo, _ := git.OpenRepository(stdCtx.Background(), repo1.RepoPath()) | |||
commitID, _ := gitRepo.GetBranchCommitID(changeFilesOptions.NewBranchName) | |||
@@ -138,8 +138,9 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[2].Path = deleteTreePath | |||
createFile(user2, repo1, updateTreePath) | |||
createFile(user2, repo1, deleteTreePath) | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents?token=%s", user2.Name, repo1.Name, token2) | |||
req := NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/contents", user2.Name, repo1.Name) | |||
req := NewRequestWithJSON(t, "POST", url, &changeFilesOptions). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var filesResponse api.FilesResponse | |||
DecodeJSON(t, resp, &filesResponse) | |||
@@ -168,7 +169,8 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files = []*api.ChangeFileOperation{changeFilesOptions.Files[1]} | |||
changeFilesOptions.Files[0].FromPath = updateTreePath | |||
changeFilesOptions.Files[0].Path = "rename/" + updateTreePath | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, &filesResponse) | |||
expectedUpdateSHA = "08bd14b2e2852529157324de9c226b3364e76136" | |||
@@ -191,7 +193,8 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[2].Path = deleteTreePath | |||
createFile(user2, repo1, updateTreePath) | |||
createFile(user2, repo1, deleteTreePath) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, &filesResponse) | |||
expectedMessage := fmt.Sprintf("Add %v\nUpdate %v\nDelete %v\n", createTreePath, updateTreePath, deleteTreePath) | |||
@@ -206,7 +209,8 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[0].Path = updateTreePath | |||
correctSHA := changeFilesOptions.Files[0].SHA | |||
changeFilesOptions.Files[0].SHA = "badsha" | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions). | |||
AddTokenAuth(token2) | |||
resp = MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
expectedAPIError := context.APIError{ | |||
Message: "sha does not match [given: " + changeFilesOptions.Files[0].SHA + ", expected: " + correctSHA + "]", | |||
@@ -227,8 +231,8 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[0].Path = createTreePath | |||
changeFilesOptions.Files[1].Path = updateTreePath | |||
changeFilesOptions.Files[2].Path = deleteTreePath | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents?token=%s", user2.Name, repo16.Name, token4) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents", user2.Name, repo16.Name), &changeFilesOptions). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Tests a repo with no token given so will fail | |||
@@ -242,8 +246,7 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[0].Path = createTreePath | |||
changeFilesOptions.Files[1].Path = updateTreePath | |||
changeFilesOptions.Files[2].Path = deleteTreePath | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents", user2.Name, repo16.Name) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents", user2.Name, repo16.Name), &changeFilesOptions) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using access token for a private repo that the user of the token owns | |||
@@ -257,8 +260,8 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[0].Path = createTreePath | |||
changeFilesOptions.Files[1].Path = updateTreePath | |||
changeFilesOptions.Files[2].Path = deleteTreePath | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents?token=%s", user2.Name, repo16.Name, token2) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents", user2.Name, repo16.Name), &changeFilesOptions). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// Test using org repo "org3/repo3" where user2 is a collaborator | |||
@@ -272,8 +275,8 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[0].Path = createTreePath | |||
changeFilesOptions.Files[1].Path = updateTreePath | |||
changeFilesOptions.Files[2].Path = deleteTreePath | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents?token=%s", org3.Name, repo3.Name, token2) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents", org3.Name, repo3.Name), &changeFilesOptions). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusCreated) | |||
// Test using org repo "org3/repo3" with no user token | |||
@@ -287,8 +290,7 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[0].Path = createTreePath | |||
changeFilesOptions.Files[1].Path = updateTreePath | |||
changeFilesOptions.Files[2].Path = deleteTreePath | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents", org3.Name, repo3.Name) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents", org3.Name, repo3.Name), &changeFilesOptions) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using repo "user2/repo1" where user4 is a NOT collaborator | |||
@@ -302,8 +304,8 @@ func TestAPIChangeFiles(t *testing.T) { | |||
changeFilesOptions.Files[0].Path = createTreePath | |||
changeFilesOptions.Files[1].Path = updateTreePath | |||
changeFilesOptions.Files[2].Path = deleteTreePath | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents?token=%s", user2.Name, repo1.Name, token4) | |||
req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents", user2.Name, repo1.Name), &changeFilesOptions). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
}) | |||
} |
@@ -154,14 +154,17 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) { | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test accessing private ref with user token that does not have access - should fail | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token4) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test access private ref of owner of token | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/readme.md?token=%s", user2.Name, repo16.Name, token2) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/readme.md", user2.Name, repo16.Name). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test access of org org3 private repo file by owner user2 | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?token=%s", org3.Name, repo3.Name, treePath, token2) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusOK) | |||
} |
@@ -151,15 +151,18 @@ func testAPIGetContents(t *testing.T, u *url.URL) { | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test accessing private ref with user token that does not have access - should fail | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token4) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s", user2.Name, repo16.Name, treePath). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test access private ref of owner of token | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/readme.md?token=%s", user2.Name, repo16.Name, token2) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/readme.md", user2.Name, repo16.Name). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test access of org org3 private repo file by owner user2 | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?token=%s", org3.Name, repo3.Name, treePath, token2) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s", org3.Name, repo3.Name, treePath). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusOK) | |||
} | |||
@@ -48,7 +48,8 @@ func TestAPIReposGitBlobs(t *testing.T) { | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Test using access token for a private repo that the user of the token owns | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/blobs/%s?token=%s", user2.Name, repo16.Name, repo16ReadmeSHA, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/blobs/%s", user2.Name, repo16.Name, repo16ReadmeSHA). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test using bad sha | |||
@@ -56,11 +57,13 @@ func TestAPIReposGitBlobs(t *testing.T) { | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
// Test using org repo "org3/repo3" where user2 is a collaborator | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/blobs/%s?token=%s", org3.Name, repo3.Name, repo3ReadmeSHA, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/blobs/%s", org3.Name, repo3.Name, repo3ReadmeSHA). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test using org repo "org3/repo3" where user2 is a collaborator | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/blobs/%s?token=%s", org3.Name, repo3.Name, repo3ReadmeSHA, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/blobs/%s", org3.Name, repo3.Name, repo3ReadmeSHA). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test using org repo "org3/repo3" with no user token |
@@ -32,13 +32,16 @@ func TestAPIReposGitCommits(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
// check invalid requests | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/12345?token="+token, user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/12345", user.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/..?token="+token, user.Name) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/..", user.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/branch-not-exist?token="+token, user.Name) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/branch-not-exist", user.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
for _, ref := range [...]string{ | |||
@@ -47,7 +50,8 @@ func TestAPIReposGitCommits(t *testing.T) { | |||
"65f1", // short sha | |||
"65f1bf27bc3bf70f64657658635e66094edbcb4d", // full sha | |||
} { | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/%s?token="+token, user.Name, ref) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/commits/%s", user.Name, ref). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
} | |||
} | |||
@@ -60,7 +64,8 @@ func TestAPIReposGitCommitList(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
// Test getting commits (Page 1) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo20/commits?token="+token+"¬=master&sha=remove-files-a", user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo20/commits?not=master&sha=remove-files-a", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiData []api.Commit | |||
@@ -83,7 +88,8 @@ func TestAPIReposGitCommitListNotMaster(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
// Test getting commits (Page 1) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?token="+token, user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiData []api.Commit | |||
@@ -108,7 +114,8 @@ func TestAPIReposGitCommitListPage2Empty(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
// Test getting commits (Page=2) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?token="+token+"&page=2", user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?page=2", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiData []api.Commit | |||
@@ -125,7 +132,8 @@ func TestAPIReposGitCommitListDifferentBranch(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
// Test getting commits (Page=1, Branch=good-sign) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?token="+token+"&sha=good-sign", user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?sha=good-sign", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiData []api.Commit | |||
@@ -144,7 +152,8 @@ func TestAPIReposGitCommitListWithoutSelectFields(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
// Test getting commits without files, verification, and stats | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?token="+token+"&sha=good-sign&stat=false&files=false&verification=false", user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?sha=good-sign&stat=false&files=false&verification=false", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiData []api.Commit | |||
@@ -165,14 +174,16 @@ func TestDownloadCommitDiffOrPatch(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
// Test getting diff | |||
reqDiff := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/git/commits/f27c2b2b03dcab38beaf89b0ab4ff61f6de63441.diff?token="+token, user.Name) | |||
reqDiff := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/git/commits/f27c2b2b03dcab38beaf89b0ab4ff61f6de63441.diff", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, reqDiff, http.StatusOK) | |||
assert.EqualValues(t, | |||
"commit f27c2b2b03dcab38beaf89b0ab4ff61f6de63441\nAuthor: User2 <user2@example.com>\nDate: Sun Aug 6 19:55:01 2017 +0200\n\n good signed commit\n\ndiff --git a/readme.md b/readme.md\nnew file mode 100644\nindex 0000000..458121c\n--- /dev/null\n+++ b/readme.md\n@@ -0,0 +1 @@\n+good sign\n", | |||
resp.Body.String()) | |||
// Test getting patch | |||
reqPatch := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/git/commits/f27c2b2b03dcab38beaf89b0ab4ff61f6de63441.patch?token="+token, user.Name) | |||
reqPatch := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/git/commits/f27c2b2b03dcab38beaf89b0ab4ff61f6de63441.patch", user.Name). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, reqPatch, http.StatusOK) | |||
assert.EqualValues(t, | |||
"From f27c2b2b03dcab38beaf89b0ab4ff61f6de63441 Mon Sep 17 00:00:00 2001\nFrom: User2 <user2@example.com>\nDate: Sun, 6 Aug 2017 19:55:01 +0200\nSubject: [PATCH] good signed commit\n\n---\n readme.md | 1 +\n 1 file changed, 1 insertion(+)\n create mode 100644 readme.md\n\ndiff --git a/readme.md b/readme.md\nnew file mode 100644\nindex 0000000..458121c\n--- /dev/null\n+++ b/readme.md\n@@ -0,0 +1 @@\n+good sign\n", | |||
@@ -186,7 +197,8 @@ func TestGetFileHistory(t *testing.T) { | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?path=readme.md&token="+token+"&sha=good-sign", user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/commits?path=readme.md&sha=good-sign", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiData []api.Commit | |||
@@ -206,7 +218,8 @@ func TestGetFileHistoryNotOnMaster(t *testing.T) { | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo20/commits?path=test.csv&token="+token+"&sha=add-csv¬=master", user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo20/commits?path=test.csv&sha=add-csv¬=master", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiData []api.Commit |
@@ -32,8 +32,8 @@ func TestAPIListGitHooks(t *testing.T) { | |||
// user1 is an admin user | |||
session := loginUser(t, "user1") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git?token=%s", | |||
owner.Name, repo.Name, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git", owner.Name, repo.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiGitHooks []*api.GitHook | |||
DecodeJSON(t, resp, &apiGitHooks) | |||
@@ -58,8 +58,8 @@ func TestAPIListGitHooksNoHooks(t *testing.T) { | |||
// user1 is an admin user | |||
session := loginUser(t, "user1") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git?token=%s", | |||
owner.Name, repo.Name, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git", owner.Name, repo.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiGitHooks []*api.GitHook | |||
DecodeJSON(t, resp, &apiGitHooks) | |||
@@ -78,8 +78,8 @@ func TestAPIListGitHooksNoAccess(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git?token=%s", | |||
owner.Name, repo.Name, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git", owner.Name, repo.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} | |||
@@ -92,8 +92,8 @@ func TestAPIGetGitHook(t *testing.T) { | |||
// user1 is an admin user | |||
session := loginUser(t, "user1") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git/pre-receive?token=%s", | |||
owner.Name, repo.Name, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git/pre-receive", owner.Name, repo.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiGitHook *api.GitHook | |||
DecodeJSON(t, resp, &apiGitHook) | |||
@@ -109,8 +109,8 @@ func TestAPIGetGitHookNoAccess(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git/pre-receive?token=%s", | |||
owner.Name, repo.Name, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git/pre-receive", owner.Name, repo.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} | |||
@@ -124,19 +124,19 @@ func TestAPIEditGitHook(t *testing.T) { | |||
session := loginUser(t, "user1") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/hooks/git/pre-receive?token=%s", | |||
owner.Name, repo.Name, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/hooks/git/pre-receive", | |||
owner.Name, repo.Name) | |||
req := NewRequestWithJSON(t, "PATCH", urlStr, &api.EditGitHookOption{ | |||
Content: testHookContent, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiGitHook *api.GitHook | |||
DecodeJSON(t, resp, &apiGitHook) | |||
assert.True(t, apiGitHook.IsActive) | |||
assert.Equal(t, testHookContent, apiGitHook.Content) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git/pre-receive?token=%s", | |||
owner.Name, repo.Name, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git/pre-receive", owner.Name, repo.Name). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var apiGitHook2 *api.GitHook | |||
DecodeJSON(t, resp, &apiGitHook2) | |||
@@ -152,11 +152,10 @@ func TestAPIEditGitHookNoAccess(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/hooks/git/pre-receive?token=%s", | |||
owner.Name, repo.Name, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/hooks/git/pre-receive", owner.Name, repo.Name) | |||
req := NewRequestWithJSON(t, "PATCH", urlStr, &api.EditGitHookOption{ | |||
Content: testHookContent, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} | |||
@@ -170,12 +169,12 @@ func TestAPIDeleteGitHook(t *testing.T) { | |||
session := loginUser(t, "user1") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/hooks/git/pre-receive?token=%s", | |||
owner.Name, repo.Name, token) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/hooks/git/pre-receive", owner.Name, repo.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git/pre-receive?token=%s", | |||
owner.Name, repo.Name, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/hooks/git/pre-receive", owner.Name, repo.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiGitHook2 *api.GitHook | |||
DecodeJSON(t, resp, &apiGitHook2) | |||
@@ -191,7 +190,7 @@ func TestAPIDeleteGitHookNoAccess(t *testing.T) { | |||
session := loginUser(t, owner.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/hooks/git/pre-receive?token=%s", | |||
owner.Name, repo.Name, token) | |||
req := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/hooks/git/pre-receive", owner.Name, repo.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} |
@@ -24,14 +24,17 @@ func TestAPIReposGitNotes(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
// check invalid requests | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/notes/12345?token=%s", user.Name, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/notes/12345", user.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/notes/..?token=%s", user.Name, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/notes/..", user.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// check valid request | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/notes/65f1bf27bc3bf70f64657658635e66094edbcb4d?token=%s", user.Name, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/notes/65f1bf27bc3bf70f64657658635e66094edbcb4d", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiData api.Note |
@@ -24,13 +24,16 @@ func TestAPIReposGitRefs(t *testing.T) { | |||
"refs/heads/master", // Branch | |||
"refs/tags/v1.1", // Tag | |||
} { | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/%s?token="+token, user.Name, ref) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/%s", user.Name, ref). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
} | |||
// Test getting all refs | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/refs?token="+token, user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/refs", user.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test getting non-existent refs | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/refs/heads/unknown?token="+token, user.Name) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/git/refs/heads/unknown", user.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
} |
@@ -45,7 +45,8 @@ func TestAPIGitTags(t *testing.T) { | |||
aTag, _ := gitRepo.GetTag(aTagName) | |||
// SHOULD work for annotated tags | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/tags/%s?token=%s", user.Name, repo.Name, aTag.ID.String(), token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/tags/%s", user.Name, repo.Name, aTag.ID.String()). | |||
AddTokenAuth(token) | |||
res := MakeRequest(t, req, http.StatusOK) | |||
var tag *api.AnnotatedTag | |||
@@ -60,7 +61,8 @@ func TestAPIGitTags(t *testing.T) { | |||
assert.Equal(t, util.URLJoin(repo.APIURL(), "git/tags", aTag.ID.String()), tag.URL) | |||
// Should NOT work for lightweight tags | |||
badReq := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/tags/%s?token=%s", user.Name, repo.Name, commit.ID.String(), token) | |||
badReq := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/tags/%s", user.Name, repo.Name, commit.ID.String()). | |||
AddTokenAuth(token) | |||
MakeRequest(t, badReq, http.StatusBadRequest) | |||
} | |||
@@ -72,17 +74,14 @@ func TestAPIDeleteTagByName(t *testing.T) { | |||
session := loginUser(t, owner.LowerName) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/tags/delete-tag?token=%s", | |||
owner.Name, repo.Name, token) | |||
req := NewRequestf(t, http.MethodDelete, urlStr) | |||
req := NewRequest(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/tags/delete-tag", owner.Name, repo.Name)). | |||
AddTokenAuth(token) | |||
_ = MakeRequest(t, req, http.StatusNoContent) | |||
// Make sure that actual releases can't be deleted outright | |||
createNewReleaseUsingAPI(t, session, token, owner, repo, "release-tag", "", "Release Tag", "test") | |||
urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/tags/release-tag?token=%s", | |||
owner.Name, repo.Name, token) | |||
req = NewRequestf(t, http.MethodDelete, urlStr) | |||
req = NewRequest(t, http.MethodDelete, fmt.Sprintf("/api/v1/repos/%s/%s/tags/release-tag", owner.Name, repo.Name)). | |||
AddTokenAuth(token) | |||
_ = MakeRequest(t, req, http.StatusConflict) | |||
} |
@@ -50,7 +50,8 @@ func TestAPIReposGitTrees(t *testing.T) { | |||
} | |||
// Test using access token for a private repo that the user of the token owns | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/trees/%s?token=%s", user2.Name, repo16.Name, repo16TreeSHA, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/trees/%s", user2.Name, repo16.Name, repo16TreeSHA). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test using bad sha | |||
@@ -58,7 +59,8 @@ func TestAPIReposGitTrees(t *testing.T) { | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
// Test using org repo "org3/repo3" where user2 is a collaborator | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/trees/%s?token=%s", org3.Name, repo3.Name, repo3TreeSHA, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/trees/%s", org3.Name, repo3.Name, repo3TreeSHA). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
// Test using org repo "org3/repo3" with no user token |
@@ -27,17 +27,14 @@ func TestAPICreateHook(t *testing.T) { | |||
// user1 is an admin user | |||
session := loginUser(t, "user1") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
completeURL := func(lastSegment string) string { | |||
return fmt.Sprintf("/api/v1/repos/%s/%s/%s?token=%s", owner.Name, repo.Name, lastSegment, token) | |||
} | |||
req := NewRequestWithJSON(t, "POST", completeURL("hooks"), api.CreateHookOption{ | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/%s", owner.Name, repo.Name, "hooks"), api.CreateHookOption{ | |||
Type: "gitea", | |||
Config: api.CreateHookOptionConfig{ | |||
"content_type": "json", | |||
"url": "http://example.com/", | |||
}, | |||
AuthorizationHeader: "Bearer s3cr3t", | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var apiHook *api.Hook |
@@ -33,12 +33,12 @@ func TestAPIRepoLFSMigrateLocal(t *testing.T) { | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate?token="+token, &api.MigrateRepoOptions{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate", &api.MigrateRepoOptions{ | |||
CloneAddr: path.Join(setting.RepoRootPath, "migration/lfs-test.git"), | |||
RepoOwnerID: user.ID, | |||
RepoName: "lfs-test-local", | |||
LFS: true, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, NoExpectedStatus) | |||
assert.EqualValues(t, http.StatusCreated, resp.Code) | |||
@@ -82,11 +82,10 @@ func TestAPILFSBatch(t *testing.T) { | |||
session := loginUser(t, "user2") | |||
newRequest := func(t testing.TB, br *lfs.BatchRequest) *http.Request { | |||
req := NewRequestWithJSON(t, "POST", "/user2/lfs-batch-repo.git/info/lfs/objects/batch", br) | |||
req.Header.Set("Accept", lfs.MediaType) | |||
req.Header.Set("Content-Type", lfs.MediaType) | |||
return req | |||
newRequest := func(t testing.TB, br *lfs.BatchRequest) *RequestWrapper { | |||
return NewRequestWithJSON(t, "POST", "/user2/lfs-batch-repo.git/info/lfs/objects/batch", br). | |||
SetHeader("Accept", lfs.MediaType). | |||
SetHeader("Content-Type", lfs.MediaType) | |||
} | |||
decodeResponse := func(t *testing.T, b *bytes.Buffer) *lfs.BatchResponse { | |||
var br lfs.BatchResponse | |||
@@ -342,9 +341,8 @@ func TestAPILFSUpload(t *testing.T) { | |||
session := loginUser(t, "user2") | |||
newRequest := func(t testing.TB, p lfs.Pointer, content string) *http.Request { | |||
req := NewRequestWithBody(t, "PUT", path.Join("/user2/lfs-upload-repo.git/info/lfs/objects/", p.Oid, strconv.FormatInt(p.Size, 10)), strings.NewReader(content)) | |||
return req | |||
newRequest := func(t testing.TB, p lfs.Pointer, content string) *RequestWrapper { | |||
return NewRequestWithBody(t, "PUT", path.Join("/user2/lfs-upload-repo.git/info/lfs/objects/", p.Oid, strconv.FormatInt(p.Size, 10)), strings.NewReader(content)) | |||
} | |||
t.Run("InvalidPointer", func(t *testing.T) { | |||
@@ -447,11 +445,10 @@ func TestAPILFSVerify(t *testing.T) { | |||
session := loginUser(t, "user2") | |||
newRequest := func(t testing.TB, p *lfs.Pointer) *http.Request { | |||
req := NewRequestWithJSON(t, "POST", "/user2/lfs-verify-repo.git/info/lfs/verify", p) | |||
req.Header.Set("Accept", lfs.MediaType) | |||
req.Header.Set("Content-Type", lfs.MediaType) | |||
return req | |||
newRequest := func(t testing.TB, p *lfs.Pointer) *RequestWrapper { | |||
return NewRequestWithJSON(t, "POST", "/user2/lfs-verify-repo.git/info/lfs/verify", p). | |||
SetHeader("Accept", lfs.MediaType). | |||
SetHeader("Content-Type", lfs.MediaType) | |||
} | |||
t.Run("InvalidJsonRequest", func(t *testing.T) { |
@@ -27,12 +27,14 @@ func TestAPIReposRaw(t *testing.T) { | |||
"v1.1", // Tag | |||
"65f1bf27bc3bf70f64657658635e66094edbcb4d", // Commit | |||
} { | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/raw/%s/README.md?token="+token, user.Name, ref) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/raw/%s/README.md", user.Name, ref). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.EqualValues(t, "file", resp.Header().Get("x-gitea-object-type")) | |||
} | |||
// Test default branch | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/raw/README.md?token="+token, user.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/raw/README.md", user.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.EqualValues(t, "file", resp.Header().Get("x-gitea-object-type")) | |||
} |
@@ -60,44 +60,47 @@ func TestAPIRepoSecrets(t *testing.T) { | |||
} | |||
for _, c := range cases { | |||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/actions/secrets/%s?token=%s", repo.FullName(), c.Name, token), api.CreateOrUpdateSecretOption{ | |||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/actions/secrets/%s", repo.FullName(), c.Name), api.CreateOrUpdateSecretOption{ | |||
Data: "data", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, c.ExpectedStatus) | |||
} | |||
}) | |||
t.Run("Update", func(t *testing.T) { | |||
name := "update_secret" | |||
url := fmt.Sprintf("/api/v1/repos/%s/actions/secrets/%s?token=%s", repo.FullName(), name, token) | |||
url := fmt.Sprintf("/api/v1/repos/%s/actions/secrets/%s", repo.FullName(), name) | |||
req := NewRequestWithJSON(t, "PUT", url, api.CreateOrUpdateSecretOption{ | |||
Data: "initial", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequestWithJSON(t, "PUT", url, api.CreateOrUpdateSecretOption{ | |||
Data: "changed", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
t.Run("Delete", func(t *testing.T) { | |||
name := "delete_secret" | |||
url := fmt.Sprintf("/api/v1/repos/%s/actions/secrets/%s?token=%s", repo.FullName(), name, token) | |||
url := fmt.Sprintf("/api/v1/repos/%s/actions/secrets/%s", repo.FullName(), name) | |||
req := NewRequestWithJSON(t, "PUT", url, api.CreateOrUpdateSecretOption{ | |||
Data: "initial", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "DELETE", url) | |||
req = NewRequest(t, "DELETE", url). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "DELETE", url) | |||
req = NewRequest(t, "DELETE", url). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/actions/secrets/000?token=%s", repo.FullName(), token)) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/actions/secrets/000", repo.FullName())). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
}) | |||
} |
@@ -27,7 +27,8 @@ func TestAPIRepoTags(t *testing.T) { | |||
repoName := "repo1" | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/tags?token=%s", user.Name, repoName, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/tags", user.Name, repoName). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var tags []*api.Tag | |||
@@ -55,14 +56,16 @@ func TestAPIRepoTags(t *testing.T) { | |||
} | |||
// get created tag | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/tags/%s?token=%s", user.Name, repoName, newTag.Name, token) | |||
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/tags/%s", user.Name, repoName, newTag.Name). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
var tag *api.Tag | |||
DecodeJSON(t, resp, &tag) | |||
assert.EqualValues(t, newTag, tag) | |||
// delete tag | |||
delReq := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/tags/%s?token=%s", user.Name, repoName, newTag.Name, token) | |||
delReq := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/tags/%s", user.Name, repoName, newTag.Name). | |||
AddTokenAuth(token) | |||
MakeRequest(t, delReq, http.StatusNoContent) | |||
// check if it's gone | |||
@@ -70,12 +73,12 @@ func TestAPIRepoTags(t *testing.T) { | |||
} | |||
func createNewTagUsingAPI(t *testing.T, session *TestSession, token, ownerName, repoName, name, target, msg string) *api.Tag { | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/tags?token=%s", ownerName, repoName, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/tags", ownerName, repoName) | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateTagOption{ | |||
TagName: name, | |||
Message: msg, | |||
Target: target, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var respObj api.Tag |
@@ -31,8 +31,8 @@ func TestAPIRepoTeams(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
// ListTeams | |||
url := fmt.Sprintf("/api/v1/repos/%s/teams?token=%s", publicOrgRepo.FullName(), token) | |||
req := NewRequest(t, "GET", url) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/teams", publicOrgRepo.FullName())). | |||
AddTokenAuth(token) | |||
res := MakeRequest(t, req, http.StatusOK) | |||
var teams []*api.Team | |||
DecodeJSON(t, res, &teams) | |||
@@ -49,34 +49,34 @@ func TestAPIRepoTeams(t *testing.T) { | |||
} | |||
// IsTeam | |||
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "Test_Team", token) | |||
req = NewRequest(t, "GET", url) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/teams/%s", publicOrgRepo.FullName(), "Test_Team")). | |||
AddTokenAuth(token) | |||
res = MakeRequest(t, req, http.StatusOK) | |||
var team *api.Team | |||
DecodeJSON(t, res, &team) | |||
assert.EqualValues(t, teams[1], team) | |||
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "NonExistingTeam", token) | |||
req = NewRequest(t, "GET", url) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/teams/%s", publicOrgRepo.FullName(), "NonExistingTeam")). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// AddTeam with user4 | |||
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "team1", token) | |||
req = NewRequest(t, "PUT", url) | |||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/teams/%s", publicOrgRepo.FullName(), "team1")). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
// AddTeam with user2 | |||
user = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) | |||
session = loginUser(t, user.Name) | |||
token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "team1", token) | |||
req = NewRequest(t, "PUT", url) | |||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/teams/%s", publicOrgRepo.FullName(), "team1")). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request | |||
// DeleteTeam | |||
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "team1", token) | |||
req = NewRequest(t, "DELETE", url) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/teams/%s", publicOrgRepo.FullName(), "team1")). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request | |||
} |
@@ -45,8 +45,8 @@ 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") | |||
req := NewRequestf(t, "GET", "/api/v1/users/%s/repos", user.Name) | |||
req = addTokenAuthHeader(req, wrongToken) | |||
req := NewRequestf(t, "GET", "/api/v1/users/%s/repos", user.Name). | |||
AddTokenAuth(wrongToken) | |||
resp := MakeRequest(t, req, http.StatusUnauthorized) | |||
assert.Contains(t, resp.Body.String(), "user does not exist") | |||
@@ -208,7 +208,8 @@ func TestAPISearchRepo(t *testing.T) { | |||
} | |||
t.Run(testName, func(t *testing.T) { | |||
request := NewRequest(t, "GET", testCase.requestURL+"&token="+token) | |||
request := NewRequest(t, "GET", testCase.requestURL). | |||
AddTokenAuth(token) | |||
response := MakeRequest(t, request, http.StatusOK) | |||
var body api.SearchResults | |||
@@ -309,7 +310,8 @@ func TestAPIOrgRepos(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadOrganization) | |||
t.Run(testName, func(t *testing.T) { | |||
req := NewRequestf(t, "GET", "/api/v1/orgs/%s/repos?token="+token, sourceOrg.Name) | |||
req := NewRequestf(t, "GET", "/api/v1/orgs/%s/repos", sourceOrg.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiRepos []*api.Repository | |||
@@ -329,7 +331,8 @@ func TestAPIGetRepoByIDUnauthorized(t *testing.T) { | |||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
req := NewRequestf(t, "GET", "/api/v1/repositories/2?token="+token) | |||
req := NewRequest(t, "GET", "/api/v1/repositories/2"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
} | |||
@@ -353,11 +356,11 @@ func TestAPIRepoMigrate(t *testing.T) { | |||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: testCase.ctxUserID}) | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate?token="+token, &api.MigrateRepoOptions{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate", &api.MigrateRepoOptions{ | |||
CloneAddr: testCase.cloneURL, | |||
RepoOwnerID: testCase.userID, | |||
RepoName: testCase.repoName, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, NoExpectedStatus) | |||
if resp.Code == http.StatusUnprocessableEntity { | |||
respJSON := map[string]string{} | |||
@@ -398,12 +401,13 @@ func testAPIRepoMigrateConflict(t *testing.T, u *url.URL) { | |||
cloneURL := "https://github.com/go-gitea/test_repo.git" | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate?token="+httpContext.Token, | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate", | |||
&api.MigrateRepoOptions{ | |||
CloneAddr: cloneURL, | |||
RepoOwnerID: userID, | |||
RepoName: httpContext.Reponame, | |||
}) | |||
}). | |||
AddTokenAuth(httpContext.Token) | |||
resp := httpContext.Session.MakeRequest(t, req, http.StatusConflict) | |||
respJSON := map[string]string{} | |||
DecodeJSON(t, resp, &respJSON) | |||
@@ -425,7 +429,8 @@ func TestAPIMirrorSyncNonMirrorRepo(t *testing.T) { | |||
DecodeJSON(t, resp, &repo) | |||
assert.False(t, repo.Mirror) | |||
req = NewRequestf(t, "POST", "/api/v1/repos/user2/repo1/mirror-sync?token=%s", token) | |||
req = NewRequestf(t, "POST", "/api/v1/repos/user2/repo1/mirror-sync"). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusBadRequest) | |||
errRespJSON := map[string]string{} | |||
DecodeJSON(t, resp, &errRespJSON) | |||
@@ -450,9 +455,9 @@ func TestAPIOrgRepoCreate(t *testing.T) { | |||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: testCase.ctxUserID}) | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/org/%s/repos?token="+token, testCase.orgName), &api.CreateRepoOption{ | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/org/%s/repos", testCase.orgName), &api.CreateRepoOption{ | |||
Name: testCase.repoName, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, testCase.expectedStatus) | |||
} | |||
} | |||
@@ -473,10 +478,11 @@ func testAPIRepoCreateConflict(t *testing.T, u *url.URL) { | |||
httpContext.Reponame = "repo-tmp-17" | |||
t.Run("CreateRepo", doAPICreateRepository(httpContext, false)) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos?token="+httpContext.Token, | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", | |||
&api.CreateRepoOption{ | |||
Name: httpContext.Reponame, | |||
}) | |||
}). | |||
AddTokenAuth(httpContext.Token) | |||
resp := httpContext.Session.MakeRequest(t, req, http.StatusConflict) | |||
respJSON := map[string]string{} | |||
DecodeJSON(t, resp, &respJSON) | |||
@@ -516,13 +522,13 @@ func TestAPIRepoTransfer(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) | |||
repoName := "moveME" | |||
apiRepo := new(api.Repository) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/user/repos?token=%s", token), &api.CreateRepoOption{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", &api.CreateRepoOption{ | |||
Name: repoName, | |||
Description: "repo move around", | |||
Private: false, | |||
Readme: "Default", | |||
AutoInit: true, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, apiRepo) | |||
@@ -532,10 +538,10 @@ func TestAPIRepoTransfer(t *testing.T) { | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID}) | |||
session = loginUser(t, user.Name) | |||
token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer?token=%s", repo.OwnerName, repo.Name, token), &api.TransferRepoOption{ | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer", repo.OwnerName, repo.Name), &api.TransferRepoOption{ | |||
NewOwner: testCase.newOwner, | |||
TeamIDs: testCase.teams, | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, testCase.expectedStatus) | |||
} | |||
@@ -551,21 +557,21 @@ func transfer(t *testing.T) *repo_model.Repository { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) | |||
repoName := "moveME" | |||
apiRepo := new(api.Repository) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/user/repos?token=%s", token), &api.CreateRepoOption{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", &api.CreateRepoOption{ | |||
Name: repoName, | |||
Description: "repo move around", | |||
Private: false, | |||
Readme: "Default", | |||
AutoInit: true, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, apiRepo) | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID}) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer?token=%s", repo.OwnerName, repo.Name, token), &api.TransferRepoOption{ | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer", repo.OwnerName, repo.Name), &api.TransferRepoOption{ | |||
NewOwner: "user4", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
return repo | |||
@@ -579,18 +585,21 @@ func TestAPIAcceptTransfer(t *testing.T) { | |||
// try to accept with not authorized user | |||
session := loginUser(t, "user2") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) | |||
req := NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/reject?token=%s", repo.OwnerName, repo.Name, token)) | |||
req := NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/reject", repo.OwnerName, repo.Name)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
// try to accept repo that's not marked as transferred | |||
req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/accept?token=%s", "user2", "repo1", token)) | |||
req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/accept", "user2", "repo1")). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// accept transfer | |||
session = loginUser(t, "user4") | |||
token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) | |||
req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/accept?token=%s", repo.OwnerName, repo.Name, token)) | |||
req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/accept", repo.OwnerName, repo.Name)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusAccepted) | |||
apiRepo := new(api.Repository) | |||
DecodeJSON(t, resp, apiRepo) | |||
@@ -605,18 +614,21 @@ func TestAPIRejectTransfer(t *testing.T) { | |||
// try to reject with not authorized user | |||
session := loginUser(t, "user2") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/reject?token=%s", repo.OwnerName, repo.Name, token)) | |||
req := NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/reject", repo.OwnerName, repo.Name)). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
// try to reject repo that's not marked as transferred | |||
req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/reject?token=%s", "user2", "repo1", token)) | |||
req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/reject", "user2", "repo1")). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// reject transfer | |||
session = loginUser(t, "user4") | |||
token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/reject?token=%s", repo.OwnerName, repo.Name, token)) | |||
req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/transfer/reject", repo.OwnerName, repo.Name)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
apiRepo := new(api.Repository) | |||
DecodeJSON(t, resp, apiRepo) | |||
@@ -634,26 +646,26 @@ func TestAPIGenerateRepo(t *testing.T) { | |||
// user | |||
repo := new(api.Repository) | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/generate?token=%s", templateRepo.OwnerName, templateRepo.Name, token), &api.GenerateRepoOption{ | |||
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/generate", templateRepo.OwnerName, templateRepo.Name), &api.GenerateRepoOption{ | |||
Owner: user.Name, | |||
Name: "new-repo", | |||
Description: "test generate repo", | |||
Private: false, | |||
GitContent: true, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, repo) | |||
assert.Equal(t, "new-repo", repo.Name) | |||
// org | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/generate?token=%s", templateRepo.OwnerName, templateRepo.Name, token), &api.GenerateRepoOption{ | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/generate", templateRepo.OwnerName, templateRepo.Name), &api.GenerateRepoOption{ | |||
Owner: "org3", | |||
Name: "new-repo", | |||
Description: "test generate repo", | |||
Private: false, | |||
GitContent: true, | |||
}) | |||
}).AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
DecodeJSON(t, resp, repo) | |||
@@ -667,7 +679,8 @@ func TestAPIRepoGetReviewers(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/reviewers?token=%s", user.Name, repo.Name, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/reviewers", user.Name, repo.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var reviewers []*api.User | |||
DecodeJSON(t, resp, &reviewers) | |||
@@ -681,7 +694,8 @@ func TestAPIRepoGetAssignees(t *testing.T) { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) | |||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/assignees?token=%s", user.Name, repo.Name, token) | |||
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/assignees", user.Name, repo.Name). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var assignees []*api.User | |||
DecodeJSON(t, resp, &assignees) |
@@ -63,30 +63,33 @@ func TestAPIRepoTopic(t *testing.T) { | |||
token2 := getUserToken(t, user2.Name, auth_model.AccessTokenScopeWriteRepository) | |||
// Test read topics using login | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/topics", user2.Name, repo2.Name) | |||
req := NewRequest(t, "GET", url+"?token="+token2) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/topics", user2.Name, repo2.Name)). | |||
AddTokenAuth(token2) | |||
res := MakeRequest(t, req, http.StatusOK) | |||
var topics *api.TopicName | |||
DecodeJSON(t, res, &topics) | |||
assert.ElementsMatch(t, []string{"topicname1", "topicname2"}, topics.TopicNames) | |||
// Log out user2 | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/topics?token=%s", user2.Name, repo2.Name, token2) | |||
// Test delete a topic | |||
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "Topicname1", token2) | |||
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/topics/%s", user2.Name, repo2.Name, "Topicname1"). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Test add an existing topic | |||
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "Golang", token2) | |||
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s", user2.Name, repo2.Name, "Golang"). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// Test add a topic | |||
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "topicName3", token2) | |||
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s", user2.Name, repo2.Name, "topicName3"). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
url := fmt.Sprintf("/api/v1/repos/%s/%s/topics", user2.Name, repo2.Name) | |||
// Test read topics using token | |||
req = NewRequest(t, "GET", url) | |||
req = NewRequest(t, "GET", url). | |||
AddTokenAuth(token2) | |||
res = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, res, &topics) | |||
assert.ElementsMatch(t, []string{"topicname2", "golang", "topicname3"}, topics.TopicNames) | |||
@@ -95,9 +98,10 @@ func TestAPIRepoTopic(t *testing.T) { | |||
newTopics := []string{" windows ", " ", "MAC "} | |||
req = NewRequestWithJSON(t, "PUT", url, &api.RepoTopicOptions{ | |||
Topics: newTopics, | |||
}) | |||
}).AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "GET", url) | |||
req = NewRequest(t, "GET", url). | |||
AddTokenAuth(token2) | |||
res = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, res, &topics) | |||
assert.ElementsMatch(t, []string{"windows", "mac"}, topics.TopicNames) | |||
@@ -106,9 +110,10 @@ func TestAPIRepoTopic(t *testing.T) { | |||
newTopics = []string{"topicname1", "topicname2", "topicname!"} | |||
req = NewRequestWithJSON(t, "PUT", url, &api.RepoTopicOptions{ | |||
Topics: newTopics, | |||
}) | |||
}).AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
req = NewRequest(t, "GET", url) | |||
req = NewRequest(t, "GET", url). | |||
AddTokenAuth(token2) | |||
res = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, res, &topics) | |||
assert.ElementsMatch(t, []string{"windows", "mac"}, topics.TopicNames) | |||
@@ -117,9 +122,10 @@ func TestAPIRepoTopic(t *testing.T) { | |||
newTopics = []string{"t1", "t2", "t1", "t3", "t4", "t5", "t6", "t7", "t8", "t9", "t10", "t11", "t12", "t13", "t14", "t15", "t16", "17", "t18", "t19", "t20", "t21", "t22", "t23", "t24", "t25"} | |||
req = NewRequestWithJSON(t, "PUT", url, &api.RepoTopicOptions{ | |||
Topics: newTopics, | |||
}) | |||
}).AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "GET", url) | |||
req = NewRequest(t, "GET", url). | |||
AddTokenAuth(token2) | |||
res = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, res, &topics) | |||
assert.Len(t, topics.TopicNames, 25) | |||
@@ -128,28 +134,31 @@ func TestAPIRepoTopic(t *testing.T) { | |||
newTopics = append(newTopics, "t26") | |||
req = NewRequestWithJSON(t, "PUT", url, &api.RepoTopicOptions{ | |||
Topics: newTopics, | |||
}) | |||
}).AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// Test add a topic when there is already maximum | |||
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "t26", token2) | |||
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s", user2.Name, repo2.Name, "t26"). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
// Test delete a topic that repo doesn't have | |||
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "Topicname1", token2) | |||
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/topics/%s", user2.Name, repo2.Name, "Topicname1"). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
// Get user4's token | |||
token4 := getUserToken(t, user4.Name, auth_model.AccessTokenScopeWriteRepository) | |||
// Test read topics with write access | |||
url = fmt.Sprintf("/api/v1/repos/%s/%s/topics?token=%s", org3.Name, repo3.Name, token4) | |||
req = NewRequest(t, "GET", url) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/topics", org3.Name, repo3.Name)). | |||
AddTokenAuth(token4) | |||
res = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, res, &topics) | |||
assert.Empty(t, topics.TopicNames) | |||
// Test add a topic to repo with write access (requires repo admin access) | |||
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s?token=%s", org3.Name, repo3.Name, "topicName", token4) | |||
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s", org3.Name, repo3.Name, "topicName"). | |||
AddTokenAuth(token4) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} |
@@ -34,7 +34,8 @@ func TestAPITeam(t *testing.T) { | |||
session := loginUser(t, user.Name) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadOrganization) | |||
req := NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamUser.TeamID) | |||
req := NewRequestf(t, "GET", "/api/v1/teams/%d", teamUser.TeamID). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiTeam api.Team | |||
@@ -49,7 +50,8 @@ func TestAPITeam(t *testing.T) { | |||
session = loginUser(t, user2.Name) | |||
token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadOrganization) | |||
req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamUser.TeamID) | |||
req = NewRequestf(t, "GET", "/api/v1/teams/%d", teamUser.TeamID). | |||
AddTokenAuth(token) | |||
_ = MakeRequest(t, req, http.StatusForbidden) | |||
req = NewRequestf(t, "GET", "/api/v1/teams/%d", teamUser.TeamID) | |||
@@ -70,7 +72,8 @@ func TestAPITeam(t *testing.T) { | |||
Permission: "write", | |||
Units: []string{"repo.code", "repo.issues"}, | |||
} | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams?token=%s", org.Name, token), teamToCreate) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", org.Name), teamToCreate). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
apiTeam = api.Team{} | |||
DecodeJSON(t, resp, &apiTeam) | |||
@@ -91,7 +94,8 @@ func TestAPITeam(t *testing.T) { | |||
Units: []string{"repo.code", "repo.pulls", "repo.releases"}, | |||
} | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d?token=%s", teamID, token), teamToEdit) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d", teamID), teamToEdit). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
apiTeam = api.Team{} | |||
DecodeJSON(t, resp, &apiTeam) | |||
@@ -103,7 +107,8 @@ func TestAPITeam(t *testing.T) { | |||
// Edit team Description only | |||
editDescription = "first team" | |||
teamToEditDesc := api.EditTeamOption{Description: &editDescription} | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d?token=%s", teamID, token), teamToEditDesc) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d", teamID), teamToEditDesc). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
apiTeam = api.Team{} | |||
DecodeJSON(t, resp, &apiTeam) | |||
@@ -115,7 +120,8 @@ func TestAPITeam(t *testing.T) { | |||
// Read team. | |||
teamRead := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID}) | |||
assert.NoError(t, teamRead.LoadUnits(db.DefaultContext)) | |||
req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamID) | |||
req = NewRequestf(t, "GET", "/api/v1/teams/%d", teamID). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
apiTeam = api.Team{} | |||
DecodeJSON(t, resp, &apiTeam) | |||
@@ -123,7 +129,8 @@ func TestAPITeam(t *testing.T) { | |||
teamRead.AccessMode.String(), teamRead.GetUnitNames(), teamRead.GetUnitsMap()) | |||
// Delete team. | |||
req = NewRequestf(t, "DELETE", "/api/v1/teams/%d?token="+token, teamID) | |||
req = NewRequestf(t, "DELETE", "/api/v1/teams/%d", teamID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
unittest.AssertNotExistsBean(t, &organization.Team{ID: teamID}) | |||
@@ -136,7 +143,8 @@ func TestAPITeam(t *testing.T) { | |||
Permission: "write", | |||
UnitsMap: map[string]string{"repo.code": "read", "repo.issues": "write", "repo.wiki": "none"}, | |||
} | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams?token=%s", org.Name, token), teamToCreate) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", org.Name), teamToCreate). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
apiTeam = api.Team{} | |||
DecodeJSON(t, resp, &apiTeam) | |||
@@ -157,7 +165,8 @@ func TestAPITeam(t *testing.T) { | |||
UnitsMap: map[string]string{"repo.code": "read", "repo.pulls": "read", "repo.releases": "write"}, | |||
} | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d?token=%s", teamID, token), teamToEdit) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d", teamID), teamToEdit). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
apiTeam = api.Team{} | |||
DecodeJSON(t, resp, &apiTeam) | |||
@@ -169,7 +178,8 @@ func TestAPITeam(t *testing.T) { | |||
// Edit team Description only | |||
editDescription = "second team" | |||
teamToEditDesc = api.EditTeamOption{Description: &editDescription} | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d?token=%s", teamID, token), teamToEditDesc) | |||
req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/teams/%d", teamID), teamToEditDesc). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
apiTeam = api.Team{} | |||
DecodeJSON(t, resp, &apiTeam) | |||
@@ -180,7 +190,8 @@ func TestAPITeam(t *testing.T) { | |||
// Read team. | |||
teamRead = unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID}) | |||
req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamID) | |||
req = NewRequestf(t, "GET", "/api/v1/teams/%d", teamID). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
apiTeam = api.Team{} | |||
DecodeJSON(t, resp, &apiTeam) | |||
@@ -189,7 +200,8 @@ func TestAPITeam(t *testing.T) { | |||
teamRead.AccessMode.String(), teamRead.GetUnitNames(), teamRead.GetUnitsMap()) | |||
// Delete team. | |||
req = NewRequestf(t, "DELETE", "/api/v1/teams/%d?token="+token, teamID) | |||
req = NewRequestf(t, "DELETE", "/api/v1/teams/%d", teamID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
unittest.AssertNotExistsBean(t, &organization.Team{ID: teamID}) | |||
@@ -200,7 +212,8 @@ func TestAPITeam(t *testing.T) { | |||
IncludesAllRepositories: true, | |||
Permission: "admin", | |||
} | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams?token=%s", org.Name, token), teamToCreate) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", org.Name), teamToCreate). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusCreated) | |||
apiTeam = api.Team{} | |||
DecodeJSON(t, resp, &apiTeam) | |||
@@ -219,7 +232,8 @@ func TestAPITeam(t *testing.T) { | |||
teamID = apiTeam.ID | |||
// Delete team. | |||
req = NewRequestf(t, "DELETE", "/api/v1/teams/%d?token="+token, teamID) | |||
req = NewRequestf(t, "DELETE", "/api/v1/teams/%d", teamID). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
unittest.AssertNotExistsBean(t, &organization.Team{ID: teamID}) | |||
} | |||
@@ -263,7 +277,8 @@ func TestAPITeamSearch(t *testing.T) { | |||
var results TeamSearchResults | |||
token := getUserToken(t, user.Name, auth_model.AccessTokenScopeReadOrganization) | |||
req := NewRequestf(t, "GET", "/api/v1/orgs/%s/teams/search?q=%s&token=%s", org.Name, "_team", token) | |||
req := NewRequestf(t, "GET", "/api/v1/orgs/%s/teams/search?q=%s", org.Name, "_team"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &results) | |||
assert.NotEmpty(t, results.Data) | |||
@@ -274,7 +289,8 @@ func TestAPITeamSearch(t *testing.T) { | |||
user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) | |||
token5 := getUserToken(t, user5.Name, auth_model.AccessTokenScopeReadOrganization) | |||
req = NewRequestf(t, "GET", "/api/v1/orgs/%s/teams/search?q=%s&token=%s", org.Name, "team", token5) | |||
req = NewRequestf(t, "GET", "/api/v1/orgs/%s/teams/search?q=%s", org.Name, "team"). | |||
AddTokenAuth(token5) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} | |||
@@ -288,7 +304,8 @@ func TestAPIGetTeamRepo(t *testing.T) { | |||
var results api.Repository | |||
token := getUserToken(t, user.Name, auth_model.AccessTokenScopeReadOrganization) | |||
req := NewRequestf(t, "GET", "/api/v1/teams/%d/repos/%s/?token=%s", team.ID, teamRepo.FullName(), token) | |||
req := NewRequestf(t, "GET", "/api/v1/teams/%d/repos/%s/", team.ID, teamRepo.FullName()). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &results) | |||
assert.Equal(t, "big_test_private_4", teamRepo.Name) | |||
@@ -297,6 +314,7 @@ func TestAPIGetTeamRepo(t *testing.T) { | |||
user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) | |||
token5 := getUserToken(t, user5.Name, auth_model.AccessTokenScopeReadOrganization) | |||
req = NewRequestf(t, "GET", "/api/v1/teams/%d/repos/%s/?token=%s", team.ID, teamRepo.FullName(), token5) | |||
req = NewRequestf(t, "GET", "/api/v1/teams/%d/repos/%s/", team.ID, teamRepo.FullName()). | |||
AddTokenAuth(token5) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
} |
@@ -25,10 +25,12 @@ func TestAPITeamUser(t *testing.T) { | |||
normalUsername := "user2" | |||
session := loginUser(t, normalUsername) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadOrganization) | |||
req := NewRequest(t, "GET", "/api/v1/teams/1/members/user1?token="+token) | |||
req := NewRequest(t, "GET", "/api/v1/teams/1/members/user1"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "GET", "/api/v1/teams/1/members/user2?token="+token) | |||
req = NewRequest(t, "GET", "/api/v1/teams/1/members/user2"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var user2 *api.User | |||
DecodeJSON(t, resp, &user2) |
@@ -35,8 +35,8 @@ func TestAPIDeleteMissingToken(t *testing.T) { | |||
defer tests.PrepareTestEnv(t)() | |||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) | |||
req := NewRequestf(t, "DELETE", "/api/v1/users/user1/tokens/%d", unittest.NonexistentID) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestf(t, "DELETE", "/api/v1/users/user1/tokens/%d", unittest.NonexistentID). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
} | |||
@@ -46,20 +46,20 @@ func TestAPIGetTokensPermission(t *testing.T) { | |||
// admin can get tokens for other users | |||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) | |||
req := NewRequestf(t, "GET", "/api/v1/users/user2/tokens") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", "/api/v1/users/user2/tokens"). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
// non-admin can get tokens for himself | |||
user = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) | |||
req = NewRequestf(t, "GET", "/api/v1/users/user2/tokens") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", "/api/v1/users/user2/tokens"). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
// non-admin can't get tokens for other users | |||
user = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) | |||
req = NewRequestf(t, "GET", "/api/v1/users/user2/tokens") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", "/api/v1/users/user2/tokens"). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} | |||
@@ -73,20 +73,20 @@ func TestAPIDeleteTokensPermission(t *testing.T) { | |||
// admin can delete tokens for other users | |||
createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user2, nil) | |||
req := NewRequestf(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-1") | |||
req = AddBasicAuthHeader(req, admin.Name) | |||
req := NewRequest(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-1"). | |||
AddBasicAuth(admin.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// non-admin can delete tokens for himself | |||
createAPIAccessTokenWithoutCleanUp(t, "test-key-2", user2, nil) | |||
req = NewRequestf(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-2") | |||
req = AddBasicAuthHeader(req, user2.Name) | |||
req = NewRequest(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-2"). | |||
AddBasicAuth(user2.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
// non-admin can't delete tokens for other users | |||
createAPIAccessTokenWithoutCleanUp(t, "test-key-3", user2, nil) | |||
req = NewRequestf(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-3") | |||
req = AddBasicAuthHeader(req, user4.Name) | |||
req = NewRequest(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-3"). | |||
AddBasicAuth(user4.Name) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
} | |||
@@ -117,9 +117,6 @@ func TestAPIDeniesPermissionBasedOnTokenScope(t *testing.T) { | |||
// from other endpoints and not updated. | |||
// | |||
// Test cases are in alphabetical order by URL. | |||
// | |||
// Note: query parameters are not currently supported since the token is | |||
// appended with `?=token=<token>`. | |||
testCases := []requiredScopeTestCase{ | |||
{ | |||
"/api/v1/admin/emails", | |||
@@ -526,11 +523,9 @@ func runTestCase(t *testing.T, testCase *requiredScopeTestCase, user *user_model | |||
accessToken := createAPIAccessTokenWithoutCleanUp(t, "test-token", user, &unauthorizedScopes) | |||
defer deleteAPIAccessToken(t, accessToken, user) | |||
// Add API access token to the URL. | |||
url := fmt.Sprintf("%s?token=%s", testCase.url, accessToken.Token) | |||
// Request the endpoint. Verify that permission is denied. | |||
req := NewRequestf(t, testCase.method, url) | |||
req := NewRequest(t, testCase.method, testCase.url). | |||
AddTokenAuth(accessToken.Token) | |||
MakeRequest(t, req, http.StatusForbidden) | |||
}) | |||
} | |||
@@ -552,9 +547,8 @@ func createAPIAccessTokenWithoutCleanUp(t *testing.T, tokenName string, user *us | |||
} | |||
} | |||
log.Debug("Requesting creation of token with scopes: %v", scopes) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/users/"+user.LoginName+"/tokens", payload) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/users/"+user.LoginName+"/tokens", payload). | |||
AddBasicAuth(user.Name) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var newAccessToken api.AccessToken | |||
@@ -572,8 +566,8 @@ func createAPIAccessTokenWithoutCleanUp(t *testing.T, tokenName string, user *us | |||
// createAPIAccessTokenWithoutCleanUp Delete an API access token and assert that | |||
// deletion succeeded. | |||
func deleteAPIAccessToken(t *testing.T, accessToken api.AccessToken, user *user_model.User) { | |||
req := NewRequestf(t, "DELETE", "/api/v1/users/"+user.LoginName+"/tokens/%d", accessToken.ID) | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequestf(t, "DELETE", "/api/v1/users/"+user.LoginName+"/tokens/%d", accessToken.ID). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
unittest.AssertNotExistsBean(t, &auth_model.AccessToken{ID: accessToken.ID}) |
@@ -23,8 +23,8 @@ func TestAPITwoFactor(t *testing.T) { | |||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 16}) | |||
req := NewRequestf(t, "GET", "/api/v1/user") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req := NewRequest(t, "GET", "/api/v1/user"). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusOK) | |||
otpKey, err := totp.Generate(totp.GenerateOpts{ | |||
@@ -41,15 +41,15 @@ func TestAPITwoFactor(t *testing.T) { | |||
assert.NoError(t, auth_model.NewTwoFactor(db.DefaultContext, tfa)) | |||
req = NewRequestf(t, "GET", "/api/v1/user") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", "/api/v1/user"). | |||
AddBasicAuth(user.Name) | |||
MakeRequest(t, req, http.StatusUnauthorized) | |||
passcode, err := totp.GenerateCode(otpKey.Secret(), time.Now()) | |||
assert.NoError(t, err) | |||
req = NewRequestf(t, "GET", "/api/v1/user") | |||
req = AddBasicAuthHeader(req, user.Name) | |||
req = NewRequest(t, "GET", "/api/v1/user"). | |||
AddBasicAuth(user.Name) | |||
req.Header.Set("X-Gitea-OTP", passcode) | |||
MakeRequest(t, req, http.StatusOK) | |||
} |
@@ -35,14 +35,16 @@ func TestAPIUpdateUserAvatar(t *testing.T) { | |||
Image: base64.StdEncoding.EncodeToString(avatar), | |||
} | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/avatar?token="+token, &opts) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/avatar", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
opts = api.UpdateUserAvatarOption{ | |||
Image: "Invalid", | |||
} | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/user/avatar?token="+token, &opts) | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/user/avatar", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
// Test what happens if you use a file that is not an image | |||
@@ -56,7 +58,8 @@ func TestAPIUpdateUserAvatar(t *testing.T) { | |||
Image: base64.StdEncoding.EncodeToString(text), | |||
} | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/user/avatar?token="+token, &opts) | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/user/avatar", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusInternalServerError) | |||
} | |||
@@ -67,6 +70,7 @@ func TestAPIDeleteUserAvatar(t *testing.T) { | |||
session := loginUser(t, normalUsername) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser) | |||
req := NewRequest(t, "DELETE", "/api/v1/user/avatar?token="+token) | |||
req := NewRequest(t, "DELETE", "/api/v1/user/avatar"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
} |
@@ -21,7 +21,8 @@ func TestAPIListEmails(t *testing.T) { | |||
session := loginUser(t, normalUsername) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser) | |||
req := NewRequest(t, "GET", "/api/v1/user/emails?token="+token) | |||
req := NewRequest(t, "GET", "/api/v1/user/emails"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var emails []*api.Email | |||
@@ -52,13 +53,15 @@ func TestAPIAddEmail(t *testing.T) { | |||
Emails: []string{"user101@example.com"}, | |||
} | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/emails?token="+token, &opts) | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/user/emails", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
opts = api.CreateEmailOption{ | |||
Emails: []string{"user2-3@example.com"}, | |||
} | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/user/emails?token="+token, &opts) | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/user/emails", &opts). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var emails []*api.Email | |||
@@ -74,7 +77,8 @@ func TestAPIAddEmail(t *testing.T) { | |||
opts = api.CreateEmailOption{ | |||
Emails: []string{"notAEmail"}, | |||
} | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/user/emails?token="+token, &opts) | |||
req = NewRequestWithJSON(t, "POST", "/api/v1/user/emails", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusUnprocessableEntity) | |||
} | |||
@@ -88,16 +92,19 @@ func TestAPIDeleteEmail(t *testing.T) { | |||
opts := api.DeleteEmailOption{ | |||
Emails: []string{"user2-3@example.com"}, | |||
} | |||
req := NewRequestWithJSON(t, "DELETE", "/api/v1/user/emails?token="+token, &opts) | |||
req := NewRequestWithJSON(t, "DELETE", "/api/v1/user/emails", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
opts = api.DeleteEmailOption{ | |||
Emails: []string{"user2-2@example.com"}, | |||
} | |||
req = NewRequestWithJSON(t, "DELETE", "/api/v1/user/emails?token="+token, &opts) | |||
req = NewRequestWithJSON(t, "DELETE", "/api/v1/user/emails", &opts). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "GET", "/api/v1/user/emails?token="+token) | |||
req = NewRequest(t, "GET", "/api/v1/user/emails"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var emails []*api.Email |
@@ -30,14 +30,16 @@ 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?token=%s", user1, token2)) | |||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/following/%s", user1)). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
t.Run("ListFollowing", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/following?token=%s", user2, token2)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/following", user2)). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var users []api.User | |||
@@ -49,7 +51,8 @@ func TestAPIFollow(t *testing.T) { | |||
t.Run("ListMyFollowing", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/following?token=%s", token2)) | |||
req := NewRequest(t, "GET", "/api/v1/user/following"). | |||
AddTokenAuth(token2) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var users []api.User | |||
@@ -61,7 +64,8 @@ func TestAPIFollow(t *testing.T) { | |||
t.Run("ListFollowers", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/followers?token=%s", user1, token1)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/followers", user1)). | |||
AddTokenAuth(token1) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var users []api.User | |||
@@ -73,7 +77,8 @@ func TestAPIFollow(t *testing.T) { | |||
t.Run("ListMyFollowers", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/followers?token=%s", token1)) | |||
req := NewRequest(t, "GET", "/api/v1/user/followers"). | |||
AddTokenAuth(token1) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var users []api.User | |||
@@ -85,27 +90,32 @@ func TestAPIFollow(t *testing.T) { | |||
t.Run("CheckFollowing", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/following/%s?token=%s", user2, user1, token2)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/following/%s", user2, user1)). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/following/%s?token=%s", user1, user2, token2)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/following/%s", user1, user2)). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
t.Run("CheckMyFollowing", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/following/%s?token=%s", user1, token2)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/following/%s", user1)). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/following/%s?token=%s", user2, token1)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/following/%s", user2)). | |||
AddTokenAuth(token1) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
t.Run("Unfollow", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/following/%s?token=%s", user1, token2)) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/following/%s", user1)). | |||
AddTokenAuth(token2) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
} |
@@ -27,8 +27,8 @@ func TestUserHeatmap(t *testing.T) { | |||
timeutil.Set(fakeNow) | |||
defer timeutil.Unset() | |||
urlStr := fmt.Sprintf("/api/v1/users/%s/heatmap?token=%s", normalUsername, token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/heatmap", normalUsername)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var heatmap []*activities_model.UserHeatmapData | |||
DecodeJSON(t, resp, &heatmap) |
@@ -31,7 +31,8 @@ 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?token=%s", user2, token)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s", user2)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var u api.User | |||
@@ -48,7 +49,8 @@ func TestAPIUserInfo(t *testing.T) { | |||
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?token=%s", org3.Name, token)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s", org3.Name)). | |||
AddTokenAuth(token) | |||
resp = MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &u) | |||
assert.Equal(t, org3.GetEmail(), u.Email) | |||
@@ -57,7 +59,8 @@ func TestAPIUserInfo(t *testing.T) { | |||
t.Run("GetAuthenticatedUser", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user?token=%s", token)) | |||
req := NewRequest(t, "GET", "/api/v1/user"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var u api.User |
@@ -35,7 +35,8 @@ func sampleTest(t *testing.T, auoptc apiUserOrgPermTestCase) { | |||
session := loginUser(t, auoptc.LoginUser) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadOrganization, auth_model.AccessTokenScopeReadUser) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/orgs/%s/permissions?token=%s", auoptc.User, auoptc.Organization, token)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/orgs/%s/permissions", auoptc.User, auoptc.Organization)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var apiOP api.OrganizationPermissions | |||
@@ -128,7 +129,8 @@ func TestUnknowUser(t *testing.T) { | |||
session := loginUser(t, "user1") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser, auth_model.AccessTokenScopeReadOrganization) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/unknow/orgs/org25/permissions?token=%s", token)) | |||
req := NewRequest(t, "GET", "/api/v1/users/unknow/orgs/org25/permissions"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusNotFound) | |||
var apiError api.APIError | |||
@@ -142,7 +144,8 @@ func TestUnknowOrganization(t *testing.T) { | |||
session := loginUser(t, "user1") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser, auth_model.AccessTokenScopeReadOrganization) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/user1/orgs/unknow/permissions?token=%s", token)) | |||
req := NewRequest(t, "GET", "/api/v1/users/user1/orgs/unknow/permissions"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusNotFound) | |||
var apiError api.APIError | |||
DecodeJSON(t, resp, &apiError) |
@@ -74,8 +74,8 @@ func getUserOrgs(t *testing.T, userDoer, userCheck string) (orgs []*api.Organiza | |||
if len(userDoer) != 0 { | |||
token = getUserToken(t, userDoer, auth_model.AccessTokenScopeReadOrganization, auth_model.AccessTokenScopeReadUser) | |||
} | |||
urlStr := fmt.Sprintf("/api/v1/users/%s/orgs?token=%s", userCheck, token) | |||
req := NewRequest(t, "GET", urlStr) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/orgs", userCheck)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &orgs) | |||
return orgs | |||
@@ -95,7 +95,8 @@ func TestMyOrgs(t *testing.T) { | |||
normalUsername := "user2" | |||
token := getUserToken(t, normalUsername, auth_model.AccessTokenScopeReadOrganization, auth_model.AccessTokenScopeReadUser) | |||
req = NewRequest(t, "GET", "/api/v1/user/orgs?token="+token) | |||
req = NewRequest(t, "GET", "/api/v1/user/orgs"). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var orgs []*api.Organization | |||
DecodeJSON(t, resp, &orgs) |
@@ -27,7 +27,8 @@ func TestAPIUserSearchLoggedIn(t *testing.T) { | |||
session := loginUser(t, adminUsername) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser) | |||
query := "user2" | |||
req := NewRequestf(t, "GET", "/api/v1/users/search?token=%s&q=%s", token, query) | |||
req := NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var results SearchResults | |||
@@ -84,8 +85,8 @@ func TestAPIUserSearchAdminLoggedInUserHidden(t *testing.T) { | |||
session := loginUser(t, adminUsername) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser) | |||
query := "user31" | |||
req := NewRequestf(t, "GET", "/api/v1/users/search?token=%s&q=%s", token, query) | |||
req.SetBasicAuth(token, "x-oauth-basic") | |||
req := NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
var results SearchResults |
@@ -55,44 +55,47 @@ func TestAPIUserSecrets(t *testing.T) { | |||
} | |||
for _, c := range cases { | |||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/user/actions/secrets/%s?token=%s", c.Name, token), api.CreateOrUpdateSecretOption{ | |||
req := NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/user/actions/secrets/%s", c.Name), api.CreateOrUpdateSecretOption{ | |||
Data: "data", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, c.ExpectedStatus) | |||
} | |||
}) | |||
t.Run("Update", func(t *testing.T) { | |||
name := "update_secret" | |||
url := fmt.Sprintf("/api/v1/user/actions/secrets/%s?token=%s", name, token) | |||
url := fmt.Sprintf("/api/v1/user/actions/secrets/%s", name) | |||
req := NewRequestWithJSON(t, "PUT", url, api.CreateOrUpdateSecretOption{ | |||
Data: "initial", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequestWithJSON(t, "PUT", url, api.CreateOrUpdateSecretOption{ | |||
Data: "changed", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
t.Run("Delete", func(t *testing.T) { | |||
name := "delete_secret" | |||
url := fmt.Sprintf("/api/v1/user/actions/secrets/%s?token=%s", name, token) | |||
url := fmt.Sprintf("/api/v1/user/actions/secrets/%s", name) | |||
req := NewRequestWithJSON(t, "PUT", url, api.CreateOrUpdateSecretOption{ | |||
Data: "initial", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
req = NewRequest(t, "DELETE", url) | |||
req = NewRequest(t, "DELETE", url). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "DELETE", url) | |||
req = NewRequest(t, "DELETE", url). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/actions/secrets/000?token=%s", token)) | |||
req = NewRequest(t, "DELETE", "/api/v1/user/actions/secrets/000"). | |||
AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusBadRequest) | |||
}) | |||
} |
@@ -28,14 +28,16 @@ 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?token=%s", repo, tokenWithUserScope)) | |||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/starred/%s", repo)). | |||
AddTokenAuth(tokenWithUserScope) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
t.Run("GetStarredRepos", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/starred?token=%s", user, token)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/starred", user)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "1", resp.Header().Get("X-Total-Count")) | |||
@@ -49,7 +51,8 @@ func TestAPIStar(t *testing.T) { | |||
t.Run("GetMyStarredRepos", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred?token=%s", tokenWithUserScope)) | |||
req := NewRequest(t, "GET", "/api/v1/user/starred"). | |||
AddTokenAuth(tokenWithUserScope) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "1", resp.Header().Get("X-Total-Count")) | |||
@@ -63,17 +66,20 @@ 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?token=%s", repo, tokenWithUserScope)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred/%s", repo)). | |||
AddTokenAuth(tokenWithUserScope) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred/%s?token=%s", repo+"notexisting", tokenWithUserScope)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred/%s", repo+"notexisting")). | |||
AddTokenAuth(tokenWithUserScope) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
t.Run("Unstar", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/starred/%s?token=%s", repo, tokenWithUserScope)) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/starred/%s", repo)). | |||
AddTokenAuth(tokenWithUserScope) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
} |
@@ -28,14 +28,16 @@ func TestAPIWatch(t *testing.T) { | |||
t.Run("Watch", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/subscription?token=%s", repo, tokenWithRepoScope)) | |||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/subscription", repo)). | |||
AddTokenAuth(tokenWithRepoScope) | |||
MakeRequest(t, req, http.StatusOK) | |||
}) | |||
t.Run("GetWatchedRepos", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/subscriptions?token=%s", user, token)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/users/%s/subscriptions", user)). | |||
AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "1", resp.Header().Get("X-Total-Count")) | |||
@@ -49,7 +51,8 @@ func TestAPIWatch(t *testing.T) { | |||
t.Run("GetMyWatchedRepos", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/subscriptions?token=%s", tokenWithRepoScope)) | |||
req := NewRequest(t, "GET", "/api/v1/user/subscriptions"). | |||
AddTokenAuth(tokenWithRepoScope) | |||
resp := MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, "1", resp.Header().Get("X-Total-Count")) | |||
@@ -63,17 +66,20 @@ func TestAPIWatch(t *testing.T) { | |||
t.Run("IsWatching", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/subscription?token=%s", repo, tokenWithRepoScope)) | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/subscription", repo)). | |||
AddTokenAuth(tokenWithRepoScope) | |||
MakeRequest(t, req, http.StatusOK) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/subscription?token=%s", repo+"notexisting", tokenWithRepoScope)) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/subscription", repo+"notexisting")). | |||
AddTokenAuth(tokenWithRepoScope) | |||
MakeRequest(t, req, http.StatusNotFound) | |||
}) | |||
t.Run("Unwatch", func(t *testing.T) { | |||
defer tests.PrintCurrentTest(t)() | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/subscription?token=%s", repo, tokenWithRepoScope)) | |||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/subscription", repo)). | |||
AddTokenAuth(tokenWithRepoScope) | |||
MakeRequest(t, req, http.StatusNoContent) | |||
}) | |||
} |
@@ -182,13 +182,13 @@ func TestAPINewWikiPage(t *testing.T) { | |||
session := loginUser(t, username) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/wiki/new?token=%s", username, "repo1", token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/wiki/new", username, "repo1") | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateWikiPageOptions{ | |||
Title: title, | |||
ContentBase64: base64.StdEncoding.EncodeToString([]byte("Wiki page content for API unit tests")), | |||
Message: "", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusCreated) | |||
} | |||
} | |||
@@ -199,13 +199,13 @@ func TestAPIEditWikiPage(t *testing.T) { | |||
session := loginUser(t, username) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/wiki/page/Page-With-Spaced-Name?token=%s", username, "repo1", token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/wiki/page/Page-With-Spaced-Name", username, "repo1") | |||
req := NewRequestWithJSON(t, "PATCH", urlStr, &api.CreateWikiPageOptions{ | |||
Title: "edited title", | |||
ContentBase64: base64.StdEncoding.EncodeToString([]byte("Edited wiki page content for API unit tests")), | |||
Message: "", | |||
}) | |||
}).AddTokenAuth(token) | |||
MakeRequest(t, req, http.StatusOK) | |||
} | |||
@@ -14,7 +14,7 @@ import ( | |||
func TestCORSNotSet(t *testing.T) { | |||
defer tests.PrepareTestEnv(t)() | |||
req := NewRequestf(t, "GET", "/api/v1/version") | |||
req := NewRequest(t, "GET", "/api/v1/version") | |||
session := loginUser(t, "user2") | |||
resp := session.MakeRequest(t, req, http.StatusOK) | |||
assert.Equal(t, resp.Code, http.StatusOK) |
@@ -6,7 +6,6 @@ package integration | |||
import ( | |||
"bytes" | |||
"encoding/base64" | |||
"fmt" | |||
"io" | |||
"mime/multipart" | |||
"net/http" | |||
@@ -119,14 +118,13 @@ func TestEmptyRepoAddFileByAPI(t *testing.T) { | |||
session := loginUser(t, "user30") | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
url := fmt.Sprintf("/api/v1/repos/user30/empty/contents/new-file.txt?token=%s", token) | |||
req := NewRequestWithJSON(t, "POST", url, &api.CreateFileOptions{ | |||
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user30/empty/contents/new-file.txt", &api.CreateFileOptions{ | |||
FileOptions: api.FileOptions{ | |||
NewBranchName: "new_branch", | |||
Message: "init", | |||
}, | |||
ContentBase64: base64.StdEncoding.EncodeToString([]byte("newly-added-api-file")), | |||
}) | |||
}).AddTokenAuth(token) | |||
resp := MakeRequest(t, req, http.StatusCreated) | |||
var fileResponse api.FileResponse | |||
@@ -138,7 +136,8 @@ func TestEmptyRepoAddFileByAPI(t *testing.T) { | |||
resp = session.MakeRequest(t, req, http.StatusOK) | |||
assert.Contains(t, resp.Body.String(), "newly-added-api-file") | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/user30/empty?token=%s", token)) | |||
req = NewRequest(t, "GET", "/api/v1/repos/user30/empty"). | |||
AddTokenAuth(token) | |||
resp = session.MakeRequest(t, req, http.StatusOK) | |||
var apiRepo api.Repository | |||
DecodeJSON(t, resp, &apiRepo) |
@@ -65,17 +65,20 @@ func TestEventSourceManagerRun(t *testing.T) { | |||
var apiNL []api.NotificationThread | |||
// -- mark notifications as read -- | |||
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?status-types=unread&token=%s", token)) | |||
req := NewRequest(t, "GET", "/api/v1/notifications?status-types=unread"). | |||
AddTokenAuth(token) | |||
resp := session.MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiNL) | |||
assert.Len(t, apiNL, 2) | |||
lastReadAt := "2000-01-01T00%3A50%3A01%2B00%3A00" // 946687801 <- only Notification 4 is in this filter ... | |||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?last_read_at=%s&token=%s", user2.Name, repo1.Name, lastReadAt, token)) | |||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?last_read_at=%s", user2.Name, repo1.Name, lastReadAt)). | |||
AddTokenAuth(token) | |||
session.MakeRequest(t, req, http.StatusResetContent) | |||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?token=%s&status-types=unread", token)) | |||
req = NewRequest(t, "GET", "/api/v1/notifications?status-types=unread"). | |||
AddTokenAuth(token) | |||
resp = session.MakeRequest(t, req, http.StatusOK) | |||
DecodeJSON(t, resp, &apiNL) | |||
assert.Len(t, apiNL, 1) |
@@ -163,14 +163,15 @@ func (s *TestSession) GetCookie(name string) *http.Cookie { | |||
return nil | |||
} | |||
func (s *TestSession) MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *httptest.ResponseRecorder { | |||
func (s *TestSession) MakeRequest(t testing.TB, rw *RequestWrapper, expectedStatus int) *httptest.ResponseRecorder { | |||
t.Helper() | |||
req := rw.Request | |||
baseURL, err := url.Parse(setting.AppURL) | |||
assert.NoError(t, err) | |||
for _, c := range s.jar.Cookies(baseURL) { | |||
req.AddCookie(c) | |||
} | |||
resp := MakeRequest(t, req, expectedStatus) | |||
resp := MakeRequest(t, rw, expectedStatus) | |||
ch := http.Header{} | |||
ch.Add("Cookie", strings.Join(resp.Header()["Set-Cookie"], ";")) | |||
@@ -180,14 +181,15 @@ func (s *TestSession) MakeRequest(t testing.TB, req *http.Request, expectedStatu | |||
return resp | |||
} | |||
func (s *TestSession) MakeRequestNilResponseRecorder(t testing.TB, req *http.Request, expectedStatus int) *NilResponseRecorder { | |||
func (s *TestSession) MakeRequestNilResponseRecorder(t testing.TB, rw *RequestWrapper, expectedStatus int) *NilResponseRecorder { | |||
t.Helper() | |||
req := rw.Request | |||
baseURL, err := url.Parse(setting.AppURL) | |||
assert.NoError(t, err) | |||
for _, c := range s.jar.Cookies(baseURL) { | |||
req.AddCookie(c) | |||
} | |||
resp := MakeRequestNilResponseRecorder(t, req, expectedStatus) | |||
resp := MakeRequestNilResponseRecorder(t, rw, expectedStatus) | |||
ch := http.Header{} | |||
ch.Add("Cookie", strings.Join(resp.Header()["Set-Cookie"], ";")) | |||
@@ -197,14 +199,15 @@ func (s *TestSession) MakeRequestNilResponseRecorder(t testing.TB, req *http.Req | |||
return resp | |||
} | |||
func (s *TestSession) MakeRequestNilResponseHashSumRecorder(t testing.TB, req *http.Request, expectedStatus int) *NilResponseHashSumRecorder { | |||
func (s *TestSession) MakeRequestNilResponseHashSumRecorder(t testing.TB, rw *RequestWrapper, expectedStatus int) *NilResponseHashSumRecorder { | |||
t.Helper() | |||
req := rw.Request | |||
baseURL, err := url.Parse(setting.AppURL) | |||
assert.NoError(t, err) | |||
for _, c := range s.jar.Cookies(baseURL) { | |||
req.AddCookie(c) | |||
} | |||
resp := MakeRequestNilResponseHashSumRecorder(t, req, expectedStatus) | |||
resp := MakeRequestNilResponseHashSumRecorder(t, rw, expectedStatus) | |||
ch := http.Header{} | |||
ch.Add("Cookie", strings.Join(resp.Header()["Set-Cookie"], ";")) | |||
@@ -314,17 +317,42 @@ func getTokenForLoggedInUser(t testing.TB, session *TestSession, scopes ...auth. | |||
return token | |||
} | |||
func NewRequest(t testing.TB, method, urlStr string) *http.Request { | |||
type RequestWrapper struct { | |||
*http.Request | |||
} | |||
func (req *RequestWrapper) AddBasicAuth(username string) *RequestWrapper { | |||
req.Request.SetBasicAuth(username, userPassword) | |||
return req | |||
} | |||
func (req *RequestWrapper) AddTokenAuth(token string) *RequestWrapper { | |||
if token == "" { | |||
return req | |||
} | |||
if !strings.HasPrefix(token, "Bearer ") { | |||
token = "Bearer " + token | |||
} | |||
req.Request.Header.Set("Authorization", token) | |||
return req | |||
} | |||
func (req *RequestWrapper) SetHeader(name, value string) *RequestWrapper { | |||
req.Request.Header.Set(name, value) | |||
return req | |||
} | |||
func NewRequest(t testing.TB, method, urlStr string) *RequestWrapper { | |||
t.Helper() | |||
return NewRequestWithBody(t, method, urlStr, nil) | |||
} | |||
func NewRequestf(t testing.TB, method, urlFormat string, args ...any) *http.Request { | |||
func NewRequestf(t testing.TB, method, urlFormat string, args ...any) *RequestWrapper { | |||
t.Helper() | |||
return NewRequest(t, method, fmt.Sprintf(urlFormat, args...)) | |||
} | |||
func NewRequestWithValues(t testing.TB, method, urlStr string, values map[string]string) *http.Request { | |||
func NewRequestWithValues(t testing.TB, method, urlStr string, values map[string]string) *RequestWrapper { | |||
t.Helper() | |||
urlValues := url.Values{} | |||
for key, value := range values { | |||
@@ -333,43 +361,38 @@ func NewRequestWithValues(t testing.TB, method, urlStr string, values map[string | |||
return NewRequestWithURLValues(t, method, urlStr, urlValues) | |||
} | |||
func NewRequestWithURLValues(t testing.TB, method, urlStr string, urlValues url.Values) *http.Request { | |||
func NewRequestWithURLValues(t testing.TB, method, urlStr string, urlValues url.Values) *RequestWrapper { | |||
t.Helper() | |||
req := NewRequestWithBody(t, method, urlStr, bytes.NewBufferString(urlValues.Encode())) | |||
req.Header.Add("Content-Type", "application/x-www-form-urlencoded") | |||
return req | |||
return NewRequestWithBody(t, method, urlStr, bytes.NewBufferString(urlValues.Encode())). | |||
SetHeader("Content-Type", "application/x-www-form-urlencoded") | |||
} | |||
func NewRequestWithJSON(t testing.TB, method, urlStr string, v any) *http.Request { | |||
func NewRequestWithJSON(t testing.TB, method, urlStr string, v any) *RequestWrapper { | |||
t.Helper() | |||
jsonBytes, err := json.Marshal(v) | |||
assert.NoError(t, err) | |||
req := NewRequestWithBody(t, method, urlStr, bytes.NewBuffer(jsonBytes)) | |||
req.Header.Add("Content-Type", "application/json") | |||
return req | |||
return NewRequestWithBody(t, method, urlStr, bytes.NewBuffer(jsonBytes)). | |||
SetHeader("Content-Type", "application/json") | |||
} | |||
func NewRequestWithBody(t testing.TB, method, urlStr string, body io.Reader) *http.Request { | |||
func NewRequestWithBody(t testing.TB, method, urlStr string, body io.Reader) *RequestWrapper { | |||
t.Helper() | |||
if !strings.HasPrefix(urlStr, "http") && !strings.HasPrefix(urlStr, "/") { | |||
urlStr = "/" + urlStr | |||
} | |||
request, err := http.NewRequest(method, urlStr, body) | |||
req, err := http.NewRequest(method, urlStr, body) | |||
assert.NoError(t, err) | |||
request.RequestURI = urlStr | |||
return request | |||
} | |||
req.RequestURI = urlStr | |||
func AddBasicAuthHeader(request *http.Request, username string) *http.Request { | |||
request.SetBasicAuth(username, userPassword) | |||
return request | |||
return &RequestWrapper{req} | |||
} | |||
const NoExpectedStatus = -1 | |||
func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *httptest.ResponseRecorder { | |||
func MakeRequest(t testing.TB, rw *RequestWrapper, expectedStatus int) *httptest.ResponseRecorder { | |||
t.Helper() | |||
req := rw.Request | |||
recorder := httptest.NewRecorder() | |||
if req.RemoteAddr == "" { | |||
req.RemoteAddr = "test-mock:12345" | |||
@@ -383,8 +406,9 @@ func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *httptest. | |||
return recorder | |||
} | |||
func MakeRequestNilResponseRecorder(t testing.TB, req *http.Request, expectedStatus int) *NilResponseRecorder { | |||
func MakeRequestNilResponseRecorder(t testing.TB, rw *RequestWrapper, expectedStatus int) *NilResponseRecorder { | |||
t.Helper() | |||
req := rw.Request | |||
recorder := NewNilResponseRecorder() | |||
testWebRoutes.ServeHTTP(recorder, req) | |||
if expectedStatus != NoExpectedStatus { | |||
@@ -396,8 +420,9 @@ func MakeRequestNilResponseRecorder(t testing.TB, req *http.Request, expectedSta | |||
return recorder | |||
} | |||
func MakeRequestNilResponseHashSumRecorder(t testing.TB, req *http.Request, expectedStatus int) *NilResponseHashSumRecorder { | |||
func MakeRequestNilResponseHashSumRecorder(t testing.TB, rw *RequestWrapper, expectedStatus int) *NilResponseHashSumRecorder { | |||
t.Helper() | |||
req := rw.Request | |||
recorder := NewNilResponseHashSumRecorder() | |||
testWebRoutes.ServeHTTP(recorder, req) | |||
if expectedStatus != NoExpectedStatus { |
@@ -169,8 +169,8 @@ func TestOrgRestrictedUser(t *testing.T) { | |||
Units: []string{"repo.code"}, | |||
} | |||
req = NewRequestWithJSON(t, "POST", | |||
fmt.Sprintf("/api/v1/orgs/%s/teams?token=%s", orgName, token), teamToCreate) | |||
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", orgName), teamToCreate). | |||
AddTokenAuth(token) | |||
var apiTeam api.Team | |||
@@ -183,8 +183,8 @@ func TestOrgRestrictedUser(t *testing.T) { | |||
// teamID := apiTeam.ID | |||
// Now we need to add the restricted user to the team | |||
req = NewRequest(t, "PUT", | |||
fmt.Sprintf("/api/v1/teams/%d/members/%s?token=%s", apiTeam.ID, restrictedUser, token)) | |||
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/teams/%d/members/%s", apiTeam.ID, restrictedUser)). | |||
AddTokenAuth(token) | |||
_ = adminSession.MakeRequest(t, req, http.StatusNoContent) | |||
// Now we need to check if the restrictedUser can access the repo |
@@ -35,11 +35,11 @@ func testPrivateActivityDoSomethingForActionEntries(t *testing.T) { | |||
session := loginUser(t, privateActivityTestUser) | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues?state=all&token=%s", owner.Name, repoBefore.Name, token) | |||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues?state=all", owner.Name, repoBefore.Name) | |||
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateIssueOption{ | |||
Body: "test", | |||
Title: "test", | |||
}) | |||
}).AddTokenAuth(token) | |||
session.MakeRequest(t, req, http.StatusCreated) | |||
} | |||
@@ -127,7 +127,8 @@ func testPrivateActivityHelperHasHeatmapContentFromPublic(t *testing.T) bool { | |||
func testPrivateActivityHelperHasHeatmapContentFromSession(t *testing.T, session *TestSession) bool { | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser) | |||
req := NewRequestf(t, "GET", "/api/v1/users/%s/heatmap?token=%s", privateActivityTestUser, token) | |||
req := NewRequestf(t, "GET", "/api/v1/users/%s/heatmap", privateActivityTestUser). | |||
AddTokenAuth(token) | |||
resp := session.MakeRequest(t, req, http.StatusOK) | |||
var items []*activities_model.UserHeatmapData |
@@ -218,11 +218,11 @@ func TestCantMergeConflict(t *testing.T) { | |||
// Use API to create a conflicting pr | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", "user1", "repo1", token), &api.CreatePullRequestOption{ | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{ | |||
Head: "conflict", | |||
Base: "base", | |||
Title: "create a conflicting pr", | |||
}) | |||
}).AddTokenAuth(token) | |||
session.MakeRequest(t, req, http.StatusCreated) | |||
// Now this PR will be marked conflict - or at least a race will do - so drop down to pure code at this point... | |||
@@ -326,11 +326,11 @@ func TestCantMergeUnrelated(t *testing.T) { | |||
// Use API to create a conflicting pr | |||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls?token=%s", "user1", "repo1", token), &api.CreatePullRequestOption{ | |||
req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", "user1", "repo1"), &api.CreatePullRequestOption{ | |||
Head: "unrelated", | |||
Base: "base", | |||
Title: "create an unrelated pr", | |||
}) | |||
}).AddTokenAuth(token) | |||
session.MakeRequest(t, req, http.StatusCreated) | |||
// Now this PR could be marked conflict - or at least a race may occur - so drop down to pure code at this point... |
@@ -77,7 +77,7 @@ func TestPullCreate_CommitStatus(t *testing.T) { | |||
Context: "testci", | |||
})) | |||
req = NewRequestf(t, "GET", "/user1/repo1/pulls/1/commits") | |||
req = NewRequest(t, "GET", "/user1/repo1/pulls/1/commits") | |||
resp = session.MakeRequest(t, req, http.StatusOK) | |||
doc = NewHTMLParser(t, resp.Body) | |||
@@ -98,9 +98,9 @@ func doAPICreateCommitStatus(ctx APITestContext, commitID string, data api.Creat | |||
req := NewRequestWithJSON( | |||
t, | |||
http.MethodPost, | |||
fmt.Sprintf("/api/v1/repos/%s/%s/statuses/%s?token=%s", ctx.Username, ctx.Reponame, commitID, ctx.Token), | |||
fmt.Sprintf("/api/v1/repos/%s/%s/statuses/%s", ctx.Username, ctx.Reponame, commitID), | |||
data, | |||
) | |||
).AddTokenAuth(ctx.Token) | |||
if ctx.ExpectedCode != 0 { | |||
ctx.Session.MakeRequest(t, req, ctx.ExpectedCode) | |||
return |