Skip to content

Commit 5756566

Browse files
mkp6781neiljp
authored andcommitted
tests: model: Improve test for _handle_update_emoji_event.
Improve `test__handle_update_emoji_event` by specifying expected emoji type in active emoji data for variations in emoji data.
1 parent 00c8993 commit 5756566

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

tests/model/test_model.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2144,37 +2144,38 @@ def test_generate_all_emoji_data(self, mocker, model, zulip_emoji,
21442144
assert all_emoji_data['zulip']['type'] == 'zulip_extra_emoji'
21452145

21462146
@pytest.mark.parametrize(['to_vary_in_realm_emoji',
2147+
'expected_emoji_type',
21472148
'emoji_should_be_active'], [
21482149
({
21492150
"deactivated": False,
21502151
"id": "20",
21512152
"name": "joy_cat",
2152-
}, True),
2153+
}, 'realm_emoji', True),
21532154
({
21542155
"deactivated": True,
21552156
"id": "202020",
21562157
"name": "joker",
2157-
}, True),
2158+
}, 'unicode_emoji', True),
21582159
({
21592160
"deactivated": False,
21602161
"id": "22",
21612162
"name": "zulip",
2162-
}, True),
2163+
}, 'zulip_extra_emoji', True),
21632164
({
21642165
"deactivated": True,
21652166
"id": "4",
21662167
"name": "zulip",
2167-
}, True),
2168+
}, 'zulip_extra_emoji', True),
21682169
({
21692170
"deactivated": False,
21702171
"id": "23",
21712172
"name": "new_emoji",
2172-
}, True),
2173+
}, 'realm_emoji', True),
21732174
({
21742175
"deactivated": True,
21752176
"id": "3",
21762177
"name": "singing",
2177-
}, False),
2178+
}, '', False),
21782179
],
21792180
ids=[
21802181
'realm_emoji_with_same_name_as_unicode_emoji_added',
@@ -2187,6 +2188,7 @@ def test_generate_all_emoji_data(self, mocker, model, zulip_emoji,
21872188
)
21882189
def test__handle_update_emoji_event(self, mocker, model, realm_emojis,
21892190
emoji_should_be_active,
2191+
expected_emoji_type,
21902192
to_vary_in_realm_emoji):
21912193
emoji_name = to_vary_in_realm_emoji['name']
21922194
realm_emojis[to_vary_in_realm_emoji['id']] = to_vary_in_realm_emoji
@@ -2199,6 +2201,8 @@ def test__handle_update_emoji_event(self, mocker, model, realm_emojis,
21992201

22002202
if emoji_should_be_active:
22012203
assert emoji_name in model.active_emoji_data
2204+
assert (model.active_emoji_data[emoji_name]['type']
2205+
== expected_emoji_type)
22022206
else:
22032207
assert emoji_name not in model.active_emoji_data
22042208

0 commit comments

Comments
 (0)