ComputerSurge/shields
3
0
Fork 0
Code Pull Requests 1 Activity

Support [nuget myget] packages using SemVer 2 (#2098)

Browse Source 
Support NuGet packages using SemVer 2

Fixes #1044
This commit is contained in:
Sam Harwell
2018-09-20 14:18:30 -05:00
committed by chris48s
parent edab5385f8
commit ca69099389
3 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/myget/myget.tester.js
View File

@@ -57,7 +57,9 @@ t.create('total downloads (unexpected second response)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:mongodb.driver.core&prerelease=true')
.get(
'/query?q=packageid:mongodb.driver.core&prerelease=true&semVerLevel=2'
)
.reply(invalidJSON)
)
.expectJSON({ name: 'downloads', value: 'invalid' })
@@ -82,7 +84,9 @@ t.create('version (mocked, yellow badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:mongodb.driver.core&prerelease=true')
.get(
'/query?q=packageid:mongodb.driver.core&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonWithDash)
)
.expectJSON({
@@ -100,7 +104,9 @@ t.create('version (mocked, orange badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:mongodb.driver.core&prerelease=true')
.get(
'/query?q=packageid:mongodb.driver.core&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonFirstCharZero)
)
.expectJSON({
@@ -118,7 +124,9 @@ t.create('version (mocked, blue badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:mongodb.driver.core&prerelease=true')
.get(
'/query?q=packageid:mongodb.driver.core&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonFirstCharNotZero)
)
.expectJSON({
@@ -154,7 +162,9 @@ t.create('version (unexpected second response)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:mongodb.driver.core&prerelease=true')
.get(
'/query?q=packageid:mongodb.driver.core&prerelease=true&semVerLevel=2'
)
.reply(invalidJSON)
)
.expectJSON({ name: 'mongodb', value: 'invalid' })
@@ -179,7 +189,9 @@ t.create('version (pre) (mocked, yellow badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:mongodb.driver.core&prerelease=true')
.get(
'/query?q=packageid:mongodb.driver.core&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonWithDash)
)
.expectJSON({
@@ -197,7 +209,9 @@ t.create('version (pre) (mocked, orange badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:mongodb.driver.core&prerelease=true')
.get(
'/query?q=packageid:mongodb.driver.core&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonFirstCharZero)
)
.expectJSON({
@@ -215,7 +229,9 @@ t.create('version (pre) (mocked, blue badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:mongodb.driver.core&prerelease=true')
.get(
'/query?q=packageid:mongodb.driver.core&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonFirstCharNotZero)
)
.expectJSON({
@@ -251,7 +267,9 @@ t.create('version (pre) (unexpected second response)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:mongodb.driver.core&prerelease=true')
.get(
'/query?q=packageid:mongodb.driver.core&prerelease=true&semVerLevel=2'
)
.reply(invalidJSON)
)
.expectJSON({ name: 'mongodb', value: 'invalid' })

3
services/nuget/nuget.service.js
View File

@@ -182,7 +182,8 @@ function mapNugetFeed({ camp, cache }, pattern, offset, getInfo) {
searchQueryResources[randomEndpointIdx]['@id'] +
'?q=packageid:' +
encodeURIComponent(id.toLowerCase()) + // NuGet package id (lowercase)
'&prerelease=true' // Include prerelease versions?
'&prerelease=true' + // Include prerelease versions?
'&semVerLevel=2' // Include packages with SemVer 2 version numbers
request(reqUrl, (err, res, buffer) => {
if (err != null) {

36
services/nuget/nuget.tester.js
View File

@@ -57,7 +57,9 @@ t.create('total downloads (unexpected second response)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true')
.get(
'/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true&semVerLevel=2'
)
.reply(invalidJSON)
)
.expectJSON({ name: 'downloads', value: 'invalid' })
@@ -82,7 +84,9 @@ t.create('version (mocked, yellow badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true')
.get(
'/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonWithDash)
)
.expectJSON({
@@ -100,7 +104,9 @@ t.create('version (mocked, orange badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true')
.get(
'/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonFirstCharZero)
)
.expectJSON({
@@ -118,7 +124,9 @@ t.create('version (mocked, blue badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true')
.get(
'/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonFirstCharNotZero)
)
.expectJSON({
@@ -154,7 +162,9 @@ t.create('version (unexpected second response)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true')
.get(
'/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true&semVerLevel=2'
)
.reply(invalidJSON)
)
.expectJSON({ name: 'nuget', value: 'invalid' })
@@ -179,7 +189,9 @@ t.create('version (pre) (mocked, yellow badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true')
.get(
'/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonWithDash)
)
.expectJSON({
@@ -197,7 +209,9 @@ t.create('version (pre) (mocked, orange badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true')
.get(
'/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonFirstCharZero)
)
.expectJSON({
@@ -215,7 +229,9 @@ t.create('version (pre) (mocked, blue badge)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true')
.get(
'/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true&semVerLevel=2'
)
.reply(200, nuGetV3VersionJsonFirstCharNotZero)
)
.expectJSON({
@@ -251,7 +267,9 @@ t.create('version (pre) (unexpected second response)')
)
.intercept(nock =>
nock('https://api-v2v3search-0.nuget.org')
.get('/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true')
.get(
'/query?q=packageid:microsoft.aspnetcore.mvc&prerelease=true&semVerLevel=2'
)
.reply(invalidJSON)
)
.expectJSON({ name: 'nuget', value: 'invalid' })