diff --git a/tests/lib/npm-pack-output.js b/tests/lib/npm-pack-output.js index 11a0e6c6c..8358e312f 100644 --- a/tests/lib/npm-pack-output.js +++ b/tests/lib/npm-pack-output.js @@ -3,19 +3,23 @@ function isPackEntry(value) { } function getNpmPackEntry(output, packageName) { + const matchesPackage = value => ( + isPackEntry(value) && value.name === packageName + ); + if (Array.isArray(output)) { - return output.find(isPackEntry); + return output.find(matchesPackage); } if (!isPackEntry(output)) { return undefined; } - if (isPackEntry(output[packageName])) { + if (matchesPackage(output[packageName])) { return output[packageName]; } - return Object.values(output).find(isPackEntry); + return Object.values(output).find(matchesPackage); } module.exports = { getNpmPackEntry }; diff --git a/tests/lib/npm-pack-output.test.js b/tests/lib/npm-pack-output.test.js index 81f9fefda..232fd5cbe 100644 --- a/tests/lib/npm-pack-output.test.js +++ b/tests/lib/npm-pack-output.test.js @@ -18,6 +18,7 @@ function test(name, fn) { test('reads the npm 11 array response', () => { const entry = getNpmPackEntry([ + { name: 'unrelated-package', filename: 'unrelated-package-1.0.0.tgz' }, { name: 'ecc-universal', filename: 'ecc-universal-2.2.0.tgz' }, ], 'ecc-universal'); @@ -35,10 +36,31 @@ test('reads the npm 12 package-keyed response', () => { assert.strictEqual(entry.filename, 'ecc-universal-2.2.0.tgz'); }); +test('finds a requested package in a generic object response', () => { + const entry = getNpmPackEntry({ + unrelated: { name: 'unrelated-package', filename: 'unrelated-package-1.0.0.tgz' }, + target: { name: 'ecc-universal', filename: 'ecc-universal-2.2.0.tgz' }, + }, 'ecc-universal'); + + assert.strictEqual(entry.filename, 'ecc-universal-2.2.0.tgz'); +}); + test('returns undefined for empty or malformed responses', () => { assert.strictEqual(getNpmPackEntry([], 'ecc-universal'), undefined); assert.strictEqual(getNpmPackEntry({}, 'ecc-universal'), undefined); assert.strictEqual(getNpmPackEntry(null, 'ecc-universal'), undefined); + assert.strictEqual( + getNpmPackEntry([ + { name: 'unrelated-package', filename: 'unrelated-package-1.0.0.tgz' }, + ], 'ecc-universal'), + undefined + ); + assert.strictEqual( + getNpmPackEntry({ + unrelated: { name: 'unrelated-package', filename: 'unrelated-package-1.0.0.tgz' }, + }, 'ecc-universal'), + undefined + ); }); console.log(`\nPassed: ${passed}`);