neuron-technologies/gitea
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests/integration: simplify code (#37249)

Browse Source 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Claude (Opus 4.7) <noreply@anthropic.com>
This commit is contained in:
Copilot
2026-04-17 20:33:49 +08:00
committed by GitHub
parent dc974715e9
commit eb334e3738
23 changed files with 168 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/api_packages_swift_test.go
+8 -33
View File
@@ -4,7 +4,6 @@
package integration
import (
"archive/zip"
"bytes"
"fmt"
"io"
@@ -18,6 +17,7 @@ import (
user_model "code.gitea.io/gitea/models/user"
swift_module "code.gitea.io/gitea/modules/packages/swift"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/test"
swift_router "code.gitea.io/gitea/routers/api/packages/swift"
"code.gitea.io/gitea/tests"
@@ -113,17 +113,6 @@ func TestPackageSwift(t *testing.T) {
MakeRequest(t, req, expectedStatus)
}
createArchive := func(files map[string]string) *bytes.Buffer {
var buf bytes.Buffer
zw := zip.NewWriter(&buf)
for filename, content := range files {
w, _ := zw.Create(filename)
w.Write([]byte(content))
}
zw.Close()
return &buf
}
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{})).
AddBasicAuth(user.Name)
@@ -142,7 +131,7 @@ func TestPackageSwift(t *testing.T) {
t,
uploadURL,
http.StatusCreated,
createArchive(map[string]string{
test.WriteZipArchive(map[string]string{
"Package.swift": contentManifest1,
"Package@swift-5.6.swift": contentManifest2,
}),
@@ -177,7 +166,7 @@ func TestPackageSwift(t *testing.T) {
t,
uploadURL,
http.StatusConflict,
createArchive(map[string]string{
test.WriteZipArchive(map[string]string{
"Package.swift": contentManifest1,
}),
"",
@@ -209,17 +198,6 @@ func TestPackageSwift(t *testing.T) {
MakeRequest(t, req, expectedStatus)
}
createArchive := func(files map[string]string) *bytes.Buffer {
var buf bytes.Buffer
zw := zip.NewWriter(&buf)
for filename, content := range files {
w, _ := zw.Create(filename)
w.Write([]byte(content))
}
zw.Close()
return &buf
}
uploadURL := fmt.Sprintf("%s/%s/%s/%s", url, packageScope, packageName, packageVersion2)
req := NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader([]byte{}))
@@ -230,7 +208,7 @@ func TestPackageSwift(t *testing.T) {
t,
uploadURL,
http.StatusCreated,
createArchive(map[string]string{
test.WriteZipArchive(map[string]string{
"Package.swift": contentManifest1,
"Package@swift-5.6.swift": contentManifest2,
}),
@@ -265,7 +243,7 @@ func TestPackageSwift(t *testing.T) {
t,
uploadURL,
http.StatusConflict,
createArchive(map[string]string{
test.WriteZipArchive(map[string]string{
"Package.swift": contentManifest1,
}),
"",
@@ -307,8 +285,7 @@ func TestPackageSwift(t *testing.T) {
body := resp.Body.String()
var result *swift_router.EnumeratePackageVersionsResponse
DecodeJSON(t, resp, &result)
result := DecodeJSON(t, resp, &swift_router.EnumeratePackageVersionsResponse{})
assert.Len(t, result.Releases, 2)
assert.Contains(t, result.Releases, packageVersion2)
@@ -333,8 +310,7 @@ func TestPackageSwift(t *testing.T) {
body := resp.Body.String()
var result *swift_router.PackageVersionMetadataResponse
DecodeJSON(t, resp, &result)
result := DecodeJSON(t, resp, &swift_router.PackageVersionMetadataResponse{})
pv, err := packages.GetVersionByNameAndVersion(t.Context(), user.ID, packages.TypeSwift, packageID, packageVersion)
assert.NotNil(t, pv)
@@ -425,8 +401,7 @@ func TestPackageSwift(t *testing.T) {
SetHeader("Accept", swift_router.AcceptJSON)
resp = MakeRequest(t, req, http.StatusOK)
var result *swift_router.LookupPackageIdentifiersResponse
DecodeJSON(t, resp, &result)
result := DecodeJSON(t, resp, &swift_router.LookupPackageIdentifiersResponse{})
assert.Len(t, result.Identifiers, 1)
assert.Equal(t, packageID, result.Identifiers[0])