Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix UnreadCountTests to not be checking empty sets. 

Because there's no guarantee that Hamlet has message IDs 1 and 2, and
the update_unread_counts function didn't return an error in the event
that you passed it a message that the user never received (it instead
silently succeeded), this test was mostly useless.

I just dumped the test_initial_counts function, because it didn't seem
to be doing anything useful.

(imported from commit 4d76104eb9f3b947727a1a030afc0b57054d0daf)
This commit is contained in:
Tim Abbott 2013-07-19 12:34:54 -04:00
parent 508332da0d
commit b5eab2bde5
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
zephyr/tests.py
View File

@ -2563,30 +2563,17 @@ class UserPresenceTests(AuthedTestCase):
self.assertEqual(email_to_domain(email), 'humbughq.com')
class UnreadCountTests(AuthedTestCase):
def test_initial_counts(self):
# All test users have a pointer at -1, so all messages are read
for user in UserProfile.objects.all():
for message in UserMessage.objects.filter(user_profile=user):
self.assertTrue(message.flags.read)
self.login('hamlet@humbughq.com')
for msg in self.get_old_messages():
self.assertEqual(msg['flags'], ['read'])
def setUp(self):
self.unread_msgs = [self.send_message("iago@humbughq.com", "hamlet@humbughq.com", Recipient.PERSONAL, "hello"),
self.send_message("iago@humbughq.com", "hamlet@humbughq.com", Recipient.PERSONAL, "hello2")]
def test_new_message(self):
# Sending a new message results in unread UserMessages being created
self.login("hamlet@humbughq.com")
content = "Test message for unset read bit"
self.client.post("/json/send_message", {"type": "stream",
"to": "Verona",
"client": "test suite",
"content": content,
"subject": "Test subject"})
last_msg = Message.objects.all().order_by("-id")[0]
self.assertEqual(last_msg.content, "Test message for unset read bit")
last_msg = self.send_message("hamlet@humbughq.com", "Verona", Recipient.STREAM, content)
user_messages = list(UserMessage.objects.filter(message=last_msg))
self.assertEqual(4, len(user_messages))
self.assertEqual(len(user_messages) > 0, True)
for um in user_messages:
self.assertEqual(um.message.content, content)
if um.user_profile.email != "hamlet@humbughq.com":
@ -2595,28 +2582,30 @@ class UnreadCountTests(AuthedTestCase):
def test_update_flags(self):
self.login("hamlet@humbughq.com")
result = self.client.post("/json/update_message_flags", {"messages": ujson.dumps([1, 2]),
"op": "add",
"flag": "read"})
result = self.client.post("/json/update_message_flags",
{"messages": ujson.dumps([msg.id for msg in self.unread_msgs]),
"op": "add",
"flag": "read"})
self.assert_json_success(result)
# Ensure we properly set the flags
found = 0
for msg in self.get_old_messages():
if msg['id'] == 1:
self.assertEqual(msg['flags'], ['read'])
elif msg['id'] == 2:
if msg['id'] in [message.id for message in self.unread_msgs]:
self.assertEqual(msg['flags'], ['read'])
found += 1
self.assertEqual(found, 2)
result = self.client.post("/json/update_message_flags", {"messages": ujson.dumps([2]),
result = self.client.post("/json/update_message_flags", {"messages": ujson.dumps([self.unread_msgs[1].id]),
"op": "remove",
"flag": "read"})
self.assert_json_success(result)
# Ensure we properly remove just one flag
for msg in self.get_old_messages():
if msg['id'] == 1:
if msg['id'] == self.unread_msgs[0].id:
self.assertEqual(msg['flags'], ['read'])
elif msg['id'] == 2:
elif msg['id'] == self.unread_msgs[1].id:
self.assertEqual(msg['flags'], [])
def test_update_all_flags(self):