Merge branch 'master' of github.com:howdyai/botkit

howdyai · Jun 19, 2017 · 672aaad · 672aaad
2 parents c1afb76 + 9dd0980
commit 672aaad
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 21 deletions.
diff --git a/__test__/lib/Botkit.test.js b/__test__/lib/Botkit.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 let botkit;
 
 jest.mock('../../lib/CoreBot', () => 'corebot');

diff --git a/__test__/lib/Slack_web_api.test.js b/__test__/lib/Slack_web_api.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 let slackWebApi;
 let mockRequest;
 let mockResponse;
@@ -172,7 +174,20 @@ describe('postForm', () => {
             expect(cb).toHaveBeenCalledWith(error);
         });
 
-        test(`${methodName}: handles non 200 response code`, () => {
+        test(`${methodName}: handles 429 response code`, () => {
+            mockRequest.post.mockImplementation((params, callback) => {
+                callback(null, { statusCode: 429 }, null);
+            });
+
+            method('some.action', 'data', cb);
+
+            expect(mockRequest.post).toHaveBeenCalledTimes(1);
+            expect(cb).toHaveBeenCalledTimes(1);
+            const firstArg = cb.mock.calls[0][0];
+            expect(firstArg.message).toBe('Rate limit exceeded');
+        });
+
+        test(`${methodName}: handles other response codes`, () => {
             mockRequest.post.mockImplementation((params, callback) => {
                 callback(null, { statusCode: 400 }, null);
             });
@@ -206,7 +221,7 @@ describe('postForm', () => {
             method('some.action', 'data', cb);
 
             expect(mockRequest.post).toHaveBeenCalledTimes(1);
-            expect(cb).toHaveBeenCalledWith('not ok', { ok: false, error: 'not ok'});
+            expect(cb).toHaveBeenCalledWith('not ok', { ok: false, error: 'not ok' });
         });
     });
 });
