updated tests

Author: AllenAnthes

src/app.py

@@ -19,10 +19,9 @@
 # COMMUNITY_CHANNEL = config('PERSONAL_PRIVATE_CHANNEL')
 
 TOKEN = config('OPCODE_APP_TOKEN')
-# TOKEN = config('TOKEN')
-# COMMUNITY_CHANNEL = config('OPCODE_COMMUNITY_ID')
 COMMUNITY_CHANNEL = config('OPCODE_REWRITE_CHANNEL')
 PROJECTS_CHANNEL = config('OPCODE_OC_PROJECTS_CHANNEL')
+# COMMUNITY_CHANNEL = config('OPCODE_COMMUNITY_ID')
 
 PROXY = PROXY if PROXY else None
 slack_client = SlackClient(TOKEN, proxies=PROXY)
@@ -40,9 +39,9 @@ def event_handler(event_dict: dict) -> None:
     :param event_dict:
     """
     # all_event_logger.info(event_dict)
-    # if event_dict['type'] == 'team_join':
-    #     new_event_logger.info('New member event recieved')
-    #     new_member(event_dict)
+    if event_dict['type'] == 'team_join':
+        new_event_logger.info('New member event recieved')
+        new_member(event_dict)
 
     """ Trigger for testing team_join event """
     if event_dict['type'] == 'message' and 'user' in event_dict.keys() and event_dict['text'] == 'testgreet':
@@ -106,7 +105,7 @@ def new_member(event_dict: dict) -> None:
     response = slack_client.api_call('chat.postMessage',
                                      channel=user_id,
                                      # channel=COMMUNITY_CHANNEL, #  testing option
-                                     # as_user=True,
+                                     # as_user=True,  # Currently not working.  DM comes from my account
                                      text=custom_message)
 
     r2 = slack_client.api_call('chat.postMessage',
@@ -116,9 +115,9 @@ def new_member(event_dict: dict) -> None:
                                **HELP_MENU)
 
     # Notify #community
-    # text = f":tada: <@{user_id}> has joined the Slack team :tada:"
-    # slack_client.api_call('chat.postMessage', channel=COMMUNITY_CHANNEL,
-    #                       text=text, attachments=needs_greet_button())
+    text = f":tada: <@{user_id}> has joined the Slack team :tada:"
+    slack_client.api_call('chat.postMessage', channel=COMMUNITY_CHANNEL,
+                          text=text, attachments=needs_greet_button())
 
     if response['ok']:
         new_event_logger.info('New Member Slack response: Response 1: {} \nResponse2: {}'.format(response, r2))
@@ -161,12 +160,11 @@ def join_channels():
 
 
 # set the defalt to a 1 second delay
-def run_bot(delay: int=1):
+def run_bot(delay: int=1) -> None:
     """
     Runs the bot using the Slack Real Time Messaging API.
     **Doesn't provide events or interactive functionality
     :param delay:
-    :return:
     """
     setup_logging()
     if slack_client.rtm_connect():

tests/test_basic_functionality.py

@@ -4,6 +4,7 @@
 import logging
 
 from src import app
+from src.messages import HELP_MENU
 from .test_data import *
 
 
@@ -72,33 +73,33 @@ def test_user_name_from_id_no_name_return_new_member(self, mock_client):
 @mock.patch('src.app.build_message', return_value=MESSAGE)
 class NewMemberTestCase(unittest.TestCase):
 
-
     @mock.patch('src.app.slack_client.api_call', return_value={'ok': True, 'info': 'stuff goes here'})
     def test_event_logged(self, mock_client, mock_builder, mock_username_from_id):
         """
         Asserts messages are being logged properly when new_member is called
         """
         with LogCapture() as capture:
+            message = MESSAGE.format(real_name="bob")
             app.new_member(NEW_MEMBER)
             capture.check(
                 ('src.app.new_member', 'INFO', 'Recieved json event: {}'.format(NEW_MEMBER)),
                 ('root', 'INFO', 'team_join message'),
-                ('src.app.new_member', 'INFO', 'Built message: {}'.format(MESSAGE)),
+                ('src.app.new_member', 'INFO', 'Built message: {}'.format(message)),
                 ('src.app.new_member', 'INFO',
-                 'New Member Slack response: {}'.format({'ok': True, 'info': 'stuff goes here'}))
+                 'New Member Slack response: Response 1: {res} \nResponse2: {res}'.format(
+                     res={'ok': True, 'info': 'stuff goes here'}))
             )
 
     @mock.patch('src.app.slack_client')
     def test_slack_client_called_with_correct_params(self, mock_client, mock_builder, mock_unfi):
         """
-        Asserts new_member calls the client api with correct params.
+        Asserts new_member calls the client api with correct params for help menu.
         """
         with LogCapture() as capture:
             app.new_member(NEW_MEMBER)
-
-        mock_client.api_call.assert_called_with('chat.postMessage',
-                                                channel=NEW_MEMBER['user']['id'],
-                                                text=MESSAGE, as_user=True)
+        mock_client.api_call.assert_any_call('chat.postMessage',
+                                             channel=NEW_MEMBER['user']['id'],
+                                             **HELP_MENU)
 
     #
     @mock.patch('src.app.slack_client.api_call', return_value={'ok': False, 'info': 'stuff goes here'})