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

event_schema: Extract check_invites_changed.

This commit is contained in:
Steve Howell 2020-07-18 14:33:03 +00:00 committed by Tim Abbott
parent ec17091521
commit 5f3ea0a659
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/event_schema.py
View File

@ -109,6 +109,13 @@ check_optional_value = check_union(
] ]
) )
check_invites_changed = check_events_dict(
required_keys=[
# the most boring event...no metadata
("type", equals("invites_changed")),
]
)
message_fields = [ message_fields = [
("avatar_url", check_none_or(check_string)), ("avatar_url", check_none_or(check_string)),
("client", check_string), ("client", check_string),

31
zerver/tests/test_events.py
View File

@ -92,6 +92,7 @@ from zerver.lib.actions import (
from zerver.lib.event_schema import ( from zerver.lib.event_schema import (
basic_stream_fields, basic_stream_fields,
check_events_dict, check_events_dict,
check_invites_changed,
check_message, check_message,
check_reaction, check_reaction,
check_realm_bot_add, check_realm_bot_add,
@ -533,10 +534,6 @@ class NormalActionsTest(BaseAction):
check_reaction('events[0]', events[0], 'remove') check_reaction('events[0]', events[0], 'remove')
def test_invite_user_event(self) -> None: def test_invite_user_event(self) -> None:
schema_checker = check_events_dict([
('type', equals('invites_changed')),
])
self.user_profile = self.example_user('iago') self.user_profile = self.example_user('iago')
streams = [] streams = []
for stream_name in ["Denmark", "Scotland"]: for stream_name in ["Denmark", "Scotland"]:
@ -545,13 +542,9 @@ class NormalActionsTest(BaseAction):
lambda: do_invite_users(self.user_profile, ["foo@zulip.com"], streams, False), lambda: do_invite_users(self.user_profile, ["foo@zulip.com"], streams, False),
state_change_expected=False, state_change_expected=False,
) )
schema_checker('events[0]', events[0]) check_invites_changed('events[0]', events[0])
def test_create_multiuse_invite_event(self) -> None: def test_create_multiuse_invite_event(self) -> None:
schema_checker = check_events_dict([
('type', equals('invites_changed')),
])
self.user_profile = self.example_user('iago') self.user_profile = self.example_user('iago')
streams = [] streams = []
for stream_name in ["Denmark", "Verona"]: for stream_name in ["Denmark", "Verona"]:
@ -561,13 +554,9 @@ class NormalActionsTest(BaseAction):
lambda: do_create_multiuse_invite_link(self.user_profile, PreregistrationUser.INVITE_AS['MEMBER'], streams), lambda: do_create_multiuse_invite_link(self.user_profile, PreregistrationUser.INVITE_AS['MEMBER'], streams),
state_change_expected=False, state_change_expected=False,
) )
schema_checker('events[0]', events[0]) check_invites_changed('events[0]', events[0])
def test_revoke_user_invite_event(self) -> None: def test_revoke_user_invite_event(self) -> None:
schema_checker = check_events_dict([
('type', equals('invites_changed')),
])
self.user_profile = self.example_user('iago') self.user_profile = self.example_user('iago')
streams = [] streams = []
for stream_name in ["Denmark", "Verona"]: for stream_name in ["Denmark", "Verona"]:
@ -578,13 +567,9 @@ class NormalActionsTest(BaseAction):
lambda: do_revoke_user_invite(prereg_users[0]), lambda: do_revoke_user_invite(prereg_users[0]),
state_change_expected=False, state_change_expected=False,
) )
schema_checker('events[0]', events[0]) check_invites_changed('events[0]', events[0])
def test_revoke_multiuse_invite_event(self) -> None: def test_revoke_multiuse_invite_event(self) -> None:
schema_checker = check_events_dict([
('type', equals('invites_changed')),
])
self.user_profile = self.example_user('iago') self.user_profile = self.example_user('iago')
streams = [] streams = []
for stream_name in ["Denmark", "Verona"]: for stream_name in ["Denmark", "Verona"]:
@ -596,15 +581,11 @@ class NormalActionsTest(BaseAction):
lambda: do_revoke_multi_use_invite(multiuse_object), lambda: do_revoke_multi_use_invite(multiuse_object),
state_change_expected=False, state_change_expected=False,
) )
schema_checker('events[0]', events[0]) check_invites_changed('events[0]', events[0])
def test_invitation_accept_invite_event(self) -> None: def test_invitation_accept_invite_event(self) -> None:
reset_emails_in_zulip_realm() reset_emails_in_zulip_realm()
schema_checker = check_events_dict([
('type', equals('invites_changed')),
])
self.user_profile = self.example_user('iago') self.user_profile = self.example_user('iago')
streams = [] streams = []
for stream_name in ["Denmark", "Scotland"]: for stream_name in ["Denmark", "Scotland"]:
@ -625,7 +606,7 @@ class NormalActionsTest(BaseAction):
num_events=5, num_events=5,
) )
schema_checker('events[4]', events[4]) check_invites_changed('events[4]', events[4])
def test_typing_events(self) -> None: def test_typing_events(self) -> None:
schema_checker = check_events_dict([ schema_checker = check_events_dict([