This commit is contained in:
@@ -12,17 +12,17 @@ import (
|
||||
neturl "net/url"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models/packages"
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
"code.gitea.io/gitea/models/unittest"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
"code.gitea.io/gitea/modules/gitrepo"
|
||||
"code.gitea.io/gitea/modules/json"
|
||||
cargo_module "code.gitea.io/gitea/modules/packages/cargo"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
cargo_router "code.gitea.io/gitea/routers/api/packages/cargo"
|
||||
cargo_service "code.gitea.io/gitea/services/packages/cargo"
|
||||
"code.gitea.io/gitea/tests"
|
||||
"gitea.dev/models/packages"
|
||||
repo_model "gitea.dev/models/repo"
|
||||
"gitea.dev/models/unittest"
|
||||
user_model "gitea.dev/models/user"
|
||||
"gitea.dev/modules/gitrepo"
|
||||
"gitea.dev/modules/json"
|
||||
cargo_module "gitea.dev/modules/packages/cargo"
|
||||
"gitea.dev/modules/setting"
|
||||
cargo_router "gitea.dev/routers/api/packages/cargo"
|
||||
cargo_service "gitea.dev/services/packages/cargo"
|
||||
"gitea.dev/tests"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
@@ -134,8 +134,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
var status cargo_router.StatusResponse
|
||||
DecodeJSON(t, resp, &status)
|
||||
status := DecodeJSON(t, resp, &cargo_router.StatusResponse{})
|
||||
assert.False(t, status.OK)
|
||||
|
||||
content = createPackage("test", "-1.0.0")
|
||||
@@ -144,7 +143,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
||||
AddBasicAuth(user.Name)
|
||||
resp = MakeRequest(t, req, http.StatusBadRequest)
|
||||
|
||||
DecodeJSON(t, resp, &status)
|
||||
status = DecodeJSON(t, resp, &cargo_router.StatusResponse{})
|
||||
assert.False(t, status.OK)
|
||||
})
|
||||
|
||||
@@ -174,8 +173,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var status cargo_router.StatusResponse
|
||||
DecodeJSON(t, resp, &status)
|
||||
status := DecodeJSON(t, resp, &cargo_router.StatusResponse{})
|
||||
assert.True(t, status.OK)
|
||||
|
||||
pvs, err := packages.GetVersionsByPackageType(t.Context(), user.ID, packages.TypeCargo)
|
||||
@@ -320,8 +318,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var result cargo_router.SearchResult
|
||||
DecodeJSON(t, resp, &result)
|
||||
result := DecodeJSON(t, resp, &cargo_router.SearchResult{})
|
||||
|
||||
assert.Equal(t, c.ExpectedTotal, result.Meta.Total, "case %d: unexpected total hits", i)
|
||||
assert.Len(t, result.Crates, c.ExpectedResults, "case %d: unexpected result count", i)
|
||||
@@ -335,8 +332,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var status cargo_router.StatusResponse
|
||||
DecodeJSON(t, resp, &status)
|
||||
status := DecodeJSON(t, resp, &cargo_router.StatusResponse{})
|
||||
assert.True(t, status.OK)
|
||||
|
||||
content := readGitContent(t, cargo_service.BuildPackagePath(packageName))
|
||||
@@ -355,8 +351,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
||||
AddBasicAuth(user.Name)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var status cargo_router.StatusResponse
|
||||
DecodeJSON(t, resp, &status)
|
||||
status := DecodeJSON(t, resp, &cargo_router.StatusResponse{})
|
||||
assert.True(t, status.OK)
|
||||
|
||||
content := readGitContent(t, cargo_service.BuildPackagePath(packageName))
|
||||
@@ -374,8 +369,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
||||
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/owners", url, neturl.PathEscape(packageName)))
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
var owners cargo_router.Owners
|
||||
DecodeJSON(t, resp, &owners)
|
||||
owners := DecodeJSON(t, resp, &cargo_router.Owners{})
|
||||
|
||||
assert.Len(t, owners.Users, 1)
|
||||
assert.Equal(t, user.ID, owners.Users[0].ID)
|
||||
|
||||
Reference in New Issue
Block a user