updated to new test framework

earldouglas · Nov 28, 2015 · c0339eb · c0339eb
1 parent 1406839
commit c0339eb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/lib/listeners/message/help.js b/lib/listeners/message/help.js
@@ -9,11 +9,13 @@ Array.prototype.flatMap = function(lambda) {
 function loadHelp() {
   var help = fs.readdirSync(__dirname +'/../').flatMap(function(eventName) {
     var filepath = __dirname + '/../' + eventName;
+
+    // all js files that have exported 'help'
     var files = fs.readdirSync(filepath).filter(
                                                 function(file) { 
                                                   return /^[^\.].*.js$/.test(file) && 
                                                          require(filepath + '/' + file).help;
-                                                });
+                                                }); 
     return files.flatMap(
                          function(file) {
                            var f = require(filepath + '/' + file);
@@ -23,9 +25,11 @@ function loadHelp() {
   return help;
 }
 function messageListener(db, from, channel, message) {
+
   if (/^@help$/.test(message)) {
     var help = loadHelp();
-    return [ { to: channel, message: 'available commands: ' + help.map(function(h) {  return h.cmd; }).join(', ')}];
+    return [ { to: channel, 
+               message: 'Available commands: ' + help.map(function(h) {  return h.cmd; }).join(', ')}];
   }
   if (/^@help\s+(.+)$/.test(message)) {
 

diff --git a/lib/listeners/message/krypto.js b/lib/listeners/message/krypto.js
@@ -45,7 +45,8 @@ function messageListener(db, from, channel, message) {
 module.exports = messageListener;
 module.exports.help = [{ cmd:'@krypto',
                          syntax: '@krypto',
-                         output: {success: ['<user>: OK - take a guess.','<card>, <card>, <card>, <card>, <card> Objective Card: <card>'],
+                         output: {success: ['<user>: OK - take a guess.',
+                                            '<card>, <card>, <card>, <card>, <card> Objective Card: <card>'],
                                   failure: ['<user>: Sorry, but <user> already is guessing.']}
                        }, 
                        {cmd: '@cards', 

diff --git a/lib/listeners/message/tell.js b/lib/listeners/message/tell.js
@@ -40,4 +40,3 @@ function messageListener(db, from, channel, message) {
 }
 
 module.exports = messageListener;
-
diff --git a/lib/say-slowly.js b/lib/say-slowly.js
@@ -1,7 +1,6 @@
 'use strict';
 
 function say_slowly(say, channel, messages) {
-
   var msg = messages.shift();
 
   if (msg) {

diff --git a/test/sectry_test.js b/test/sectry_test.js
@@ -2,7 +2,6 @@
 
 var sectery   = require('../lib/sectery');
 var utilities = require('../lib/utilities');
-<<<<<<< HEAD
 var krypto    = require('../lib/krypto-game');
 var irc       = require('irc');
 
@@ -470,4 +469,16 @@ describe('sectery', function () {
     var command = '@poll ' + command + ' '  + id;
     testUser.message(command);
   });
+
+  it('@help', function(done) {
+
+    var command = '@help';
+
+    testUser.expectM(done, secteryUser.nick(), function (x) {
+      var regex = new RegExp('Available commands: .*');
+      log(x,regex);
+      return regex.test(x);
+    });
+    testUser.message(command);
+  });
 });