Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ls.js1
-rw-r--r--test/tap/ls-production-and-dev.js150
2 files changed, 150 insertions, 1 deletions
diff --git a/lib/ls.js b/lib/ls.js
index 1c9292082..dbaae5190 100644
--- a/lib/ls.js
+++ b/lib/ls.js
@@ -120,7 +120,6 @@ function filterByEnv (data) {
var devDependencies = data.devDependencies || []
Object.keys(data.dependencies).forEach(function (name) {
var keys = Object.keys(devDependencies)
- if (production && !dev && keys.indexOf(name) !== -1) return
if (dev && !production && keys.indexOf(name) === -1) return
if (!dev && keys.indexOf(name) !== -1 && data.dependencies[name].missing) return
dependencies[name] = data.dependencies[name]
diff --git a/test/tap/ls-production-and-dev.js b/test/tap/ls-production-and-dev.js
new file mode 100644
index 000000000..e9bae3de7
--- /dev/null
+++ b/test/tap/ls-production-and-dev.js
@@ -0,0 +1,150 @@
+var fs = require('graceful-fs')
+var path = require('path')
+
+var mkdirp = require('mkdirp')
+var mr = require('npm-registry-mock')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var common = require('../common-tap')
+
+var pkg = path.resolve(__dirname, 'ls-depth')
+
+var EXEC_OPTS = { cwd: pkg }
+
+var json = {
+ name: 'ls-env',
+ version: '0.0.0',
+ dependencies: {
+ 'test-package-with-one-dep': '0.0.0'
+ },
+ devDependencies: {
+ 'test-package-with-one-dep': '0.0.0'
+ }
+}
+
+test('setup', function (t) {
+ cleanup()
+ mkdirp.sync(pkg)
+ fs.writeFileSync(
+ path.join(pkg, 'package.json'),
+ JSON.stringify(json, null, 2)
+ )
+ mr({port: common.port}, function (er, s) {
+ common.npm(
+ [
+ '--registry', common.registry,
+ 'install'
+ ],
+ EXEC_OPTS,
+ function (er, c) {
+ t.ifError(er, 'install ran without issue')
+ t.equal(c, 0)
+ s.close()
+ t.end()
+ }
+ )
+ })
+})
+
+test('npm ls --dev', function (t) {
+ common.npm(['ls', '--dev'], EXEC_OPTS, function (er, code, stdout) {
+ t.ifError(er, 'ls --dev ran without issue')
+ t.equal(code, 0)
+ t.has(
+ stdout,
+ /test-package-with-one-dep@0\.0\.0/,
+ 'output contains test-package-with-one-dep@0.0.0'
+ )
+ t.end()
+ })
+})
+
+test('npm ls --only=development', function (t) {
+ common.npm(['ls', '--only=development'], EXEC_OPTS, function (er, code, stdout) {
+ t.ifError(er, 'ls --only=development ran without issue')
+ t.equal(code, 0)
+ t.has(
+ stdout,
+ /test-package-with-one-dep@0\.0\.0/,
+ 'output contains test-package-with-one-dep@0.0.0'
+ )
+ t.end()
+ })
+})
+
+test('npm ls --only=dev', function (t) {
+ common.npm(['ls', '--only=dev'], EXEC_OPTS, function (er, code, stdout) {
+ t.ifError(er, 'ls --only=dev ran without issue')
+ t.equal(code, 0)
+ t.has(
+ stdout,
+ /test-package-with-one-dep@0\.0\.0/,
+ 'output contains test-package-with-one-dep@0.0.0'
+ )
+ t.end()
+ })
+})
+
+test('npm ls --production', function (t) {
+ common.npm(['ls', '--production'], EXEC_OPTS, function (er, code, stdout) {
+ t.ifError(er, 'ls --production ran without issue')
+ t.notOk(code, 'npm exited ok')
+ t.has(
+ stdout,
+ /test-package-with-one-dep@0\.0\.0/,
+ 'output contains test-package-with-one-dep@0.0.0'
+ )
+ t.end()
+ })
+})
+
+test('npm ls --prod', function (t) {
+ common.npm(['ls', '--prod'], EXEC_OPTS, function (er, code, stdout) {
+ t.ifError(er, 'ls --prod ran without issue')
+ t.notOk(code, 'npm exited ok')
+ t.has(
+ stdout,
+ /test-package-with-one-dep@0\.0\.0/,
+ 'output contains test-package-with-one-dep@0.0.0'
+ )
+ t.end()
+ })
+})
+
+test('npm ls --only=production', function (t) {
+ common.npm(['ls', '--only=production'], EXEC_OPTS, function (er, code, stdout) {
+ t.ifError(er, 'ls --only=production ran without issue')
+ t.notOk(code, 'npm exited ok')
+ t.has(
+ stdout,
+ /test-package-with-one-dep@0\.0\.0/,
+ 'output contains test-package-with-one-dep@0.0.0'
+ )
+ t.end()
+ })
+})
+
+test('npm ls --only=prod', function (t) {
+ common.npm(['ls', '--only=prod'], EXEC_OPTS, function (er, code, stdout) {
+ t.ifError(er, 'ls --only=prod ran without issue')
+ t.notOk(code, 'npm exited ok')
+ t.has(
+ stdout,
+ /test-package-with-one-dep@0\.0\.0/,
+ 'output contains test-package-with-one-dep@0.0.0'
+ )
+ t.end()
+ })
+})
+
+test('cleanup', function (t) {
+ cleanup()
+ t.end()
+})
+
+function cleanup () {
+ process.chdir(osenv.tmpdir())
+ rimraf.sync(pkg)
+}