From 119a984223c655c05a62c42e66b27ce5d6b44c05 Mon Sep 17 00:00:00 2001 From: imgurbot12 Date: Wed, 5 Nov 2025 19:12:25 -0700 Subject: [PATCH] chore: renamed endpoint, and added unit-tests --- routers/api/packages/api.go | 2 +- routers/api/packages/generic/generic.go | 4 +-- .../integration/api_packages_generic_test.go | 31 +++++++++++++++++++ tests/integration/api_packages_test.go | 12 ++++++- 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index bea5c385e1..2b9ccb295d 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -336,7 +336,7 @@ func CommonRoutes() *web.Router { }) }, reqPackageAccess(perm.AccessModeRead)) r.Group("/generic", func() { - r.Get("/{packagename}/list", generic.EnumeratePackageVersions) + r.Get("/{packagename}/list", generic.ListPackageVersions) r.Group("/{packagename}/{packageversion}", func() { r.Delete("", reqPackageAccess(perm.AccessModeWrite), generic.DeletePackage) r.Group("/{filename}", func() { diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go index a410dfda51..6655e3beac 100644 --- a/routers/api/packages/generic/generic.go +++ b/routers/api/packages/generic/generic.go @@ -49,8 +49,8 @@ func apiError(ctx *context.Context, status int, obj any) { ctx.PlainText(status, message) } -// EnumeratePackageVersions lists upload versions and their associated files -func EnumeratePackageVersions(ctx *context.Context) { +// ListPackageVersions lists upload versions and their associated files +func ListPackageVersions(ctx *context.Context) { pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeGeneric, ctx.PathParam("packagename")) if err != nil { apiError(ctx, http.StatusInternalServerError, err) diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go index ae0506d48b..fb3dbb2aea 100644 --- a/tests/integration/api_packages_generic_test.go +++ b/tests/integration/api_packages_generic_test.go @@ -5,6 +5,7 @@ package integration import ( "bytes" + "encoding/json" "fmt" "io" "net/http" @@ -15,6 +16,8 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/test" + "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/routers/api/packages/generic" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -30,7 +33,9 @@ func TestPackageGeneric(t *testing.T) { filename := "fi-le_na.me" content := []byte{1, 2, 3} + timestamp := timeutil.TimeStampNow().AsTime().Unix() url := fmt.Sprintf("/api/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion) + listUrl := fmt.Sprintf("/api/packages/%s/generic/%s/list", user.Name, packageName) t.Run("Upload", func(t *testing.T) { defer tests.PrintCurrentTest(t)() @@ -98,6 +103,32 @@ func TestPackageGeneric(t *testing.T) { }) }) + t.Run("List", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", listUrl) + resp := MakeRequest(t, req, http.StatusOK) + + var expected []generic.PackageInfo + err := json.Unmarshal(resp.Body.Bytes(), &expected) + assert.NoError(t, err) + + assert.Equal(t, len(expected), 1) + assert.Equal(t, len(expected[0].Files), 2) + + resPkg := expected[0] + assert.Equal(t, resPkg.Version, packageVersion) + assert.Equal(t, resPkg.DownloadCount, int64(0)) + + resFile1 := expected[0].Files[0] + assert.Equal(t, resFile1.Name, filename) + assert.GreaterOrEqual(t, resFile1.CreatedUnix, timestamp) + + resFile2 := expected[0].Files[1] + assert.Equal(t, resFile2.Name, "dummy.bin") + assert.GreaterOrEqual(t, resFile2.CreatedUnix, timestamp) + }) + t.Run("Download", func(t *testing.T) { defer tests.PrintCurrentTest(t)() diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index 4fbb31b11f..0f40865522 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -249,6 +249,15 @@ func TestPackageAccess(t *testing.T) { MakeRequest(t, req, expectedStatus) } + listPackage := func(doer, owner *user_model.User, expectedStatus int) { + url := fmt.Sprintf("/api/packages/%s/generic/test-package/list", owner.Name) + req := NewRequest(t, "GET", url) + if doer != nil { + req.AddBasicAuth(doer.Name) + } + MakeRequest(t, req, expectedStatus) + } + type Target struct { Owner *user_model.User ExpectedStatus int @@ -339,7 +348,7 @@ func TestPackageAccess(t *testing.T) { } }) - t.Run("Download", func(t *testing.T) { + t.Run("List/Download", func(t *testing.T) { defer tests.PrintCurrentTest(t)() cases := []struct { @@ -416,6 +425,7 @@ func TestPackageAccess(t *testing.T) { for _, c := range cases { for _, target := range c.Targets { downloadPackage(c.Doer, target.Owner, target.ExpectedStatus) + listPackage(c.Doer, target.Owner, target.ExpectedStatus) } } })