summaryrefslogtreecommitdiff
path: root/deps/npm/test/tap/tagged-version-matching.js
diff options
context:
space:
mode:
Diffstat (limited to 'deps/npm/test/tap/tagged-version-matching.js')
-rw-r--r--deps/npm/test/tap/tagged-version-matching.js33
1 files changed, 3 insertions, 30 deletions
diff --git a/deps/npm/test/tap/tagged-version-matching.js b/deps/npm/test/tap/tagged-version-matching.js
index 9d3f5f38e9..55dfb7b7c4 100644
--- a/deps/npm/test/tap/tagged-version-matching.js
+++ b/deps/npm/test/tap/tagged-version-matching.js
@@ -5,7 +5,6 @@ var Tacks = require('tacks')
var File = Tacks.File
var Dir = Tacks.Dir
var Symlink = Tacks.Symlink
-var extend = Object.assign || require('util')._extend
var common = require('../common-tap.js')
var basedir = path.join(__dirname, path.basename(__filename, '.js'))
@@ -16,7 +15,7 @@ var tmpdir = path.join(basedir, 'tmp')
var conf = {
cwd: testdir,
- env: extend({
+ env: Object.assign({
npm_config_cache: cachedir,
npm_config_tmp: tmpdir,
npm_config_prefix: globaldir,
@@ -46,24 +45,6 @@ var fixture = new Tacks(Dir({
'package.json': File({
_from: 'npm/example-gitdep',
_id: 'gitdep@1.0.0',
- _requested: {
- raw: 'gitdep@git://github.com/npm/example-gitdep.git#da39a3ee5e6b4b0d3255bfef95601890afd80709',
- scope: null,
- escapedName: 'gitdep',
- name: 'gitdep',
- rawSpec: 'git://github.com/npm/example-gitdep.git#da39a3ee5e6b4b0d3255bfef95601890afd80709',
- spec: 'git://github.com/npm/example-gitdep.git#da39a3ee5e6b4b0d3255bfef95601890afd80709',
- type: 'hosted',
- hosted: {
- type: 'github',
- ssh: 'git@github.com:npm/example-gitdep.git#da39a3ee5e6b4b0d3255bfef95601890afd80709',
- sshUrl: 'git+ssh://git@github.com/npm/example-gitdep.git#da39a3ee5e6b4b0d3255bfef95601890afd80709',
- httpsUrl: 'git+https://github.com/npm/example-gitdep.git#da39a3ee5e6b4b0d3255bfef95601890afd80709',
- gitUrl: 'git://github.com/npm/example-gitdep.git#da39a3ee5e6b4b0d3255bfef95601890afd80709',
- shortcut: 'github:npm/example-gitdep#da39a3ee5e6b4b0d3255bfef95601890afd80709',
- directUrl: 'https://raw.githubusercontent.com/npm/example-gitdep/da39a3ee5e6b4b0d3255bfef95601890afd80709/package.json'
- }
- },
_resolved: 'github:npm/example-gitdep#da39a3ee5e6b4b0d3255bfef95601890afd80709',
name: 'gitdep',
version: '1.0.0'
@@ -74,15 +55,7 @@ var fixture = new Tacks(Dir({
_from: 'tagdep@latest',
_id: 'tagdep@1.0.0',
_integrity: 'sha1-0EJSKmsdk39848LlrRg/hZQo2B8=',
- _requested: {
- raw: 'tagdep@https://registry.example.com/tagdep/-/tagdep-1.0.0.tgz',
- scope: null,
- escapedName: 'tagdep',
- name: 'tagdep',
- rawSpec: 'https://registry.example.com/tagdep/-/tagdep-1.0.0.tgz',
- spec: 'https://registry.example.com/tagdep/-/tagdep-1.0.0.tgz',
- type: 'remote'
- },
+ _resolved: 'https://registry.example.com/tagdep/-/tagdep-1.0.0.tgz',
name: 'tagdep',
version: '1.0.0'
})
@@ -102,7 +75,7 @@ var fixture = new Tacks(Dir({
example: {
version: 'file:example',
requires: {
- tagdep: '1.0.0',
+ tagdep: '^1.0.0',
gitdep: 'github:npm/example-gitdep#da39a3ee5e6b4b0d3255bfef95601890afd80709'
}
},