From b459586d96ec1f765d7aed86538b8d8576977f6c Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Tue, 2 Apr 2019 09:58:56 +0200 Subject: Cleanup tests and make them compatible with python 3 This mainly adds team, channel_general and user_alice as fixtures, so we can use those directly instead of picking arbitrary ones from the lists. It also adds assertions to some tests which where missing it. --- _pytest/test_process_message.py | 58 +++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 26 deletions(-) (limited to '_pytest/test_process_message.py') diff --git a/_pytest/test_process_message.py b/_pytest/test_process_message.py index 4dc24e5..6209cdf 100644 --- a/_pytest/test_process_message.py +++ b/_pytest/test_process_message.py @@ -2,49 +2,55 @@ from __future__ import print_function, unicode_literals import json -from wee_slack import render +from wee_slack import render, SlackTS -def test_process_message(realish_eventrouter, mock_websocket): - - e = realish_eventrouter - - t = e.teams.keys()[0] - u = e.teams[t].users.keys()[0] - - user = e.teams[t].users[u] - #print(user) - - socket = mock_websocket - e.teams[t].ws = socket +def test_process_message(realish_eventrouter, team, user_alice): messages = [] messages.append(json.loads(open('_pytest/data/websocket/1485975421.33-message.json', 'r').read())) # test message and then change - messages.append(json.loads(open('_pytest/data/websocket/1485976157.18-message.json', 'r').read())) messages.append(json.loads(open('_pytest/data/websocket/1485976151.6-message.json', 'r').read())) + messages.append(json.loads(open('_pytest/data/websocket/1485976157.18-message.json', 'r').read())) # test message then deletion messages.append(json.loads(open('_pytest/data/websocket/1485975698.45-message.json', 'r').read())) messages.append(json.loads(open('_pytest/data/websocket/1485975723.85-message.json', 'r').read())) for m in messages: - m["user"] = user.id - socket.add(m) + m["user"] = user_alice.id + team.ws.add(m) + + realish_eventrouter.receive_ws_callback(team.team_hash) + realish_eventrouter.handle_next() + + realish_eventrouter.receive_ws_callback(team.team_hash) + realish_eventrouter.handle_next() - e.receive_ws_callback(t) - e.handle_next() + realish_eventrouter.receive_ws_callback(team.team_hash) + realish_eventrouter.handle_next() - e.receive_ws_callback(t) - e.handle_next() + realish_eventrouter.receive_ws_callback(team.team_hash) + realish_eventrouter.handle_next() - e.receive_ws_callback(t) - e.handle_next() + realish_eventrouter.receive_ws_callback(team.team_hash) + realish_eventrouter.handle_next() - e.receive_ws_callback(t) - e.handle_next() + assert sum([len(channel.messages) for channel in team.channels.values()]) == 3 + unchanged_message_channel = team.channels['D3ZEQULHZ'] + unchanged_message_ts = SlackTS('1485975421.000002') + assert list(unchanged_message_channel.messages.keys()) == [unchanged_message_ts] + assert unchanged_message_channel.messages[unchanged_message_ts].message_json['text'] == 'hi bob' + assert 'edited' not in unchanged_message_channel.messages[unchanged_message_ts].message_json - #assert e.teams[t].channels['C407ABS94'].messages.keys()[0] == '1485976151.00016' - #assert False + changed_message_channel = team.channels['C407ABS94'] + changed_message_ts = SlackTS('1485976151.000016') + assert list(changed_message_channel.messages.keys()) == [changed_message_ts] + assert changed_message_channel.messages[changed_message_ts].message_json['text'] == 'referencing a <#C407ABS94|general>' + assert 'edited' in changed_message_channel.messages[changed_message_ts].message_json + deleted_message_channel = team.channels['G3ZGMF4RZ'] + deleted_message_ts = SlackTS('1485975698.000002') + assert list(deleted_message_channel.messages.keys()) == [deleted_message_ts] + assert deleted_message_channel.messages[deleted_message_ts].message_json['text'] == '(deleted)' -- cgit