test coverage for the falsy check() usage

yargs · Nov 7, 2010 · 56b2b1d · 56b2b1d
1 parent a4843a9
commit 56b2b1d
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name" : "optimist",
-    "version" : "0.0.5",
+    "version" : "0.0.6",
     "description" : "Light-weight option parsing with an argv hash. No optstrings attached.",
     "modules" : {
         "index" : "./lib/optimist.js",

diff --git a/test/usage.js b/test/usage.js
@@ -36,7 +36,8 @@ exports.checkPass = function (assert) {
         return optimist('-x 10 -y 20'.split(' '))
             .usage('Usage: $0 -x NUM -y NUM')
             .check(function (argv) {
-                return 'x' in argv && 'y' in argv
+                if (!('x' in argv)) throw 'You forgot about -x';
+                if (!('y' in argv)) throw 'You forgot about -y';
             })
             .argv;
     });
@@ -66,6 +67,47 @@ exports.checkFail = function (assert) {
     });
 };
 
+exports.checkCondPass = function (assert) {
+    function checker (argv) {
+        return 'x' in argv && 'y' in argv;
+    }
+
+    var r = checkUsage(function () {
+        return optimist('-x 10 -y 20'.split(' '))
+            .usage('Usage: $0 -x NUM -y NUM')
+            .check(checker)
+            .argv;
+    });
+    assert.deepEqual(r, {
+        result : { x : 10, y : 20, _ : [], $0 : './usage' },
+        errors : [],
+        logs : [],
+        exit : false,
+    });
+};
+
+exports.checkCondFail = function (assert) {
+    function checker (argv) {
+        return 'x' in argv && 'y' in argv;
+    }
+
+    var r = checkUsage(function () {
+        return optimist('-x 10 -z 20'.split(' '))
+            .usage('Usage: $0 -x NUM -y NUM')
+            .check(checker)
+            .argv;
+    });
+    assert.deepEqual(r, {
+        result : { x : 10, z : 20, _ : [], $0 : './usage' },
+        errors : [
+            'Usage: ./usage -x NUM -y NUM',
+            'Argument check failed: ' + checker.toString()
+        ],
+        logs : [],
+        exit: true,
+    });
+};
+
 exports.countPass = function (assert) {
     var r = checkUsage(function () {
         return optimist('1 2 3 --moo'.split(' '))