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/tap/shrinkwrap-dev-dependency.js | |
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/tap/shrinkwrap-dev-dependency.js')
-rw-r--r-- | deps/npm/test/tap/shrinkwrap-dev-dependency.js | 73 |
1 files changed, 39 insertions, 34 deletions
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() +}) |