Update tests

Author: AllenAnthes

tests/conftest.py

@@ -22,8 +22,8 @@ def action(request):
 
 
 @pytest.fixture
-async def bot(loop):
-    b = SirBot(loop=loop)
+async def bot(loop) -> SirBot:
+    b = SirBot()
     slack = SlackPlugin(
         token='token',
         verify='supersecuretoken',
@@ -37,8 +37,9 @@ async def bot(loop):
 
     return b
 
+
 @pytest.fixture
-async def slack_bot(bot):
+async def slack_bot(bot: SirBot):
     slack = SlackPlugin(
         token='token',
         verify='supersecuretoken',
@@ -47,3 +48,4 @@ async def slack_bot(bot):
     )
     endpoints.slack.create_endpoints(slack)
     bot.load_plugin(slack)
+    return bot

tests/test_slack_actions.py

@@ -2,7 +2,7 @@
 from sirbot import SirBot
 
 
-async def test_claim_mentee_response_attachment_is_list(action: dict, test_client, bot: SirBot):
+async def test_claim_mentee_response_attachment_is_list(action: dict, aiohttp_client, bot: SirBot):
     slack_mock = CoroutineMock(return_value={"user": {"profile": {"email": "email@email.com"}}})
     airtable_mock = CoroutineMock(return_value="U123")
     bot['plugins']['slack'].api.query = slack_mock
@@ -11,7 +11,6 @@ async def test_claim_mentee_response_attachment_is_list(action: dict, test_clien
     bot['plugins']['airtable'].api.get_name_from_record_id = airtable_mock
     bot['plugins']['airtable'].api.get_row_from_record_id = airtable_mock
 
-    client = await test_client(bot)
+    client = await aiohttp_client(bot)
     await client.post('/slack/actions', data=action)
     assert isinstance(slack_mock.call_args[0][1]['attachments'], list)
-

tests/test_slack_events.py

@@ -17,7 +17,7 @@ async def test_team_join_handler_exists(bot):
     )
 
 
-async def test_team_join_waits_30_seconds(bot, test_client):
+async def test_team_join_waits_30_seconds(bot, aiohttp_client):
     asyncio.sleep = CoroutineMock()
     create_endpoints(bot['plugins']['slack'])
     bot['plugins']['slack'] = CoroutineMock()
@@ -26,24 +26,24 @@ async def test_team_join_waits_30_seconds(bot, test_client):
     asyncio.sleep.assert_awaited_with(30)
 
 
-async def test_edits_are_logged(bot, test_client, caplog):
-    client = await test_client(bot)
+async def test_edits_are_logged(bot, aiohttp_client, caplog):
+    client = await aiohttp_client(bot)
 
     with caplog.at_level(logging.INFO):
         await client.post('/slack/events', json=MESSAGE_EDIT)
     assert any('CHANGE_LOGGING: edited' in record.message for record in caplog.records)
 
 
-async def test_deletes_are_logged(bot, test_client, caplog):
-    client = await test_client(bot)
+async def test_deletes_are_logged(bot, aiohttp_client, caplog):
+    client = await aiohttp_client(bot)
 
     with caplog.at_level(logging.INFO):
         await client.post('/slack/events', json=MESSAGE_DELETE)
     assert any('CHANGE_LOGGING: deleted' in record.message for record in caplog.records)
 
 
-async def test_no_other_messages_logged(bot, test_client, caplog):
-    client = await test_client(bot)
+async def test_no_other_messages_logged(bot, aiohttp_client, caplog):
+    client = await aiohttp_client(bot)
 
     with caplog.at_level(logging.INFO):
         await client.post('/slack/events', json=PLAIN_MESSAGE)