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

alert_words: Change test_alert_words to use actions.do_*().

Browse Source 
Changing test_alert_words to use do_add_alert_words() and
do_remove_alert_words() from lib/actions.py instead of the
existing add_user_alert_words() and remove_user_alert_words()
as is the general policy of calling these functions when we
are updating the database.
This commit is contained in:
Abhishek-Balaji
2020-04-28 01:21:39 +05:30
committed by Tim Abbott
parent 976e554799
commit d3db174be9
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
zerver/tests/test_alert_words.py
View File

@@ -1,10 +1,13 @@
from zerver.lib.alert_words import ( from zerver.lib.alert_words import (
add_user_alert_words,
alert_words_in_realm, alert_words_in_realm,
remove_user_alert_words,
user_alert_words, user_alert_words,
) )
from zerver.lib.actions import (
do_add_alert_words,
do_remove_alert_words,
)
from zerver.lib.test_helpers import ( from zerver.lib.test_helpers import (
most_recent_message, most_recent_message,
most_recent_usermessage, most_recent_usermessage,
@@ -55,7 +58,7 @@ class AlertWordTests(ZulipTestCase):
self.assert_length(realm_alert_words.get(user.id, []), 0) self.assert_length(realm_alert_words.get(user.id, []), 0)
# Add several words, including multi-word and non-ascii words. # Add several words, including multi-word and non-ascii words.
add_user_alert_words(user, self.interesting_alert_word_list) do_add_alert_words(user, self.interesting_alert_word_list)
words = user_alert_words(user) words = user_alert_words(user)
self.assertEqual(set(words), set(self.interesting_alert_word_list)) self.assertEqual(set(words), set(self.interesting_alert_word_list))
@@ -63,14 +66,14 @@ class AlertWordTests(ZulipTestCase):
self.assert_length(realm_alert_words[user.id], 3) self.assert_length(realm_alert_words[user.id], 3)
# Test the case-insensitivity of adding words # Test the case-insensitivity of adding words
add_user_alert_words(user, set(["ALert", "ALERT"])) do_add_alert_words(user, set(["ALert", "ALERT"]))
words = user_alert_words(user) words = user_alert_words(user)
self.assertEqual(set(words), set(self.interesting_alert_word_list)) self.assertEqual(set(words), set(self.interesting_alert_word_list))
realm_alert_words = alert_words_in_realm(user.realm) realm_alert_words = alert_words_in_realm(user.realm)
self.assert_length(realm_alert_words[user.id], 3) self.assert_length(realm_alert_words[user.id], 3)
# Test the case-insensitivity of removing words # Test the case-insensitivity of removing words
remove_user_alert_words(user, set(["ALert"])) do_remove_alert_words(user, set(["ALert"]))
words = user_alert_words(user) words = user_alert_words(user)
self.assertEqual(set(words), set(self.interesting_alert_word_list) - {'alert'}) self.assertEqual(set(words), set(self.interesting_alert_word_list) - {'alert'})
realm_alert_words = alert_words_in_realm(user.realm) realm_alert_words = alert_words_in_realm(user.realm)
@@ -78,16 +81,16 @@ class AlertWordTests(ZulipTestCase):
def test_remove_word(self) -> None: def test_remove_word(self) -> None:
""" """
Removing alert words works via remove_user_alert_words, even Removing alert words works via do_remove_alert_words, even
for multi-word and non-ascii words. for multi-word and non-ascii words.
""" """
user = self.example_user('cordelia') user = self.example_user('cordelia')
expected_remaining_alerts = set(self.interesting_alert_word_list) expected_remaining_alerts = set(self.interesting_alert_word_list)
add_user_alert_words(user, self.interesting_alert_word_list) do_add_alert_words(user, self.interesting_alert_word_list)
for alert_word in self.interesting_alert_word_list: for alert_word in self.interesting_alert_word_list:
remove_user_alert_words(user, [alert_word]) do_remove_alert_words(user, [alert_word])
expected_remaining_alerts.remove(alert_word) expected_remaining_alerts.remove(alert_word)
actual_remaining_alerts = user_alert_words(user) actual_remaining_alerts = user_alert_words(user)
self.assertEqual(set(actual_remaining_alerts), self.assertEqual(set(actual_remaining_alerts),
@@ -101,10 +104,10 @@ class AlertWordTests(ZulipTestCase):
""" """
user1 = self.example_user('cordelia') user1 = self.example_user('cordelia')
add_user_alert_words(user1, self.interesting_alert_word_list) do_add_alert_words(user1, self.interesting_alert_word_list)
user2 = self.example_user('othello') user2 = self.example_user('othello')
add_user_alert_words(user2, ['another']) do_add_alert_words(user2, ['another'])
realm_words = alert_words_in_realm(user2.realm) realm_words = alert_words_in_realm(user2.realm)
self.assertEqual(len(realm_words), 2) self.assertEqual(len(realm_words), 2)
@@ -122,7 +125,7 @@ class AlertWordTests(ZulipTestCase):
def test_json_list_nonempty(self) -> None: def test_json_list_nonempty(self) -> None:
hamlet = self.example_user('hamlet') hamlet = self.example_user('hamlet')
add_user_alert_words(hamlet, ['one', 'two', 'three']) do_add_alert_words(hamlet, ['one', 'two', 'three'])
self.login('hamlet') self.login('hamlet')
result = self.client_get('/json/users/me/alert_words') result = self.client_get('/json/users/me/alert_words')