From cddf25656ff0d524e9214c890ff290e30bb75ac1 Mon Sep 17 00:00:00 2001 From: Aman Agrawal Date: Mon, 17 Apr 2023 12:11:08 +0000 Subject: [PATCH] test_message_send: Move out scheduled message tests. --- zerver/tests/test_message_send.py | 263 +---------------------- zerver/tests/test_scheduled_messages.py | 267 ++++++++++++++++++++++++ 2 files changed, 269 insertions(+), 261 deletions(-) create mode 100644 zerver/tests/test_scheduled_messages.py diff --git a/zerver/tests/test_message_send.py b/zerver/tests/test_message_send.py index 1469ce8abe..84ba88d94a 100644 --- a/zerver/tests/test_message_send.py +++ b/zerver/tests/test_message_send.py @@ -1,7 +1,6 @@ import datetime -import sys from email.headerregistry import Address -from typing import TYPE_CHECKING, Any, List, Optional, Set, Union +from typing import Any, Optional, Set from unittest import mock import orjson @@ -44,14 +43,13 @@ from zerver.lib.test_helpers import ( most_recent_usermessage, reset_email_visibility_to_everyone_in_zulip_realm, ) -from zerver.lib.timestamp import convert_to_UTC, datetime_to_timestamp +from zerver.lib.timestamp import datetime_to_timestamp from zerver.models import ( MAX_TOPIC_NAME_LENGTH, Message, Realm, RealmDomain, Recipient, - ScheduledMessage, Stream, Subscription, UserMessage, @@ -65,14 +63,6 @@ from zerver.models import ( ) from zerver.views.message_send import InvalidMirrorInputError -if sys.version_info < (3, 9): # nocoverage - from backports import zoneinfo -else: # nocoverage - import zoneinfo - -if TYPE_CHECKING: - from django.test.client import _MonkeyPatchedWSGIResponse as TestHttpResponse - class MessagePOSTTest(ZulipTestCase): def _send_and_verify_message( @@ -1347,255 +1337,6 @@ class MessagePOSTTest(ZulipTestCase): self.assert_json_success(result) -class ScheduledMessageTest(ZulipTestCase): - def last_scheduled_message(self) -> ScheduledMessage: - return ScheduledMessage.objects.all().order_by("-id")[0] - - def get_scheduled_message(self, id: str) -> ScheduledMessage: - return ScheduledMessage.objects.get(id=id) - - def do_schedule_message( - self, - msg_type: str, - to: Union[str, int, List[str], List[int]], - msg: str, - defer_until: str = "", - tz_guess: str = "", - delivery_type: str = "send_later", - scheduled_message_id: str = "", - ) -> "TestHttpResponse": - self.login("hamlet") - - topic_name = "" - if msg_type == "stream": - topic_name = "Test topic" - - payload = { - "type": msg_type, - "to": orjson.dumps(to).decode(), - "content": msg, - "topic": topic_name, - "delivery_type": delivery_type, - "tz_guess": tz_guess, - } - if defer_until: - payload["deliver_at"] = defer_until - - if scheduled_message_id: - payload["scheduled_message_id"] = scheduled_message_id - - # `Topic` cannot be empty according to OpenAPI specification. - intentionally_undocumented: bool = topic_name == "" - result = self.client_post( - "/json/messages", payload, intentionally_undocumented=intentionally_undocumented - ) - return result - - def test_schedule_message(self) -> None: - content = "Test message" - defer_until = timezone_now().replace(tzinfo=None) + datetime.timedelta(days=1) - defer_until_str = str(defer_until) - - # Scheduling a message to a stream you are subscribed is successful. - result = self.do_schedule_message("stream", "Verona", content + " 1", defer_until_str) - message = self.last_scheduled_message() - self.assert_json_success(result) - self.assertEqual(message.content, "Test message 1") - self.assertEqual(message.rendered_content, "

Test message 1

") - self.assertEqual(message.topic_name(), "Test topic") - self.assertEqual(message.scheduled_timestamp, convert_to_UTC(defer_until)) - self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) - # Scheduling a message for reminders. - result = self.do_schedule_message( - "stream", "Verona", content + " 2", defer_until_str, delivery_type="remind" - ) - message = self.last_scheduled_message() - self.assert_json_success(result) - self.assertEqual(message.delivery_type, ScheduledMessage.REMIND) - - # Scheduling a private message is successful. - othello = self.example_user("othello") - hamlet = self.example_user("hamlet") - result = self.do_schedule_message( - "private", [othello.email], content + " 3", defer_until_str - ) - message = self.last_scheduled_message() - self.assert_json_success(result) - self.assertEqual(message.content, "Test message 3") - self.assertEqual(message.rendered_content, "

Test message 3

") - self.assertEqual(message.scheduled_timestamp, convert_to_UTC(defer_until)) - self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) - - # Setting a reminder in PM's to other users causes a error. - result = self.do_schedule_message( - "private", [othello.email], content + " 4", defer_until_str, delivery_type="remind" - ) - self.assert_json_error(result, "Reminders can only be set for streams.") - - # Setting a reminder in PM's to ourself is successful. - # Required by reminders from message actions popover caret feature. - result = self.do_schedule_message( - "private", [hamlet.email], content + " 5", defer_until_str, delivery_type="remind" - ) - message = self.last_scheduled_message() - self.assert_json_success(result) - self.assertEqual(message.content, "Test message 5") - self.assertEqual(message.delivery_type, ScheduledMessage.REMIND) - - # Scheduling a message while guessing time zone. - tz_guess = "Asia/Kolkata" - result = self.do_schedule_message( - "stream", "Verona", content + " 6", defer_until_str, tz_guess=tz_guess - ) - message = self.last_scheduled_message() - self.assert_json_success(result) - self.assertEqual(message.content, "Test message 6") - local_tz = zoneinfo.ZoneInfo(tz_guess) - utz_defer_until = defer_until.replace(tzinfo=local_tz) - self.assertEqual(message.scheduled_timestamp, convert_to_UTC(utz_defer_until)) - self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) - - # Test with users time zone setting as set to some time zone rather than - # empty. This will help interpret timestamp in users local time zone. - user = self.example_user("hamlet") - user.timezone = "US/Pacific" - user.save(update_fields=["timezone"]) - result = self.do_schedule_message("stream", "Verona", content + " 7", defer_until_str) - message = self.last_scheduled_message() - self.assert_json_success(result) - self.assertEqual(message.content, "Test message 7") - local_tz = zoneinfo.ZoneInfo(user.timezone) - utz_defer_until = defer_until.replace(tzinfo=local_tz) - self.assertEqual(message.scheduled_timestamp, convert_to_UTC(utz_defer_until)) - self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) - - def test_scheduling_in_past(self) -> None: - # Scheduling a message in past should fail. - content = "Test message" - defer_until = timezone_now() - defer_until_str = str(defer_until) - - result = self.do_schedule_message("stream", "Verona", content + " 1", defer_until_str) - self.assert_json_error(result, "Time must be in the future.") - - def test_invalid_timestamp(self) -> None: - # Scheduling a message from which timestamp couldn't be parsed - # successfully should fail. - content = "Test message" - defer_until = "Missed the timestamp" - - result = self.do_schedule_message("stream", "Verona", content + " 1", defer_until) - self.assert_json_error(result, "Invalid time format") - - def test_missing_deliver_at(self) -> None: - content = "Test message" - - result = self.do_schedule_message("stream", "Verona", content + " 1") - self.assert_json_error( - result, "Missing deliver_at in a request for delayed message delivery" - ) - - def test_edit_schedule_message(self) -> None: - content = "Original test message" - defer_until = timezone_now().replace(tzinfo=None) + datetime.timedelta(days=1) - defer_until_str = str(defer_until) - - # Scheduling a message to a stream you are subscribed is successful. - result = self.do_schedule_message("stream", "Verona", content, defer_until_str) - message = self.last_scheduled_message() - self.assert_json_success(result) - self.assertEqual(message.content, "Original test message") - self.assertEqual(message.topic_name(), "Test topic") - self.assertEqual(message.scheduled_timestamp, convert_to_UTC(defer_until)) - self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) - - # Edit content and time of scheduled message. - edited_content = "Edited test message" - new_defer_until = defer_until + datetime.timedelta(days=3) - new_defer_until_str = str(new_defer_until) - - result = self.do_schedule_message( - "stream", - "Verona", - edited_content, - new_defer_until_str, - scheduled_message_id=str(message.id), - ) - message = self.get_scheduled_message(str(message.id)) - self.assert_json_success(result) - self.assertEqual(message.content, edited_content) - self.assertEqual(message.topic_name(), "Test topic") - self.assertEqual(message.scheduled_timestamp, convert_to_UTC(new_defer_until)) - self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) - - def test_fetch_scheduled_messages(self) -> None: - self.login("hamlet") - # No scheduled message - result = self.client_get("/json/scheduled_messages") - self.assert_json_success(result) - self.assert_length(orjson.loads(result.content)["scheduled_messages"], 0) - - content = "Test message" - defer_until = timezone_now().replace(tzinfo=None) + datetime.timedelta(days=1) - defer_until_str = str(defer_until) - self.do_schedule_message("stream", "Verona", content, defer_until_str) - - # Single scheduled message - result = self.client_get("/json/scheduled_messages") - self.assert_json_success(result) - scheduled_messages = orjson.loads(result.content)["scheduled_messages"] - - self.assert_length(scheduled_messages, 1) - self.assertEqual(scheduled_messages[0]["message_id"], self.last_scheduled_message().id) - self.assertEqual(scheduled_messages[0]["content"], content) - self.assertEqual(scheduled_messages[0]["to"], [self.get_stream_id("Verona")]) - self.assertEqual(scheduled_messages[0]["type"], "stream") - self.assertEqual(scheduled_messages[0]["topic"], "Test topic") - self.assertEqual( - scheduled_messages[0]["deliver_at"], int(convert_to_UTC(defer_until).timestamp() * 1000) - ) - - othello = self.example_user("othello") - result = self.do_schedule_message( - "private", [othello.email], content + " 3", defer_until_str - ) - - # Multiple scheduled messages - result = self.client_get("/json/scheduled_messages") - self.assert_json_success(result) - self.assert_length(orjson.loads(result.content)["scheduled_messages"], 2) - - # Check if another user can access these scheduled messages. - self.logout() - self.login("othello") - result = self.client_get("/json/scheduled_messages") - self.assert_json_success(result) - self.assert_length(orjson.loads(result.content)["scheduled_messages"], 0) - - def test_delete_scheduled_messages(self) -> None: - self.login("hamlet") - - content = "Test message" - defer_until = timezone_now().replace(tzinfo=None) + datetime.timedelta(days=1) - defer_until_str = str(defer_until) - self.do_schedule_message("stream", "Verona", content, defer_until_str) - message = self.last_scheduled_message() - self.logout() - - # Other user cannot delete it. - othello = self.example_user("othello") - result = self.api_delete(othello, f"/api/v1/scheduled_messages/{message.id}") - self.assert_json_error(result, "Scheduled message does not exist", 404) - - self.login("hamlet") - result = self.client_delete(f"/json/scheduled_messages/{message.id}") - self.assert_json_success(result) - - # Already deleted. - result = self.client_delete(f"/json/scheduled_messages/{message.id}") - self.assert_json_error(result, "Scheduled message does not exist", 404) - - class StreamMessagesTest(ZulipTestCase): def assert_stream_message( self, stream_name: str, topic_name: str = "test topic", content: str = "test content" diff --git a/zerver/tests/test_scheduled_messages.py b/zerver/tests/test_scheduled_messages.py new file mode 100644 index 0000000000..1504b0d716 --- /dev/null +++ b/zerver/tests/test_scheduled_messages.py @@ -0,0 +1,267 @@ +import datetime +import sys +from typing import TYPE_CHECKING, List, Union + +import orjson +from django.utils.timezone import now as timezone_now + +from zerver.lib.test_classes import ZulipTestCase +from zerver.lib.timestamp import convert_to_UTC +from zerver.models import ScheduledMessage + +if sys.version_info < (3, 9): # nocoverage + from backports import zoneinfo +else: # nocoverage + import zoneinfo + +if TYPE_CHECKING: + from django.test.client import _MonkeyPatchedWSGIResponse as TestHttpResponse + + +class ScheduledMessageTest(ZulipTestCase): + def last_scheduled_message(self) -> ScheduledMessage: + return ScheduledMessage.objects.all().order_by("-id")[0] + + def get_scheduled_message(self, id: str) -> ScheduledMessage: + return ScheduledMessage.objects.get(id=id) + + def do_schedule_message( + self, + msg_type: str, + to: Union[str, int, List[str], List[int]], + msg: str, + defer_until: str = "", + tz_guess: str = "", + delivery_type: str = "send_later", + scheduled_message_id: str = "", + ) -> "TestHttpResponse": + self.login("hamlet") + + topic_name = "" + if msg_type == "stream": + topic_name = "Test topic" + + payload = { + "type": msg_type, + "to": orjson.dumps(to).decode(), + "content": msg, + "topic": topic_name, + "delivery_type": delivery_type, + "tz_guess": tz_guess, + } + if defer_until: + payload["deliver_at"] = defer_until + + if scheduled_message_id: + payload["scheduled_message_id"] = scheduled_message_id + + # `Topic` cannot be empty according to OpenAPI specification. + intentionally_undocumented: bool = topic_name == "" + result = self.client_post( + "/json/messages", payload, intentionally_undocumented=intentionally_undocumented + ) + return result + + def test_schedule_message(self) -> None: + content = "Test message" + defer_until = timezone_now().replace(tzinfo=None) + datetime.timedelta(days=1) + defer_until_str = str(defer_until) + + # Scheduling a message to a stream you are subscribed is successful. + result = self.do_schedule_message("stream", "Verona", content + " 1", defer_until_str) + message = self.last_scheduled_message() + self.assert_json_success(result) + self.assertEqual(message.content, "Test message 1") + self.assertEqual(message.rendered_content, "

Test message 1

") + self.assertEqual(message.topic_name(), "Test topic") + self.assertEqual(message.scheduled_timestamp, convert_to_UTC(defer_until)) + self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) + # Scheduling a message for reminders. + result = self.do_schedule_message( + "stream", "Verona", content + " 2", defer_until_str, delivery_type="remind" + ) + message = self.last_scheduled_message() + self.assert_json_success(result) + self.assertEqual(message.delivery_type, ScheduledMessage.REMIND) + + # Scheduling a private message is successful. + othello = self.example_user("othello") + hamlet = self.example_user("hamlet") + result = self.do_schedule_message( + "private", [othello.email], content + " 3", defer_until_str + ) + message = self.last_scheduled_message() + self.assert_json_success(result) + self.assertEqual(message.content, "Test message 3") + self.assertEqual(message.rendered_content, "

Test message 3

") + self.assertEqual(message.scheduled_timestamp, convert_to_UTC(defer_until)) + self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) + + # Setting a reminder in PM's to other users causes a error. + result = self.do_schedule_message( + "private", [othello.email], content + " 4", defer_until_str, delivery_type="remind" + ) + self.assert_json_error(result, "Reminders can only be set for streams.") + + # Setting a reminder in PM's to ourself is successful. + # Required by reminders from message actions popover caret feature. + result = self.do_schedule_message( + "private", [hamlet.email], content + " 5", defer_until_str, delivery_type="remind" + ) + message = self.last_scheduled_message() + self.assert_json_success(result) + self.assertEqual(message.content, "Test message 5") + self.assertEqual(message.delivery_type, ScheduledMessage.REMIND) + + # Scheduling a message while guessing time zone. + tz_guess = "Asia/Kolkata" + result = self.do_schedule_message( + "stream", "Verona", content + " 6", defer_until_str, tz_guess=tz_guess + ) + message = self.last_scheduled_message() + self.assert_json_success(result) + self.assertEqual(message.content, "Test message 6") + local_tz = zoneinfo.ZoneInfo(tz_guess) + utz_defer_until = defer_until.replace(tzinfo=local_tz) + self.assertEqual(message.scheduled_timestamp, convert_to_UTC(utz_defer_until)) + self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) + + # Test with users time zone setting as set to some time zone rather than + # empty. This will help interpret timestamp in users local time zone. + user = self.example_user("hamlet") + user.timezone = "US/Pacific" + user.save(update_fields=["timezone"]) + result = self.do_schedule_message("stream", "Verona", content + " 7", defer_until_str) + message = self.last_scheduled_message() + self.assert_json_success(result) + self.assertEqual(message.content, "Test message 7") + local_tz = zoneinfo.ZoneInfo(user.timezone) + utz_defer_until = defer_until.replace(tzinfo=local_tz) + self.assertEqual(message.scheduled_timestamp, convert_to_UTC(utz_defer_until)) + self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) + + def test_scheduling_in_past(self) -> None: + # Scheduling a message in past should fail. + content = "Test message" + defer_until = timezone_now() + defer_until_str = str(defer_until) + + result = self.do_schedule_message("stream", "Verona", content + " 1", defer_until_str) + self.assert_json_error(result, "Time must be in the future.") + + def test_invalid_timestamp(self) -> None: + # Scheduling a message from which timestamp couldn't be parsed + # successfully should fail. + content = "Test message" + defer_until = "Missed the timestamp" + + result = self.do_schedule_message("stream", "Verona", content + " 1", defer_until) + self.assert_json_error(result, "Invalid time format") + + def test_missing_deliver_at(self) -> None: + content = "Test message" + + result = self.do_schedule_message("stream", "Verona", content + " 1") + self.assert_json_error( + result, "Missing deliver_at in a request for delayed message delivery" + ) + + def test_edit_schedule_message(self) -> None: + content = "Original test message" + defer_until = timezone_now().replace(tzinfo=None) + datetime.timedelta(days=1) + defer_until_str = str(defer_until) + + # Scheduling a message to a stream you are subscribed is successful. + result = self.do_schedule_message("stream", "Verona", content, defer_until_str) + message = self.last_scheduled_message() + self.assert_json_success(result) + self.assertEqual(message.content, "Original test message") + self.assertEqual(message.topic_name(), "Test topic") + self.assertEqual(message.scheduled_timestamp, convert_to_UTC(defer_until)) + self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) + + # Edit content and time of scheduled message. + edited_content = "Edited test message" + new_defer_until = defer_until + datetime.timedelta(days=3) + new_defer_until_str = str(new_defer_until) + + result = self.do_schedule_message( + "stream", + "Verona", + edited_content, + new_defer_until_str, + scheduled_message_id=str(message.id), + ) + message = self.get_scheduled_message(str(message.id)) + self.assert_json_success(result) + self.assertEqual(message.content, edited_content) + self.assertEqual(message.topic_name(), "Test topic") + self.assertEqual(message.scheduled_timestamp, convert_to_UTC(new_defer_until)) + self.assertEqual(message.delivery_type, ScheduledMessage.SEND_LATER) + + def test_fetch_scheduled_messages(self) -> None: + self.login("hamlet") + # No scheduled message + result = self.client_get("/json/scheduled_messages") + self.assert_json_success(result) + self.assert_length(orjson.loads(result.content)["scheduled_messages"], 0) + + content = "Test message" + defer_until = timezone_now().replace(tzinfo=None) + datetime.timedelta(days=1) + defer_until_str = str(defer_until) + self.do_schedule_message("stream", "Verona", content, defer_until_str) + + # Single scheduled message + result = self.client_get("/json/scheduled_messages") + self.assert_json_success(result) + scheduled_messages = orjson.loads(result.content)["scheduled_messages"] + + self.assert_length(scheduled_messages, 1) + self.assertEqual(scheduled_messages[0]["message_id"], self.last_scheduled_message().id) + self.assertEqual(scheduled_messages[0]["content"], content) + self.assertEqual(scheduled_messages[0]["to"], [self.get_stream_id("Verona")]) + self.assertEqual(scheduled_messages[0]["type"], "stream") + self.assertEqual(scheduled_messages[0]["topic"], "Test topic") + self.assertEqual( + scheduled_messages[0]["deliver_at"], int(convert_to_UTC(defer_until).timestamp() * 1000) + ) + + othello = self.example_user("othello") + result = self.do_schedule_message( + "private", [othello.email], content + " 3", defer_until_str + ) + + # Multiple scheduled messages + result = self.client_get("/json/scheduled_messages") + self.assert_json_success(result) + self.assert_length(orjson.loads(result.content)["scheduled_messages"], 2) + + # Check if another user can access these scheduled messages. + self.logout() + self.login("othello") + result = self.client_get("/json/scheduled_messages") + self.assert_json_success(result) + self.assert_length(orjson.loads(result.content)["scheduled_messages"], 0) + + def test_delete_scheduled_messages(self) -> None: + self.login("hamlet") + + content = "Test message" + defer_until = timezone_now().replace(tzinfo=None) + datetime.timedelta(days=1) + defer_until_str = str(defer_until) + self.do_schedule_message("stream", "Verona", content, defer_until_str) + message = self.last_scheduled_message() + self.logout() + + # Other user cannot delete it. + othello = self.example_user("othello") + result = self.api_delete(othello, f"/api/v1/scheduled_messages/{message.id}") + self.assert_json_error(result, "Scheduled message does not exist", 404) + + self.login("hamlet") + result = self.client_delete(f"/json/scheduled_messages/{message.id}") + self.assert_json_success(result) + + # Already deleted. + result = self.client_delete(f"/json/scheduled_messages/{message.id}") + self.assert_json_error(result, "Scheduled message does not exist", 404)