fix: address min/max validation message regression (#750)

bcoe · web-flow · commit 2e5ce0fa7114 · 2017-01-09T21:10:05.000-08:00
diff --git a/test/validation.js b/test/validation.js
@@ -239,6 +239,17 @@ describe('validation tests', function () {
         .argv
     })
 
+    // address regression in: https://github.com/yargs/yargs/pull/740
+    it('custom failure message should be printed for both min and max constraints', function (done) {
+      yargs(['foo'])
+        .demand(0, 0, 'hey! give me a custom exit message')
+        .fail(function (msg) {
+          expect(msg).to.equal('hey! give me a custom exit message')
+          return done()
+        })
+        .argv
+    })
+
     it('interprets min relative to command', function () {
       var failureMsg
       yargs('lint')
diff --git a/yargs.js b/yargs.js
@@ -318,7 +318,7 @@ function Yargs (processArgs, cwd, parentRequire) {
     }
 
     if (typeof keys === 'number') {
-      self.demandCommand(keys, max, msg)
+      self.demandCommand(keys, max, msg, msg)
     } else if (Array.isArray(keys)) {
       keys.forEach(function (key) {
         self.demandOption(key, msg)

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ function Yargs (processArgs, cwd, parentRequire) {`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`if (typeof keys === 'number') {`
`321`		`- self.demandCommand(keys, max, msg)`
	`321`	`+ self.demandCommand(keys, max, msg, msg)`
`322`	`322`	`} else if (Array.isArray(keys)) {`
`323`	`323`	`keys.forEach(function (key) {`
`324`	`324`	`self.demandOption(key, msg)`