paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

event_schema: Extract check_custom_profile_fields.

Browse Source
This commit is contained in:
Steve Howell
2020-07-18 15:02:28 +00:00
committed by Tim Abbott
parent 7176b90882
commit 0a9a9d8258
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
zerver/lib/event_schema.py
View File

@@ -109,6 +109,25 @@ check_optional_value = check_union(
] ]
) )
_check_custom_profile_field = check_dict_only(
required_keys=[
("id", check_int),
("type", check_int),
("name", check_string),
("hint", check_string),
("field_data", check_string),
("order", check_int),
]
)
check_custom_profile_fields = check_events_dict(
required_keys=[
("type", equals("custom_profile_fields")),
("op", equals("add")),
("fields", check_list(_check_custom_profile_field)),
]
)
check_invites_changed = check_events_dict( check_invites_changed = check_events_dict(
required_keys=[ required_keys=[
# the most boring event...no metadata # the most boring event...no metadata

18
zerver/tests/test_events.py
View File

@@ -91,6 +91,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_custom_profile_fields,
check_events_dict, check_events_dict,
check_invites_changed, check_invites_changed,
check_message, check_message,
@@ -618,25 +619,12 @@ class NormalActionsTest(BaseAction):
check_typing_start('events[0]', events[0]) check_typing_start('events[0]', events[0])
def test_custom_profile_fields_events(self) -> None: def test_custom_profile_fields_events(self) -> None:
schema_checker = check_events_dict([
('type', equals('custom_profile_fields')),
('op', equals('add')),
('fields', check_list(check_dict_only([
('id', check_int),
('type', check_int),
('name', check_string),
('hint', check_string),
('field_data', check_string),
('order', check_int),
]))),
])
events = self.verify_action( events = self.verify_action(
lambda: notify_realm_custom_profile_fields( lambda: notify_realm_custom_profile_fields(
self.user_profile.realm, 'add'), self.user_profile.realm, 'add'),
state_change_expected=False, state_change_expected=False,
) )
schema_checker('events[0]', events[0]) check_custom_profile_fields('events[0]', events[0])
realm = self.user_profile.realm realm = self.user_profile.realm
field = realm.customprofilefield_set.get(realm=realm, name='Biography') field = realm.customprofilefield_set.get(realm=realm, name='Biography')
@@ -649,7 +637,7 @@ class NormalActionsTest(BaseAction):
self.user_profile.realm, 'add'), self.user_profile.realm, 'add'),
state_change_expected=False, state_change_expected=False,
) )
schema_checker('events[0]', events[0]) check_custom_profile_fields('events[0]', events[0])
def test_custom_profile_field_data_events(self) -> None: def test_custom_profile_field_data_events(self) -> None:
schema_checker_basic = check_events_dict([ schema_checker_basic = check_events_dict([