Use Project-URL
metadata field to get a PyPI package's homepage URL (#33089)
Resolves #33085.
This commit is contained in:
parent
68972a9947
commit
188e0ee8e4
3 changed files with 116 additions and 10 deletions
|
@ -32,15 +32,16 @@ func TestPackagePyPI(t *testing.T) {
|
|||
packageVersion := "1!1.0.1+r1234"
|
||||
packageAuthor := "KN4CK3R"
|
||||
packageDescription := "Test Description"
|
||||
projectURL := "https://example.com"
|
||||
|
||||
content := "test"
|
||||
hashSHA256 := "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
|
||||
|
||||
root := fmt.Sprintf("/api/packages/%s/pypi", user.Name)
|
||||
|
||||
uploadFile := func(t *testing.T, filename, content string, expectedStatus int) {
|
||||
body := &bytes.Buffer{}
|
||||
writer := multipart.NewWriter(body)
|
||||
createBasicMultipartFile := func(filename, packageName, content string) (body *bytes.Buffer, writer *multipart.Writer, closer func() error) {
|
||||
body = &bytes.Buffer{}
|
||||
writer = multipart.NewWriter(body)
|
||||
part, _ := writer.CreateFormFile("content", filename)
|
||||
_, _ = io.Copy(part, strings.NewReader(content))
|
||||
|
||||
|
@ -52,14 +53,27 @@ func TestPackagePyPI(t *testing.T) {
|
|||
writer.WriteField("sha256_digest", hashSHA256)
|
||||
writer.WriteField("requires_python", "3.6")
|
||||
|
||||
_ = writer.Close()
|
||||
return body, writer, writer.Close
|
||||
}
|
||||
|
||||
uploadHelper := func(t *testing.T, body *bytes.Buffer, contentType string, expectedStatus int) {
|
||||
req := NewRequestWithBody(t, "POST", root, body).
|
||||
SetHeader("Content-Type", writer.FormDataContentType()).
|
||||
SetHeader("Content-Type", contentType).
|
||||
AddBasicAuth(user.Name)
|
||||
MakeRequest(t, req, expectedStatus)
|
||||
}
|
||||
|
||||
uploadFile := func(t *testing.T, filename, content string, expectedStatus int) {
|
||||
body, writer, closeFunc := createBasicMultipartFile(filename, packageName, content)
|
||||
|
||||
writer.WriteField("project_urls", "DOCUMENTATION , https://readthedocs.org")
|
||||
writer.WriteField("project_urls", fmt.Sprintf("Home-page, %s", projectURL))
|
||||
|
||||
_ = closeFunc()
|
||||
|
||||
uploadHelper(t, body, writer.FormDataContentType(), expectedStatus)
|
||||
}
|
||||
|
||||
t.Run("Upload", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
|
@ -74,6 +88,7 @@ func TestPackagePyPI(t *testing.T) {
|
|||
assert.NoError(t, err)
|
||||
assert.Nil(t, pd.SemVer)
|
||||
assert.IsType(t, &pypi.Metadata{}, pd.Metadata)
|
||||
assert.Equal(t, projectURL, pd.Metadata.(*pypi.Metadata).ProjectURL)
|
||||
assert.Equal(t, packageName, pd.Package.Name)
|
||||
assert.Equal(t, packageVersion, pd.Version.Version)
|
||||
|
||||
|
@ -133,6 +148,48 @@ func TestPackagePyPI(t *testing.T) {
|
|||
uploadFile(t, "test.tar.gz", content, http.StatusConflict)
|
||||
})
|
||||
|
||||
t.Run("UploadUsingDeprecatedHomepageMetadata", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
pkgName := "homepage-package"
|
||||
body, writer, closeFunc := createBasicMultipartFile("test.whl", pkgName, content)
|
||||
|
||||
writer.WriteField("home_page", projectURL)
|
||||
|
||||
_ = closeFunc()
|
||||
|
||||
uploadHelper(t, body, writer.FormDataContentType(), http.StatusCreated)
|
||||
|
||||
pvs, err := packages.GetVersionsByPackageName(db.DefaultContext, user.ID, packages.TypePyPI, pkgName)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, pvs, 1)
|
||||
|
||||
pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0])
|
||||
assert.NoError(t, err)
|
||||
assert.IsType(t, &pypi.Metadata{}, pd.Metadata)
|
||||
assert.Equal(t, projectURL, pd.Metadata.(*pypi.Metadata).ProjectURL)
|
||||
})
|
||||
|
||||
t.Run("UploadWithoutAnyHomepageURLMetadata", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
pkgName := "no-project-url-or-homepage-package"
|
||||
body, writer, closeFunc := createBasicMultipartFile("test.whl", pkgName, content)
|
||||
|
||||
_ = closeFunc()
|
||||
|
||||
uploadHelper(t, body, writer.FormDataContentType(), http.StatusCreated)
|
||||
|
||||
pvs, err := packages.GetVersionsByPackageName(db.DefaultContext, user.ID, packages.TypePyPI, pkgName)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, pvs, 1)
|
||||
|
||||
pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0])
|
||||
assert.NoError(t, err)
|
||||
assert.IsType(t, &pypi.Metadata{}, pd.Metadata)
|
||||
assert.Empty(t, pd.Metadata.(*pypi.Metadata).ProjectURL)
|
||||
})
|
||||
|
||||
t.Run("Download", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
|
@ -147,7 +204,7 @@ func TestPackagePyPI(t *testing.T) {
|
|||
downloadFile("test.whl")
|
||||
downloadFile("test.tar.gz")
|
||||
|
||||
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypePyPI)
|
||||
pvs, err := packages.GetVersionsByPackageName(db.DefaultContext, user.ID, packages.TypePyPI, packageName)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, pvs, 1)
|
||||
assert.Equal(t, int64(2), pvs[0].DownloadCount)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue