diff options
author | Kat Marchán <kzm@sykosomatic.org> | 2016-06-03 11:08:53 -0700 |
---|---|---|
committer | Myles Borins <mborins@us.ibm.com> | 2016-06-06 15:27:52 -0700 |
commit | 843d58fcbbec09cde5633e0bc5ab025d0a640204 (patch) | |
tree | 0c866d93e1bd243b18baccc59eca99bcef048274 /deps/npm/test | |
parent | a32f7eb4bec1eb08f271d63f9f99dc322a6e1b6d (diff) | |
download | android-node-v8-843d58fcbbec09cde5633e0bc5ab025d0a640204.tar.gz android-node-v8-843d58fcbbec09cde5633e0bc5ab025d0a640204.tar.bz2 android-node-v8-843d58fcbbec09cde5633e0bc5ab025d0a640204.zip |
deps: upgrade npm to 3.9.5
PR-URL: https://github.com/nodejs/node/pull/7139
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps/npm/test')
-rw-r--r-- | deps/npm/test/fixtures/config/userconfig-with-gc | 22 | ||||
-rw-r--r-- | deps/npm/test/tap/outdated-symlink.js | 57 | ||||
-rw-r--r-- | deps/npm/test/tap/rm-linked.js | 44 | ||||
-rw-r--r-- | deps/npm/test/tap/shrinkwrap-dev-dependency.js | 73 | ||||
-rw-r--r-- | deps/npm/test/tap/shrinkwrap-prod-dependency-also.js | 66 | ||||
-rw-r--r-- | deps/npm/test/tap/shrinkwrap-scoped-auth.js | 10 |
6 files changed, 140 insertions, 132 deletions
diff --git a/deps/npm/test/fixtures/config/userconfig-with-gc b/deps/npm/test/fixtures/config/userconfig-with-gc deleted file mode 100644 index 62ad80be11..0000000000 --- a/deps/npm/test/fixtures/config/userconfig-with-gc +++ /dev/null @@ -1,22 +0,0 @@ -globalconfig=/Users/zkat/Documents/code/npm/test/fixtures/config/globalconfig -email=i@izs.me -env-thing=asdf -init.author.name=Isaac Z. Schlueter -init.author.email=i@izs.me -init.author.url=http://blog.izs.me/ -init.version=1.2.3 -proprietary-attribs=false -npm:publishtest=true -_npmjs.org:couch=https://admin:password@localhost:5984/registry -npm-www:nocache=1 -sign-git-tag=false -message=v%s -strict-ssl=false -_auth="dXNlcm5hbWU6cGFzc3dvcmQ=" - -[_token] -AuthSession=yabba-dabba-doodle -version=1 -expires=1345001053415 -path=/ -httponly=true diff --git a/deps/npm/test/tap/outdated-symlink.js b/deps/npm/test/tap/outdated-symlink.js index a5ebea0d2e..809cfec2e2 100644 --- a/deps/npm/test/tap/outdated-symlink.js +++ b/deps/npm/test/tap/outdated-symlink.js @@ -10,13 +10,13 @@ var common = require('../common-tap.js') var pkg = path.resolve(__dirname, 'outdated-symlink') var cache = path.resolve(pkg, 'cache') -var originalLog +var extend = Object.assign || require('util')._extend -var fakeRoot = path.join(__dirname, 'fakeRoot') +var fakeRoot = path.join(pkg, 'fakeRoot') var OPTS = { - env: { + env: extend(extend({}, process.env), { 'npm_config_prefix': fakeRoot - } + }) } var json = { @@ -27,22 +27,26 @@ var json = { test('setup', function (t) { cleanup() - originalLog = console.log mkdirp.sync(cache) fs.writeFileSync( path.join(pkg, 'package.json'), JSON.stringify(json, null, 2) ) process.chdir(pkg) - common.npm(['install', '-g', 'async@0.2.9', 'underscore@1.3.1'], OPTS, function (err, c, out) { - t.ifError(err, 'global install did not error') - common.npm(['link'], OPTS, function (err, c, out) { - t.ifError(err, 'link did not error') - common.npm(['ls', '-g'], OPTS, function (err, c, out, stderr) { - t.ifError(err) - t.equal(c, 0) - t.equal(stderr, '', 'got expected stderr') - t.has(out, /my-local-package@1.0.0/, 'creates global link ok') + common.npm(['install', '-g', 'async@0.2.9', 'underscore@1.3.1'], OPTS, function (err, code, stdout, stderr) { + if (err) throw err + t.comment(stdout) + t.comment(stderr) + common.npm(['link'], OPTS, function (err, code, stdout, stderr) { + if (err) throw err + t.comment(stdout) + t.comment(stderr) + t.is(code, 0) + common.npm(['ls', '-g'], OPTS, function (err, code, stdout, stderr) { + if (err) throw err + t.is(code, 0) + t.is(stderr, '', 'got expected stderr') + t.match(stdout, /my-local-package@1.0.0/, 'creates global link ok') t.end() }) }) @@ -54,7 +58,6 @@ test('when outdated is called linked packages should be displayed as such', func var regOutInstallOne = /async\s*0.2.9\s*0.2.9\s*0.2.10\n/ var regOutInstallTwo = /underscore\s*1.3.1\s*1.3.1\s*1.5.1\n/ - console.log = function () {} mr({ port: common.port }, function (er, s) { common.npm( [ @@ -63,10 +66,11 @@ test('when outdated is called linked packages should be displayed as such', func ], OPTS, function (err, c, out, stderr) { - t.ifError(err) - t.ok(out.match(regOutLinked), 'Global Link format as expected') - t.ok(out.match(regOutInstallOne), 'Global Install format as expected') - t.ok(out.match(regOutInstallTwo), 'Global Install format as expected') + if (err) throw err + t.is(stderr, '') + t.match(out, regOutLinked, 'Global Link format as expected') + t.match(out, regOutInstallOne, 'Global Install format as expected') + t.match(out, regOutInstallTwo, 'Global Install format as expected') s.close() t.end() } @@ -76,14 +80,17 @@ test('when outdated is called linked packages should be displayed as such', func test('cleanup', function (t) { process.chdir(osenv.tmpdir()) - common.npm(['rm', 'outdated'], OPTS, function (err, code) { - t.ifError(err, 'npm removed the linked package without error') - t.equal(code, 0, 'cleanup outdated in local ok') + common.npm(['rm', 'outdated'], OPTS, function (err, code, stdout, stderr) { + if (err) throw err + t.comment(stdout) + t.comment(stderr) + t.is(code, 0, 'cleanup outdated in local ok') common.npm(['rm', '-g', 'outdated', 'async', 'underscore'], OPTS, function (err, code) { - t.ifError(err, 'npm removed the global package without error') - t.equal(code, 0, 'cleanup outdated in global ok') + if (err) throw err + t.comment(stdout) + t.comment(stderr) + t.is(code, 0, 'cleanup outdated in global ok') - console.log = originalLog cleanup() t.end() }) diff --git a/deps/npm/test/tap/rm-linked.js b/deps/npm/test/tap/rm-linked.js index cd46c013ad..381d7bc67a 100644 --- a/deps/npm/test/tap/rm-linked.js +++ b/deps/npm/test/tap/rm-linked.js @@ -65,23 +65,30 @@ var installJSON = { test('setup', function (t) { setup() - common.npm(['ls', '-g', '--depth=0'], OPTS, function (err, c, out) { - t.ifError(err) - t.equal(c, 0, 'set up ok') - t.notOk(out.match(/UNMET DEPENDENCY foo@/), "foo isn't in global") + common.npm(['ls', '-g', '--depth=0'], OPTS, function (err, code, stdout, stderr) { + if (err) throw err + t.comment(stdout) + t.comment(stderr) + t.is(code, 0, 'ls -g') + t.notMatch(stdout, /UNMET DEPENDENCY foo@/, "foo isn't in global") t.end() }) }) test('creates global link', function (t) { process.chdir(link) - common.npm(['link'], OPTS, function (err, c, out) { - t.ifError(err, 'link has no error') - common.npm(['ls', '-g'], OPTS, function (err, c, out, stderr) { - t.ifError(err) - t.equal(c, 0) + common.npm(['link'], OPTS, function (err, code, stdout, stderr) { + if (err) throw err + t.is(code, 0, 'link') + t.comment(stdout) + t.comment(stderr) + common.npm(['ls', '-g'], OPTS, function (err, code, stdout, stderr) { + if (err) throw err + t.comment(stdout) + t.comment(stderr) + t.is(code, 0, 'ls -g') t.equal(stderr, '', 'got expected stderr') - t.has(out, /foo@1.0.0/, 'creates global link ok') + t.match(stdout, /foo@1.0.0/, 'creates global link ok') t.end() }) }) @@ -89,13 +96,18 @@ test('creates global link', function (t) { test('uninstall the global linked package', function (t) { process.chdir(osenv.tmpdir()) - common.npm(['uninstall', '-g', 'foo'], OPTS, function (err) { - t.ifError(err, 'uninstall has no error') + common.npm(['uninstall', '-g', 'foo'], OPTS, function (err, code, stdout, stderr) { + if (err) throw err + t.is(code, 0, 'uninstall -g foo') + t.comment(stdout) + t.comment(stderr) process.chdir(link) - common.npm(['ls'], OPTS, function (err, c, out) { - t.ifError(err) - t.equal(c, 0) - t.has(out, /baz@1.0.0/, "uninstall didn't remove dep") + common.npm(['ls'], OPTS, function (err, code, stdout) { + if (err) throw err + t.is(code, 0, 'ls') + t.comment(stdout) + t.comment(stderr) + t.match(stdout, /baz@1.0.0/, "uninstall didn't remove dep") t.end() }) }) diff --git a/deps/npm/test/tap/shrinkwrap-dev-dependency.js b/deps/npm/test/tap/shrinkwrap-dev-dependency.js index 0a239e97ce..3328134629 100644 --- a/deps/npm/test/tap/shrinkwrap-dev-dependency.js +++ b/deps/npm/test/tap/shrinkwrap-dev-dependency.js @@ -8,36 +8,13 @@ var rimraf = require('rimraf') var test = require('tap').test var common = require('../common-tap.js') -var npm = npm = require('../../') var pkg = path.resolve(__dirname, 'shrinkwrap-dev-dependency') -test("shrinkwrap doesn't strip out the dependency", function (t) { - t.plan(1) - - mr({port: common.port}, function (er, s) { - setup(function (err) { - if (err) return t.fail(err) - - npm.install('.', function (err) { - if (err) return t.fail(err) - - npm.commands.shrinkwrap([], true, function (err, results) { - if (err) return t.fail(err) - - t.deepEqual(results, desired) - s.close() - t.end() - }) - }) - }) - }) -}) - -test('cleanup', function (t) { - cleanup() - t.end() -}) +var opts = [ + '--cache', path.resolve(pkg, 'cache'), + '--registry', common.registry +] var desired = { name: 'npm-test-shrinkwrap-dev-dependency', @@ -69,20 +46,48 @@ var json = { } } -function setup (cb) { +function setup () { cleanup() mkdirp.sync(pkg) fs.writeFileSync(path.join(pkg, 'package.json'), JSON.stringify(json, null, 2)) process.chdir(pkg) - - var opts = { - cache: path.resolve(pkg, 'cache'), - registry: common.registry - } - npm.load(opts, cb) } function cleanup () { process.chdir(osenv.tmpdir()) rimraf.sync(pkg) } + +test('setup', function (t) { + setup() + t.end() +}) + +test("shrinkwrap doesn't strip out the dependency", function (t) { + t.plan(3) + setup() + + mr({port: common.port}, function (er, s) { + common.npm(opts.concat(['install', '.']), {stdio: [0, 'pipe', 2]}, function (err, code) { + if (err) throw err + if (!t.is(code, 0)) return (s.close(), t.end()) + common.npm(opts.concat(['shrinkwrap']), {stdio: [0, 2, 2]}, function (err, code) { + if (err) throw err + t.is(code, 0) + try { + var results = JSON.parse(fs.readFileSync(path.join(pkg, 'npm-shrinkwrap.json'))) + } catch (ex) { + t.comment(ex) + } + t.deepEqual(results, desired) + s.close() + t.end() + }) + }) + }) +}) + +test('cleanup', function (t) { + cleanup() + t.end() +}) diff --git a/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js b/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js index 5bcae6d2f5..723960ac32 100644 --- a/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js +++ b/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js @@ -7,35 +7,55 @@ var osenv = require('osenv') var rimraf = require('rimraf') var test = require('tap').test -var npm = npm = require('../../') - var common = require('../common-tap.js') -var pkg = path.resolve(__dirname, 'shrinkwrap-prod-dependency') +var pkg = path.resolve(__dirname, path.basename(__filename, '.js')) +var opts = [ + '--cache=' + path.resolve(pkg, 'cache'), + '--registry=' + common.registry +] + +function reportOutput (t, fh, out) { + var trimmed = out.trim() + if (!trimmed.length) return + var prefix = fh + '> ' + t.comment(prefix + trimmed.split(/\n/).join('\n' + prefix)) +} +var server test("shrinkwrap --also=development doesn't strip out prod dependencies", function (t) { - t.plan(1) + t.plan(4) mr({port: common.port}, function (er, s) { - setup({}, function (err) { + server = s + setup() + common.npm(['install', '.'].concat(opts), {cwd: pkg}, function (err, code, stdout, stderr) { if (err) return t.fail(err) - - npm.install('.', function (err) { + t.is(code, 0, 'install') + reportOutput(t, 'out', stdout) + reportOutput(t, 'err', stderr) + common.npm(['shrinkwrap', '--also=development'].concat(opts), {cwd: pkg}, function (err, code, stdout, stderr) { if (err) return t.fail(err) - - npm.config.set('also', 'development') - npm.commands.shrinkwrap([], true, function (err, results) { - if (err) return t.fail(err) - - t.deepEqual(results, desired) - s.close() - t.end() - }) + var ok = t.is(code, 0, 'shrinkwrap') + reportOutput(t, 'out', stdout) + reportOutput(t, 'err', stderr) + if (ok) { + try { + var results = JSON.parse(fs.readFileSync(path.join(pkg, 'npm-shrinkwrap.json'))) + t.pass('read shrinkwrap') + } catch (ex) { + t.ifError(ex, 'read shrinkwrap') + } + } + t.deepEqual(results, desired, 'results have dev dep') + s.done() + t.end() }) }) }) }) test('cleanup', function (t) { + server.close() cleanup() t.end() }) @@ -69,22 +89,10 @@ var json = { } } -function setup (opts, cb) { +function setup (opts) { cleanup() mkdirp.sync(pkg) fs.writeFileSync(path.join(pkg, 'package.json'), JSON.stringify(json, null, 2)) - process.chdir(pkg) - - var allOpts = { - cache: path.resolve(pkg, 'cache'), - registry: common.registry - } - - for (var key in opts) { - allOpts[key] = opts[key] - } - - npm.load(allOpts, cb) } function cleanup () { diff --git a/deps/npm/test/tap/shrinkwrap-scoped-auth.js b/deps/npm/test/tap/shrinkwrap-scoped-auth.js index 63fd08cb07..a469bc8356 100644 --- a/deps/npm/test/tap/shrinkwrap-scoped-auth.js +++ b/deps/npm/test/tap/shrinkwrap-scoped-auth.js @@ -19,8 +19,6 @@ var tarball = resolve(__dirname, '../fixtures/scoped-underscore-1.3.1.tgz') var server -var EXEC_OPTS = { cwd: pkg } - function mocks (server) { var auth = 'Bearer 0xabad1dea' server.get(tarballPath, { authorization: auth }).replyWithFile(200, tarball) @@ -43,16 +41,16 @@ test('authed npm install with shrinkwrapped scoped package', function (t) { common.npm( [ 'install', - '--loglevel', 'silent', + '--loglevel', 'warn', '--json', '--fetch-retries', 0, '--userconfig', outfile ], - EXEC_OPTS, + {cwd: pkg}, function (err, code, stdout, stderr) { - t.ifError(err, 'test runner executed without error') + if (err) throw err + if (stderr) t.comment(stderr) t.equal(code, 0, 'npm install exited OK') - t.notOk(stderr, 'no output on stderr') try { var results = JSON.parse(stdout) } catch (ex) { |