@@ -2144,37 +2144,38 @@ def test_generate_all_emoji_data(self, mocker, model, zulip_emoji,
2144
2144
assert all_emoji_data ['zulip' ]['type' ] == 'zulip_extra_emoji'
2145
2145
2146
2146
@pytest .mark .parametrize (['to_vary_in_realm_emoji' ,
2147
+ 'expected_emoji_type' ,
2147
2148
'emoji_should_be_active' ], [
2148
2149
({
2149
2150
"deactivated" : False ,
2150
2151
"id" : "20" ,
2151
2152
"name" : "joy_cat" ,
2152
- }, True ),
2153
+ }, 'realm_emoji' , True ),
2153
2154
({
2154
2155
"deactivated" : True ,
2155
2156
"id" : "202020" ,
2156
2157
"name" : "joker" ,
2157
- }, True ),
2158
+ }, 'unicode_emoji' , True ),
2158
2159
({
2159
2160
"deactivated" : False ,
2160
2161
"id" : "22" ,
2161
2162
"name" : "zulip" ,
2162
- }, True ),
2163
+ }, 'zulip_extra_emoji' , True ),
2163
2164
({
2164
2165
"deactivated" : True ,
2165
2166
"id" : "4" ,
2166
2167
"name" : "zulip" ,
2167
- }, True ),
2168
+ }, 'zulip_extra_emoji' , True ),
2168
2169
({
2169
2170
"deactivated" : False ,
2170
2171
"id" : "23" ,
2171
2172
"name" : "new_emoji" ,
2172
- }, True ),
2173
+ }, 'realm_emoji' , True ),
2173
2174
({
2174
2175
"deactivated" : True ,
2175
2176
"id" : "3" ,
2176
2177
"name" : "singing" ,
2177
- }, False ),
2178
+ }, '' , False ),
2178
2179
],
2179
2180
ids = [
2180
2181
'realm_emoji_with_same_name_as_unicode_emoji_added' ,
@@ -2187,6 +2188,7 @@ def test_generate_all_emoji_data(self, mocker, model, zulip_emoji,
2187
2188
)
2188
2189
def test__handle_update_emoji_event (self , mocker , model , realm_emojis ,
2189
2190
emoji_should_be_active ,
2191
+ expected_emoji_type ,
2190
2192
to_vary_in_realm_emoji ):
2191
2193
emoji_name = to_vary_in_realm_emoji ['name' ]
2192
2194
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,
2199
2201
2200
2202
if emoji_should_be_active :
2201
2203
assert emoji_name in model .active_emoji_data
2204
+ assert (model .active_emoji_data [emoji_name ]['type' ]
2205
+ == expected_emoji_type )
2202
2206
else :
2203
2207
assert emoji_name not in model .active_emoji_data
2204
2208
0 commit comments