Fix bug with greeting [BOTKIT]

features/greeting/index.js

@@ -4,8 +4,11 @@ const replies = require('./replies.js')
 const randomArrayItem = array => array[Math.floor(Math.random() * array.length)]
 
 module.exports = (controller) => {
+  const matchKeys = queries.join('|')
+  const regexp = new RegExp(`\\b(${matchKeys})\\b`, 'i')
+
   controller.hears(
-    queries,
+    regexp,
     ['message', 'direct_message'],
     async (bot, message) => {
       await bot.reply(message, { text: randomArrayItem(replies) })

features/greeting/queries.js

@@ -2,7 +2,7 @@ module.exports = [
   'Hello',
   'Good morning',
   'G\'day',
-  '\^Hi\$',
+  'Hi',
   'Morning',
   'Hey',
 ]

package.json

@@ -9,10 +9,10 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "botbuilder-adapter-slack": "^1.0.2",
+    "botbuilder-adapter-slack": "^1.0.7",
     "botbuilder-storage-mongodb": "^0.9.5",
-    "botkit": "^4.0.1",
-    "botkit-mock": "^0.1.11",
+    "botkit": "^4.6.1",
+    "botkit-mock": "^4.0.0",
     "botkit-plugin-cms": "^1.0.0",
     "dotenv": "^7.0.0"
   },

specs/greeting_spec.js

@@ -1,40 +1,52 @@
 const assert = require('assert')
-const Botmock = require('botkit-mock')
 
+const { getBasicController } = require('./helpers')
 const greetingController = require('../features/greeting')
 const replies = require('../features/greeting/replies.js')
 
 describe('Sample hears controller', () => {
   beforeEach(() => {
-    this.controller = Botmock({})
-    this.bot = this.controller.spawn({ type: 'slack' })
+    this.controller = getBasicController()
     greetingController(this.controller)
   })
 
-  it(
-    'Should return any greeting if user types `hi`',
-    () => this.bot.usersInput([{
+  it('Should return any greeting if user types `hi`', async () => {
+    await this.controller.usersInput([{
+      type: 'message',
+      channel: 'channel',
       messages: [{
         text: 'hi', isAssertion: true,
       }],
     }]).then(message => assert(replies.includes(message.text)))
-  )
+  })
+
+  it('Shouldn\'t return any greeting if user types `Morning` in one line code block', async () => {
+    await this.controller.usersInput([{
+      type: 'message',
+      channel: 'channel',
+      messages: [{
+        text: '`Morning`', isAssertion: true,
+      }],
+    }]).then(message => assert.deepEqual(message, {}))
+  })
 
-  it(
-    "Shouldn't return any greeting if user types hi in one line code block",
-    () =>this.bot.usersInput([{
+  it('Shouldn\'t return any greeting if user types `Morning` in multiline code block', async () => {
+    await this.controller.usersInput([{
+      type: 'message',
+      channel: 'channel',
       messages: [{
-        text: '`hi`', isAssertion: true,
+        text: '```Morning```', isAssertion: true,
       }],
     }]).then(message => assert.deepEqual(message, {}))
-  )
+  })
 
-  it(
-    "Shouldn't return any greeting if user types hi in multiline code block",
-    () => this.bot.usersInput([{
+  it('Shouldn\'t return any greeting if user types a word that includes greeting word', async () => {
+    await this.controller.usersInput([{
+      type: 'message',
+      channel: 'channel',
       messages: [{
-        text: '```hi```', isAssertion: true,
+        text: 'they', isAssertion: true,
       }],
     }]).then(message => assert.deepEqual(message, {}))
-  )
+  })
 })

specs/helpers/getBasicController.js

@@ -0,0 +1,26 @@
+const { BotMock, SlackApiMock } = require('botkit-mock')
+const { SlackAdapter, SlackMessageTypeMiddleware, SlackEventMiddleware } = require('botbuilder-adapter-slack');
+
+const { removeCodeFromMessage } = require('../../lib/middleware');
+
+module.exports = () => {
+  const adapter = new SlackAdapter({
+    clientSigningSecret: "secret",
+    botToken: "token",
+    debug: true
+  });
+
+  adapter.use(new SlackEventMiddleware())
+  adapter.use(new SlackMessageTypeMiddleware())
+
+  const controller = new BotMock({
+    adapter: adapter,
+    disable_webserver: true
+  });
+
+  controller.middleware.ingest.use(removeCodeFromMessage)
+
+  SlackApiMock.bindMockApi(controller)
+
+  return controller
+}

specs/helpers/index.js

@@ -0,0 +1,5 @@
+const getBasicController = require('./getBasicController')
+
+module.exports = {
+  getBasicController,
+}

specs/mention_spec.js

@@ -1,23 +1,24 @@
+const { BotMock, SlackApiMock } = require('botkit-mock')
 const assert = require('assert')
-const Botmock = require('botkit-mock')
 
+const { getBasicController } = require('./helpers')
 const mentionController = require('../features/mention.js')
 const replies = require('../features/mention/replies')
+const { removeCodeFromMessage } = require('../lib/middleware')
 
 describe('Mention controller', () => {
   beforeEach(() => {
-    this.controller = Botmock({})
-    this.bot = this.controller.spawn({ type: 'slack' })
+    this.controller = getBasicController()
     mentionController(this.controller)
   })
 
-  it(
-    'should return one of mention responds if user mentions bot',
-    () => this.bot.usersInput([{
+  it('should return one of mention responds if user mentions bot', async () => {
+    await this.controller.usersInput([{
       type: 'direct_mention',
+      channel: 'channel',
       messages: [{
         text: 'bot', isAssertion: true,
       }],
     }]).then(message => assert(replies.includes(message.text)))
-  )
+  })
 })