test: use content event to get content instead of monkeypatching console

esatterwhite · Dec 26, 2017 · 8ee6f0e · 8ee6f0e
1 parent 66e5e33
commit 8ee6f0e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/lib/commands/help.js b/lib/commands/help.js
@@ -19,9 +19,9 @@ var os      = require('os')
  */
 var Help = new Command({
   description:"displays information about available commands"
-  ,interactive:false
-  ,alias:['hlep']
-  ,run: async function(cmd, data){
+, interactive:false
+, alias:['hlep']
+, run: async function(cmd, data){
     var commands
       , cls
       , instance

diff --git a/test/command.spec.js b/test/command.spec.js
@@ -97,7 +97,7 @@ test('command', function(t){
                 "  <...>: input type | *: repeatable flags | [...]: default values"
       ].join(os.EOL );
 
-      ttt.equal(out.trim(), strip( UsageCommand.usage ).trim() );
+      ttt.equal(strip( UsageCommand.usage ).trim(), out.trim() );
 
       commands.register('usage', UsageCommand)
       Help.removeAllListeners()
@@ -123,13 +123,13 @@ test('command', function(t){
       var UsageCommand = new Command({
         usage:[
           "usage -a 'fake' --verbose",
-          "usage -b 'tesk' --no-verbose",
+          "usage -b 'test' --no-verbose",
         ]
       });
 
       var out = [
         "usage -a 'fake' --verbose",
-        "usage -b 'tesk' --no-verbose",
+        "usage -b 'test' --no-verbose",
         "",
         "Options:",
         "",
@@ -138,7 +138,7 @@ test('command', function(t){
         "  ",
                 "  <...>: input type | *: repeatable flags | [...]: default values"
       ].join(os.EOL );
-      ttt.equal( out, strip( UsageCommand.usage ) );
+      ttt.equal(strip( UsageCommand.usage ), out);
       ttt.end()
     });
     tt.end()

diff --git a/test/seeli.spec.js b/test/seeli.spec.js
@@ -85,9 +85,7 @@ test('cli', function(t){
 
   t.test('#run', function(tt) {
     const help = cli.commands.help;
-    const log = console.log;
-    console.log = (str) => {
-      const data = String(str);
+    help.once('content', (data) => {
       if (/usage/i.test(data)) {
         const expected = [
           'Usage:  runner <command> [options]'
@@ -97,22 +95,13 @@ test('cli', function(t){
         ].join(os.EOL);
         tt.equal(data, expected);
         tt.end();
-      } else {
-        log(str);
       }
-    }
-    tt.on('end', () => {
-      help.reset();
-      console.log = log;
     });
+
     help.setOptions({
       args: ['--no-color']
     });
 
-    help.on('content', (content) => {
-      tt.pass('help called');
-    });
-
     cli.set({
       exitOnContent: false
     , name: 'runner'