@@ -219,7 +234,7 @@ describe('api methods', () => {
         instance = slackWebApi(mockBot, {});
         cb = jest.fn();
         jest.spyOn(instance, 'callAPI');
-        instance.callAPI.mockImplementation(() => {});
+        instance.callAPI.mockImplementation(() => { });
     });
 
     afterEach(() => {
@@ -253,41 +268,41 @@ describe('api methods', () => {
     describe('special cases', () => {
 
         test('chat.postMessage stringifies attachments', () => {
-            instance.chat.postMessage({attachments: []}, cb);
-            expect(instance.callAPI).toHaveBeenCalledWith('chat.postMessage', {attachments: '[]'}, cb);
+            instance.chat.postMessage({ attachments: [] }, cb);
+            expect(instance.callAPI).toHaveBeenCalledWith('chat.postMessage', { attachments: '[]' }, cb);
         });
 
         test('chat.postMessage handles attachments as Strings', () => {
             jest.spyOn(JSON, 'stringify');
-            instance.chat.postMessage({attachments: 'string'}, cb);
-            expect(instance.callAPI).toHaveBeenCalledWith('chat.postMessage', {attachments: 'string'}, cb);
+            instance.chat.postMessage({ attachments: 'string' }, cb);
+            expect(instance.callAPI).toHaveBeenCalledWith('chat.postMessage', { attachments: 'string' }, cb);
             expect(JSON.stringify).not.toHaveBeenCalled();
         });
 
         test('chat.postMessage handles attachments stringification errors', () => {
             const error = new Error('WHOOPSIE');
             jest.spyOn(JSON, 'stringify').mockImplementation(() => { throw error; });
-            instance.chat.postMessage({attachments: []}, cb);
+            instance.chat.postMessage({ attachments: [] }, cb);
             expect(instance.callAPI).toHaveBeenCalledWith('chat.postMessage', {}, cb);
             expect(JSON.stringify).toHaveBeenCalled();
         });
 
         test('chat.update stringifies attachments', () => {
-            instance.chat.update({attachments: []}, cb);
-            expect(instance.callAPI).toHaveBeenCalledWith('chat.update', {attachments: '[]'}, cb);
+            instance.chat.update({ attachments: [] }, cb);
+            expect(instance.callAPI).toHaveBeenCalledWith('chat.update', { attachments: '[]' }, cb);
         });
 
         test('chat.update handles attachments as Strings', () => {
             jest.spyOn(JSON, 'stringify');
-            instance.chat.update({attachments: 'string'}, cb);
-            expect(instance.callAPI).toHaveBeenCalledWith('chat.update', {attachments: 'string'}, cb);
+            instance.chat.update({ attachments: 'string' }, cb);
+            expect(instance.callAPI).toHaveBeenCalledWith('chat.update', { attachments: 'string' }, cb);
             expect(JSON.stringify).not.toHaveBeenCalled();
         });
 
         test('chat.postMessage handles attachments stringification errors', () => {
             const error = new Error('WHOOPSIE');
             jest.spyOn(JSON, 'stringify').mockImplementation(() => { throw error; });
-            instance.chat.update({attachments: []}, cb);
+            instance.chat.update({ attachments: [] }, cb);
             expect(instance.callAPI).toHaveBeenCalledWith('chat.update', {}, cb);
             expect(JSON.stringify).toHaveBeenCalled();
         });

diff --git a/docs/provisioning/cisco-spark.md b/docs/provisioning/cisco-spark.md
@@ -18,7 +18,9 @@ Take note of the bot username, you'll need it later.
 
 **Note about your icon**: Cisco requires you host an avatar for your bot before you can create it in their portal. This bot needs to be a 512x512px image icon hosted anywhere on the web. This can be changed later.
 
-You can copy and paste this URL for a Botkit icon you can use right away: `https://raw.githubusercontent.com/howdyai/botkit-starter-ciscospark/master/public/default_icon.png`
+You can copy and paste this URL for a Botkit icon you can use right away: 
+
+https://raw.githubusercontent.com/howdyai/botkit-starter-ciscospark/master/public/default_icon.png
 
 ### 3. Copy your access token
 

diff --git a/lib/CoreBot.js b/lib/CoreBot.js
@@ -1007,7 +1007,7 @@ function Botkit(configuration) {
         }
 
         if (typeof(events) == 'string') {
-            events = events.split(/\,/g).map(function(str) { return str.trim() })
+            events = events.split(/\,/g).map(function(str) { return str.trim(); });
         }
 
         for (var e = 0; e < events.length; e++) {

diff --git a/lib/SlackBot.js b/lib/SlackBot.js
@@ -168,6 +168,8 @@ function Slackbot(configuration) {
                             cb(null, found_team);
                         }
                     });
+                } else {
+                    cb(new Error(`could not find team ${team_id}`));
                 }
             }
         });

diff --git a/lib/Slack_web_api.js b/lib/Slack_web_api.js
@@ -3,7 +3,7 @@ var request = require('request');
 /**
  * Does nothing. Takes no params, returns nothing. It's a no-op!
  */
-function noop() {}
+function noop() { }
 
 /**
  * Returns an interface to the Slack API in the context of the given bot
@@ -187,7 +187,7 @@ module.exports = function(bot, config) {
     };
 
     function sanitizeOptions(options) {
-        if (options.attachments && typeof(options.attachments) != 'string') {
+        if (options.attachments && typeof (options.attachments) != 'string') {
             try {
                 options.attachments = JSON.stringify(options.attachments);
             } catch (err) {
@@ -227,10 +227,11 @@ module.exports = function(bot, config) {
 
         request.post(params, function(error, response, body) {
             bot.debug('Got response', error, body);
-            if(response.statusCode == 429) {
-                return cb(new Error('Rate limit exceeded'));
+            if (error) {
+                return cb(error);
             }
-            if (!error && response.statusCode == 200) {
+
+            if (response.statusCode == 200) {
                 var json;
                 try {
                     json = JSON.parse(body);
@@ -239,8 +240,11 @@ module.exports = function(bot, config) {
                 }
 
                 return cb((json.ok ? null : json.error), json);
+            } else if (response.statusCode == 429) {
+                return cb(new Error('Rate limit exceeded'));
+            } else {
+                return cb(new Error('Invalid response'));
             }
-            return cb(error || new Error('Invalid response'));
         });
     }
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -168,6 +168,8 @@ function Slackbot(configuration) { @@
                                 cb(null, found_team);
                             }
                         });
+                    } else {
+                        cb(new Error(`could not find team ${team_id}`));
                     }
                 }
             });
@@ Expand Down @@