paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

emoji.py: Refactor emoji data consistency checking functions.

Browse Source 
Inorder to provide more explicit error messages I have merged the
`emoji_code_is_valid()` and `emoji_name_is_valid()` functions into
`check_emoji_code_consistency()` and `check_emoji_name_consistency()`
respectively.
This commit is contained in:
Harshit Bansal
2017-11-19 06:07:29 +00:00
committed by Tim Abbott
parent 9a4d5fe1f8
commit 87b523f3ef
2 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zerver/tests/test_reactions.py
View File

@@ -428,7 +428,7 @@ class DefaultEmojiReactionTests(EmojiReactionBase):
'emoji_code': 'TBD',
}
result = self.post_reaction(reaction_info)
self.assert_json_error(result, 'Emoji for this emoji code not found.')
self.assert_json_error(result, 'No unicode emoji with this emoji code found.')
def test_add_default_emoji_invalid_name(self) -> None:
reaction_info = {
@@ -567,6 +567,15 @@ class ZulipExtraEmojiReactionTest(EmojiReactionBase):
result = self.post_zulip_reaction()
self.assert_json_error(result, 'Reaction already exists.')
def test_add_invalid_extra_emoji(self) -> None:
reaction_info = {
'emoji_name': 'extra_emoji',
'emoji_code': 'extra_emoji',
'reaction_type': 'zulip_extra_emoji',
}
result = self.post_reaction(reaction_info)
self.assert_json_error(result, 'No such extra emoji found.')
def test_delete_zulip_emoji(self) -> None:
result = self.post_zulip_reaction()
self.assert_json_success(result)
@@ -593,7 +602,7 @@ class RealmEmojiReactionTests(EmojiReactionBase):
'emoji_code': 'non_existent',
}
result = self.post_reaction(reaction_info)
self.assert_json_error(result, 'Emoji for this emoji code not found.')
self.assert_json_error(result, 'No such realm emoji found.')
def test_add_deactivated_realm_emoji(self) -> None:
emoji = RealmEmoji.objects.get(name="green_tick")
@@ -605,7 +614,7 @@ class RealmEmojiReactionTests(EmojiReactionBase):
'emoji_code': 'green_tick',
}
result = self.post_reaction(reaction_info)
self.assert_json_error(result, 'Emoji for this emoji code not found.')
self.assert_json_error(result, 'This realm emoji has been deactivated.')
def test_add_to_existing_deactivated_realm_emoji_reaction(self) -> None:
reaction_info = {
@@ -670,7 +679,7 @@ class RealmEmojiReactionTests(EmojiReactionBase):
result = self.client_post('/api/v1/messages/%s/reactions' % (message_id,),
reaction_info,
**self.api_auth(sender))
self.assert_json_error(result, "Emoji for this emoji code not found.")
self.assert_json_error(result, "Invalid emoji type.")
class ReactionAPIEventTest(EmojiReactionBase):
def test_add_event(self) -> None: