fix: requestPackage includes fetchingRawManifest

This commit is contained in:
Zoltan Kochan
2018-05-30 01:12:51 +03:00
parent 778075db51
commit 4b8058d3c9
3 changed files with 8 additions and 5 deletions

View File

@@ -98,16 +98,17 @@ function requestPackage (
wantedDependency,
})
.then((packageResponseBody: object) => {
const fetchingManifest = packageResponseBody['manifest'] // tslint:disable-line
const fetchingRawManifest = !packageResponseBody['fetchingRawManifestInProgress'] // tslint:disable-line
? undefined
: limitedFetch(`${remotePrefix}/manifestResponse`, {
: limitedFetch(`${remotePrefix}/rawManifestResponse`, {
msgId,
})
delete packageResponseBody['fetchingRawManifestInProgress'] // tslint:disable-line
if (options.skipFetch) {
return {
body: packageResponseBody,
fetchingManifest,
fetchingRawManifest,
}
}
@@ -117,8 +118,8 @@ function requestPackage (
return {
body: packageResponseBody,
fetchingFiles,
fetchingManifest,
finishing: Promise.all([fetchingManifest, fetchingFiles]).then(() => undefined),
fetchingRawManifest,
finishing: Promise.all([fetchingRawManifest, fetchingFiles]).then(() => undefined),
}
})
}

View File

@@ -71,6 +71,7 @@ export default function (
const pkgResponse = await store.requestPackage(body.wantedDependency, body.options)
if (pkgResponse['fetchingRawManifest']) { // tslint:disable-line
rawManifestPromises[body.msgId] = pkgResponse['fetchingRawManifest'] // tslint:disable-line
pkgResponse.body['fetchingRawManifestInProgress'] = true // tslint:disable-line
}
if (pkgResponse['fetchingFiles']) { // tslint:disable-line
filesPromises[body.msgId] = pkgResponse['fetchingFiles'] // tslint:disable-line

View File

@@ -63,6 +63,7 @@ test('server', async t => {
}
)
t.equal((await response['fetchingRawManifest']).name, 'is-positive', 'responded with fetchingRawManifest')
t.equal(response.body.id, 'registry.npmjs.org/is-positive/1.0.0', 'responded with correct ID')
t.equal(response.body['manifest'].name, 'is-positive', 'responded with correct name in manifest')