diff --git a/npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater_spec.rb b/npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater_spec.rb index ab92563ca85..9aa36f59f23 100644 --- a/npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater_spec.rb +++ b/npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater_spec.rb @@ -505,9 +505,9 @@ subject { JSON.parse(updated_npm_lock_content) } let(:files) { project_dependency_files("npm6/ghpr_no_hash_pinning") } - let(:dependency_name) { "discord.js" } + let(:dependency_name) { "npm6-dependency" } let(:version) { "HEAD" } - let(:previous_version) { "ab82cafcde0ee259a32ef14303c1b4a64dea8fae" } + let(:previous_version) { "5d1be9ff4e12eb17c04591bba13aad6d71c86a1b" } let(:requirements) do [{ file: "package.json", @@ -515,7 +515,7 @@ groups: ["dependencies"], source: { type: "git", - url: "https://github.com/discordjs/discord.js", + url: "https://github.com/dependabot-fixtures/npm6-dependency", branch: nil, ref: "master" } @@ -528,7 +528,7 @@ groups: ["dependencies"], source: { type: "git", - url: "https://github.com/discordjs/discord.js", + url: "https://github.com/dependabot-fixtures/npm6-dependency", branch: nil, ref: "master" } @@ -536,8 +536,9 @@ end it "pins the version to a hash and ensures that the `from` field matches the original constraint" do - expect(subject["dependencies"]["discord.js"]["version"]).to match(%r{github:discordjs/discord.js#[0-9a-z]{40}}) - expect(subject["dependencies"]["discord.js"]["from"]).to eq("github:discordjs/discord.js") + expect(subject["dependencies"]["npm6-dependency"]["version"]). + to match(%r{github:dependabot-fixtures/npm6-dependency#[0-9a-z]{40}}) + expect(subject["dependencies"]["npm6-dependency"]["from"]).to eq("github:dependabot-fixtures/npm6-dependency") end end end diff --git a/npm_and_yarn/spec/fixtures/projects/npm6/ghpr_no_hash_pinning/package-lock.json b/npm_and_yarn/spec/fixtures/projects/npm6/ghpr_no_hash_pinning/package-lock.json index 91312081172..08dcfa2476b 100644 --- a/npm_and_yarn/spec/fixtures/projects/npm6/ghpr_no_hash_pinning/package-lock.json +++ b/npm_and_yarn/spec/fixtures/projects/npm6/ghpr_no_hash_pinning/package-lock.json @@ -4,97 +4,9 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@discordjs/collection": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.6.tgz", - "integrity": "sha512-utRNxnd9kSS2qhyivo9lMlt5qgAUasH2gb7BEOn6p0efFh24gjGomHzWKMAPn2hEReOPQZCJaRKoURwRotKucQ==" - }, - "@discordjs/form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@discordjs/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-ZfFsbgEXW71Rw/6EtBdrP5VxBJy4dthyC0tpQKGKmYFImlmmrykO14Za+BiIVduwjte0jXEBlhSKf0MWbFp9Eg==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "requires": { - "event-target-shim": "^5.0.0" - } - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "discord.js": { - "version": "github:discordjs/discord.js#ab82cafcde0ee259a32ef14303c1b4a64dea8fae", - "from": "github:discordjs/discord.js", - "requires": { - "@discordjs/collection": "^0.1.6", - "@discordjs/form-data": "^3.0.1", - "abort-controller": "^3.0.0", - "node-fetch": "^2.6.1", - "prism-media": "^1.2.2", - "tweetnacl": "^1.0.3", - "ws": "^7.3.1" - } - }, - "event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" - }, - "mime-db": { - "version": "1.48.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", - "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==" - }, - "mime-types": { - "version": "2.1.31", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", - "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", - "requires": { - "mime-db": "1.48.0" - } - }, - "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" - }, - "prism-media": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.9.tgz", - "integrity": "sha512-UHCYuqHipbTR1ZsXr5eg4JUmHER8Ss4YEb9Azn+9zzJ7/jlTtD1h0lc4g6tNx3eMlB8Mp6bfll0LPMAV4R6r3Q==" - }, - "tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" - }, - "ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" + "npm6-dependency": { + "version": "github:dependabot-fixtures/npm6-dependency.git#5d1be9ff4e12eb17c04591bba13aad6d71c86a1b", + "from": "github:dependabot-fixtures/npm6-dependency.git" } } } diff --git a/npm_and_yarn/spec/fixtures/projects/npm6/ghpr_no_hash_pinning/package.json b/npm_and_yarn/spec/fixtures/projects/npm6/ghpr_no_hash_pinning/package.json index f2fbb56069d..9fd9f59d32f 100644 --- a/npm_and_yarn/spec/fixtures/projects/npm6/ghpr_no_hash_pinning/package.json +++ b/npm_and_yarn/spec/fixtures/projects/npm6/ghpr_no_hash_pinning/package.json @@ -1,10 +1,14 @@ { "name": "example", "version": "1.0.0", - "dependencies": { - "discord.js": "github:discordjs/discord.js" + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" }, - "engines": { - "node": "14.x" + "author": "", + "license": "ISC", + "dependencies": { + "npm6-dependency": "github:dependabot-fixtures/npm6-dependency.git" } }