Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

event_schema: Extract check_user_status.

This commit is contained in:
Steve Howell 2020-07-18 15:15:23 +00:00 committed by Tim Abbott
parent 631adc5677
commit 3f25e52667
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/lib/event_schema.py
View File

@ -704,3 +704,13 @@ def check_update_message_flags(
) -> None:
_check_update_message_flags(var_name, event)
assert event["operation"] == operation
check_user_status = check_events_dict(
required_keys=[
("type", equals("user_status")),
("user_id", check_int),
("away", check_bool),
("status_text", check_string),
]
)

12
zerver/tests/test_events.py
View File

@ -115,6 +115,7 @@ from zerver.lib.event_schema import (
check_update_message,
check_update_message_embedded,
check_update_message_flags,
check_user_status,
)
from zerver.lib.events import apply_events, fetch_initial_state_data, post_process_state
from zerver.lib.markdown import MentionData
@ -829,13 +830,6 @@ class NormalActionsTest(BaseAction):
check_alert_words('events[0]', events[0])
def test_away_events(self) -> None:
checker = check_events_dict([
('type', equals('user_status')),
('user_id', check_int),
('away', check_bool),
('status_text', check_string),
])
client = get_client("website")
events = self.verify_action(
lambda: do_update_user_status(
@ -844,7 +838,7 @@ class NormalActionsTest(BaseAction):
status_text='out to lunch',
client_id=client.id))
checker('events[0]', events[0])
check_user_status('events[0]', events[0])
events = self.verify_action(
lambda: do_update_user_status(
@ -853,7 +847,7 @@ class NormalActionsTest(BaseAction):
status_text='',
client_id=client.id))
checker('events[0]', events[0])
check_user_status('events[0]', events[0])
def test_user_group_events(self) -> None:
user_group_add_checker = check_events_dict([