finally works

node_modules/optimist/test/usage.js

@@ -1,20 +1,20 @@
 var Hash = require('hashish');
 var optimist = require('../index');
-var assert = require('assert');
+var test = require('tap').test;
 
-exports.usageFail = function () {
+test('usageFail', function (t) {
     var r = checkUsage(function () {
         return optimist('-x 10 -z 20'.split(' '))
             .usage('Usage: $0 -x NUM -y NUM')
             .demand(['x','y'])
             .argv;
     });
-    assert.deepEqual(
+    t.same(
         r.result,
         { x : 10, z : 20, _ : [], $0 : './usage' }
     );
-    
-    assert.deepEqual(
+
+    t.same(
         r.errors.join('\n').split(/\n+/),
         [
             'Usage: ./usage -x NUM -y NUM',
@@ -24,26 +24,29 @@ exports.usageFail = function () {
             'Missing required arguments: y',
         ]
     );
-    assert.deepEqual(r.logs, []);
-    assert.ok(r.exit);
-};
+    t.same(r.logs, []);
+    t.ok(r.exit);
+    t.end();
+});
 
-exports.usagePass = function () {
+
+test('usagePass', function (t) {
     var r = checkUsage(function () {
         return optimist('-x 10 -y 20'.split(' '))
             .usage('Usage: $0 -x NUM -y NUM')
             .demand(['x','y'])
             .argv;
     });
-    assert.deepEqual(r, {
+    t.same(r, {
         result : { x : 10, y : 20, _ : [], $0 : './usage' },
         errors : [],
         logs : [],
         exit : false,
     });
-};
+    t.end();
+});
 
-exports.checkPass = function () {
+test('checkPass', function (t) {
     var r = checkUsage(function () {
         return optimist('-x 10 -y 20'.split(' '))
             .usage('Usage: $0 -x NUM -y NUM')
@@ -53,15 +56,16 @@ exports.checkPass = function () {
             })
             .argv;
     });
-    assert.deepEqual(r, {
+    t.same(r, {
         result : { x : 10, y : 20, _ : [], $0 : './usage' },
         errors : [],
         logs : [],
         exit : false,
     });
-};
+    t.end();
+});
 
-exports.checkFail = function () {
+test('checkFail', function (t) {
     var r = checkUsage(function () {
         return optimist('-x 10 -z 20'.split(' '))
             .usage('Usage: $0 -x NUM -y NUM')
@@ -71,110 +75,115 @@ exports.checkFail = function () {
             })
             .argv;
     });
-    
-    assert.deepEqual(
+
+    t.same(
         r.result,
         { x : 10, z : 20, _ : [], $0 : './usage' }
     );
-    
-    assert.deepEqual(
+
+    t.same(
         r.errors.join('\n').split(/\n+/),
         [
             'Usage: ./usage -x NUM -y NUM',
             'You forgot about -y'
         ]
     );
-    
-    assert.deepEqual(r.logs, []);
-    assert.ok(r.exit);
-};
 
-exports.checkCondPass = function () {
+    t.same(r.logs, []);
+    t.ok(r.exit);
+    t.end();
+});
+
+test('checkCondPass', function (t) {
     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, {
+    t.same(r, {
         result : { x : 10, y : 20, _ : [], $0 : './usage' },
         errors : [],
         logs : [],
         exit : false,
     });
-};
+    t.end();
+});
 
-exports.checkCondFail = function () {
+test('checkCondFail', function (t) {
     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(
+
+    t.same(
         r.result,
         { x : 10, z : 20, _ : [], $0 : './usage' }
     );
-    
-    assert.deepEqual(
+
+    t.same(
         r.errors.join('\n').split(/\n+/).join('\n'),
         'Usage: ./usage -x NUM -y NUM\n'
         + 'Argument check failed: ' + checker.toString()
     );
-    
-    assert.deepEqual(r.logs, []);
-    assert.ok(r.exit);
-};
 
-exports.countPass = function () {
+    t.same(r.logs, []);
+    t.ok(r.exit);
+    t.end();
+});
+
+test('countPass', function (t) {
     var r = checkUsage(function () {
         return optimist('1 2 3 --moo'.split(' '))
             .usage('Usage: $0 [x] [y] [z] {OPTIONS}')
             .demand(3)
             .argv;
     });
-    assert.deepEqual(r, {
+    t.same(r, {
         result : { _ : [ '1', '2', '3' ], moo : true, $0 : './usage' },
         errors : [],
         logs : [],
         exit : false,
     });
-};
+    t.end();
+});
 
-exports.countFail = function () {
+test('countFail', function (t) {
     var r = checkUsage(function () {
         return optimist('1 2 --moo'.split(' '))
             .usage('Usage: $0 [x] [y] [z] {OPTIONS}')
             .demand(3)
             .argv;
     });
-    assert.deepEqual(
+    t.same(
         r.result,
         { _ : [ '1', '2' ], moo : true, $0 : './usage' }
     );
-    
-    assert.deepEqual(
+
+    t.same(
         r.errors.join('\n').split(/\n+/),
         [
             'Usage: ./usage [x] [y] [z] {OPTIONS}',
             'Not enough non-option arguments: got 2, need at least 3',
         ]
     );
-    
-    assert.deepEqual(r.logs, []);
-    assert.ok(r.exit);
-};
 
-exports.defaultSingles = function () {
+    t.same(r.logs, []);
+    t.ok(r.exit);
+    t.end();
+});
+
+test('defaultSingles', function (t) {
     var r = checkUsage(function () {
         return optimist('--foo 50 --baz 70 --powsy'.split(' '))
             .default('foo', 5)
@@ -183,7 +192,7 @@ exports.defaultSingles = function () {
             .argv
         ;
     });
-    assert.eql(r.result, {
+    t.same(r.result, {
         foo : '50',
         bar : 6,
         baz : '70',
@@ -191,62 +200,89 @@ exports.defaultSingles = function () {
         _ : [],
         $0 : './usage',
     });
-};
+    t.end();
+});
 
-exports.defaultHash = function () {
+test('defaultAliases', function (t) {
+    var r = checkUsage(function () {
+        return optimist('')
+            .alias('f', 'foo')
+            .default('f', 5)
+            .argv
+        ;
+    });
+    t.same(r.result, {
+        f : '5',
+        foo : '5',
+        _ : [],
+        $0 : './usage',
+    });
+    t.end();
+});
+
+test('defaultHash', function (t) {
     var r = checkUsage(function () {
         return optimist('--foo 50 --baz 70'.split(' '))
             .default({ foo : 10, bar : 20, quux : 30 })
             .argv
         ;
     });
-    assert.eql(r.result, {
-        foo : '50',
-        bar : 20,
-        baz : 70,
-        quux : 30,
+    t.same(r.result, {
         _ : [],
         $0 : './usage',
+        foo : 50,
+        baz : 70,
+        bar : 20,
+        quux : 30,
     });
-};
+    t.end();
+});
 
-exports.rebase = function () {
-    assert.equal(
+test('rebase', function (t) {
+    t.equal(
         optimist.rebase('/home/substack', '/home/substack/foo/bar/baz'),
         './foo/bar/baz'
     );
-    assert.equal(
+    t.equal(
         optimist.rebase('/home/substack/foo/bar/baz', '/home/substack'),
         '../../..'
     );
-    assert.equal(
+    t.equal(
         optimist.rebase('/home/substack/foo', '/home/substack/pow/zoom.txt'),
         '../pow/zoom.txt'
     );
-};
+    t.end();
+});
 
 function checkUsage (f) {
-    var _process = process;
-    process = Hash.copy(process);
+
     var exit = false;
-    process.exit = function () { exit = true };
+
+    process._exit = process.exit;
+    process._env = process.env;
+    process._argv = process.argv;
+
+    process.exit = function (t) { exit = true };
     process.env = Hash.merge(process.env, { _ : 'node' });
     process.argv = [ './usage' ];
-    
+
     var errors = [];
     var logs = [];
-    
+
     console._error = console.error;
     console.error = function (msg) { errors.push(msg) };
     console._log = console.log;
     console.log = function (msg) { logs.push(msg) };
-    
+
     var result = f();
-    
-    process = _process;
+
+    process.exit = process._exit;
+    process.env = process._env;
+    process.argv = process._argv;
+
     console.error = console._error;
     console.log = console._log;
-    
+
     return {
         errors : errors,
         logs : logs,