diff --git a/fixtures/test.json b/fixtures/test.json index 740d0ce..105b624 100644 --- a/fixtures/test.json +++ b/fixtures/test.json @@ -15,6 +15,7 @@ "updates": "file:." }, "peerDependencies": { - "@babel/preset-env": "~6.0.0" + "@babel/preset-env": "~6.0.0", + "svgstore": "^1.0.0 || ^2.0.0" } } diff --git a/test.js b/test.js index 962d679..dd3346a 100644 --- a/test.js +++ b/test.js @@ -81,14 +81,14 @@ function makeTest(args, expected) { // Parse results, with custom validation for the dynamic "age" property for (const dependencyType of dependencyTypes) { - for (const [dependencyName, data] of Object.entries(expected[dependencyType] || {})) { - for (const [key, value] of Object.entries(data || {})) { - const resultValue = results[dependencyType][dependencyName][key]; + for (const [dependencyName, actual] of Object.entries(results[dependencyType] || {})) { + for (const [key, actualValue] of Object.entries(actual || {})) { + const expectedValue = expected[dependencyType][dependencyName][key]; if (key === "age") { - expect(resultValue).toBeInstanceOf(String); - expect(resultValue.length > 0).toBeTruthy(); + expect(typeof actualValue).toEqual("string"); + expect(actualValue.length > 0).toBeTruthy(); } else { - expect(resultValue).toEqual(value); + expect(expectedValue).toEqual(actualValue); } } } diff --git a/updates.js b/updates.js index c76ea06..80e1746 100755 --- a/updates.js +++ b/updates.js @@ -551,7 +551,8 @@ function findVersion(data, versions, {range, semvers, usePre, useRel, useGreates } function findNewVersion(data, opts) { - if (opts.range === "*") return "*"; + if (opts.range === "*") return null; // ignore wildcard + if (opts.range.includes("||")) return null; // ignore or-chains const versions = Object.keys(data.versions).filter(version => semver.valid(version)); const version = findVersion(data, versions, opts);