diff options
Diffstat (limited to 'deps/npm/test/need-npm5-update')
10 files changed, 16 insertions, 19 deletions
diff --git a/deps/npm/test/need-npm5-update/belongs-in-pacote/add-remote-git-get-resolved.js b/deps/npm/test/need-npm5-update/belongs-in-pacote/add-remote-git-get-resolved.js index 77463e8bea..fadfc330fb 100644 --- a/deps/npm/test/need-npm5-update/belongs-in-pacote/add-remote-git-get-resolved.js +++ b/deps/npm/test/need-npm5-update/belongs-in-pacote/add-remote-git-get-resolved.js @@ -88,7 +88,7 @@ test('add-remote-git#get-resolved edge cases', function (t) { 'git+ssh://user@bananaboat.com:galbi/blah.git#decadacefadabade', 'don\'t break non-hosted scp-style locations' ) -/* + /* t.equal( tryGetResolved('git+ssh://bananaboat:galbi/blah', 'decadacefadabade'), 'git+ssh://bananaboat:galbi/blah#decadacefadabade', diff --git a/deps/npm/test/need-npm5-update/belongs-in-pacote/git-races.js b/deps/npm/test/need-npm5-update/belongs-in-pacote/git-races.js index c6c27d5040..60136125d4 100644 --- a/deps/npm/test/need-npm5-update/belongs-in-pacote/git-races.js +++ b/deps/npm/test/need-npm5-update/belongs-in-pacote/git-races.js @@ -1,3 +1,4 @@ +/* eslint-disable camelcase */ var execFile = require('child_process').execFile var path = require('path') var zlib = require('zlib') diff --git a/deps/npm/test/need-npm5-update/legacy-npm-self-install.js b/deps/npm/test/need-npm5-update/legacy-npm-self-install.js index d9d1124bda..6bcd807362 100644 --- a/deps/npm/test/need-npm5-update/legacy-npm-self-install.js +++ b/deps/npm/test/need-npm5-update/legacy-npm-self-install.js @@ -9,7 +9,6 @@ var osenv = require('osenv') var npmpath = path.resolve(__dirname, '../..') var basepath = path.resolve(osenv.tmpdir(), path.basename(__filename, '.js')) var globalpath = path.resolve(basepath, 'global') -var extend = Object.assign || require('util')._extend var isWin32 = process.platform === 'win32' test('setup', function (t) { @@ -41,7 +40,7 @@ function exists () { test('npm-self-install', function (t) { if (!tarball) return t.done() - var env = extend({}, process.env) + var env = Object.assign({}, process.env) var pathsep = isWin32 ? ';' : ':' env.npm_config_prefix = globalpath env.npm_config_global = 'true' diff --git a/deps/npm/test/need-npm5-update/lifecycle-signal.js b/deps/npm/test/need-npm5-update/lifecycle-signal.js index c0fdb766c0..a003fb54ab 100644 --- a/deps/npm/test/need-npm5-update/lifecycle-signal.js +++ b/deps/npm/test/need-npm5-update/lifecycle-signal.js @@ -19,7 +19,7 @@ asyncScript += '});setInterval(function(){},10);' var zombieScript = 'console.error(process.pid);process.on(\'SIGINT\',function (){' zombieScript += '});setInterval(function(){console.error(process.pid)},10);' -var SIGSEGV = require('constants').SIGSEGV +var SIGSEGV = require('constants').SIGSEGV // eslint-disable-line node/no-deprecated-api var json = { name: 'lifecycle-signal', diff --git a/deps/npm/test/need-npm5-update/move-no-clobber-dest-node-modules.js b/deps/npm/test/need-npm5-update/move-no-clobber-dest-node-modules.js index 4e487837ad..a00c720243 100644 --- a/deps/npm/test/need-npm5-update/move-no-clobber-dest-node-modules.js +++ b/deps/npm/test/need-npm5-update/move-no-clobber-dest-node-modules.js @@ -15,8 +15,8 @@ function File (contents) { return { type: 'file', contents: typeof contents === 'object' - ? JSON.stringify(contents) - : contents + ? JSON.stringify(contents) + : contents } } @@ -64,7 +64,7 @@ var fixtures = Dir({ version: '1.0.0' }) }), -// The local config + // The local config 'package.json': File({ dependencies: { moda: fixturepath('moda@1.0.1'), diff --git a/deps/npm/test/need-npm5-update/outdated-depth-integer.js b/deps/npm/test/need-npm5-update/outdated-depth-integer.js index 5e743a0a77..98c08fa192 100644 --- a/deps/npm/test/need-npm5-update/outdated-depth-integer.js +++ b/deps/npm/test/need-npm5-update/outdated-depth-integer.js @@ -45,8 +45,8 @@ test('outdated depth integer', function (t) { pkg, 'underscore', undefined, // no version installed - '1.3.1', // wanted - '1.5.1', // latest + '1.3.1', // wanted + '1.5.1', // latest '1.3.1', null ]] @@ -58,7 +58,7 @@ test('outdated depth integer', function (t) { registry: common.registry, depth: 5 } - , function () { + , function () { npm.install('request@0.9.0', function (er) { if (er) throw new Error(er) npm.outdated(function (err, d) { diff --git a/deps/npm/test/need-npm5-update/outdated-symlink.js b/deps/npm/test/need-npm5-update/outdated-symlink.js index a7792f4a31..2f74e0551a 100644 --- a/deps/npm/test/need-npm5-update/outdated-symlink.js +++ b/deps/npm/test/need-npm5-update/outdated-symlink.js @@ -10,11 +10,10 @@ var common = require('../common-tap.js') var pkg = path.resolve(__dirname, 'outdated-symlink') var cache = path.resolve(pkg, 'cache') -var extend = Object.assign || require('util')._extend var fakeRoot = path.join(pkg, 'fakeRoot') var OPTS = { - env: extend(extend({}, process.env), { + env: Object.assign({}, process.env, { 'npm_config_prefix': fakeRoot, 'registry': common.registry }) diff --git a/deps/npm/test/need-npm5-update/peer-deps-toplevel.js b/deps/npm/test/need-npm5-update/peer-deps-toplevel.js index e2285e7699..137375a232 100644 --- a/deps/npm/test/need-npm5-update/peer-deps-toplevel.js +++ b/deps/npm/test/need-npm5-update/peer-deps-toplevel.js @@ -5,7 +5,6 @@ var mr = require('npm-registry-mock') var Tacks = require('tacks') var File = Tacks.File var Dir = Tacks.Dir -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(extend({}, process.env), { + env: Object.assign({}, process.env, { npm_config_cache: cachedir, npm_config_tmp: tmpdir, npm_config_prefix: globaldir, diff --git a/deps/npm/test/need-npm5-update/rm-linked.js b/deps/npm/test/need-npm5-update/rm-linked.js index 381d7bc67a..9123b8760e 100644 --- a/deps/npm/test/need-npm5-update/rm-linked.js +++ b/deps/npm/test/need-npm5-update/rm-linked.js @@ -27,7 +27,7 @@ var linkedJSON = { description: '', main: 'index.js', scripts: { - test: 'echo \"Error: no test specified\" && exit 1' + test: 'echo "Error: no test specified" && exit 1' }, dependencies: { 'baz': '1.0.0' @@ -42,7 +42,7 @@ var linkedDepJSON = { description: '', main: 'index.js', scripts: { - test: 'echo \"Error: no test specified\" && exit 1' + test: 'echo "Error: no test specified" && exit 1' }, author: '', license: 'ISC' @@ -54,7 +54,7 @@ var installJSON = { description: '', main: 'index.js', scripts: { - test: 'echo \"Error: no test specified\" && exit 1' + test: 'echo "Error: no test specified" && exit 1' }, dependencies: { 'foo': '1.0.0' diff --git a/deps/npm/test/need-npm5-update/shrinkwrap-complete-except-dev.js b/deps/npm/test/need-npm5-update/shrinkwrap-complete-except-dev.js index 156721507f..abafde0afe 100644 --- a/deps/npm/test/need-npm5-update/shrinkwrap-complete-except-dev.js +++ b/deps/npm/test/need-npm5-update/shrinkwrap-complete-except-dev.js @@ -6,7 +6,6 @@ var mr = require('npm-registry-mock') var Tacks = require('tacks') var File = Tacks.File var Dir = Tacks.Dir -var extend = Object.assign || require('util')._extend var common = require('../common-tap.js') var basedir = path.join(__dirname, path.basename(__filename, '.js')) @@ -22,7 +21,7 @@ var installedModuleD = path.join(appdir, 'node_modules', 'module-d') var conf = { cwd: appdir, - env: extend(extend({}, process.env), { + env: Object.assign({}, process.env, { npm_config_cache: cachedir, npm_config_tmp: tmpdir, npm_config_prefix: globaldir, |