fix: implications fails only displayed once (#954)

yargs · Sep 17, 2017 · ac8088b · ac8088b
1 parent 73be236
commit ac8088b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/validation.js b/lib/validation.js
@@ -249,6 +249,7 @@ module.exports = function validation (yargs, usage, y18n) {
       ;(implied[key] || []).forEach((value) => {
         let num
         let key = origKey
+        const origValue = value
 
         // convert string '1' to number 1
         num = Number(key)
@@ -278,20 +279,16 @@ module.exports = function validation (yargs, usage, y18n) {
           value = argv[value]
         }
         if (key && !value) {
-          implyFail.push(origKey)
+          implyFail.push(` ${origKey} -> ${origValue}`)
         }
       })
     })
 
     if (implyFail.length) {
       let msg = `${__('Implications failed:')}\n`
 
-      implyFail.forEach((key) => {
-        if (implied[key]) {
-          implied[key].forEach((value) => {
-            msg += (` ${key} -> ${value}`)
-          })
-        }
+      implyFail.forEach((value) => {
+        msg += (value)
       })
 
       usage.fail(msg)

diff --git a/test/validation.js b/test/validation.js
@@ -38,15 +38,17 @@ describe('validation tests', () => {
         .argv
     })
 
-    it('fails if either implied argument is not set', (done) => {
+    it('fails if either implied argument is not set and displays only failed', (done) => {
       yargs(['-f', '-b'])
           .implies('f', ['b', 'c'])
           .fail((msg1) => {
             yargs(['-f', '-c'])
                 .implies('f', ['b', 'c'])
                 .fail((msg2) => {
-                  msg1.should.match(/f -> b f -> c/)
-                  msg2.should.match(/f -> b f -> c/)
+                  msg1.should.match(/f -> c/)
+                  msg1.should.not.match(/f -> b/)
+                  msg2.should.match(/f -> b/)
+                  msg2.should.not.match(/f -> c/)
                   return done()
                 })
                 .argv