CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-24 21:08:25 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

push_notifications: Ensure notifications are on for the remove codepath.

Browse Source 
This causes it to mirror the handle_push_notification codepath.
This commit is contained in:
Alex Vandiver 2022-03-09 14:40:34 -08:00 committed by Tim Abbott
parent c9c980d7b0
commit 19dfd8e6a7
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/push_notifications.py
View File

@ -907,6 +907,9 @@ def handle_remove_push_notification(user_profile_id: int, message_ids: List[int]
mobile app, when the message is read on the server, to remove the
message from the notification.
"""
if not push_notifications_enabled():
return
user_profile = get_user_profile_by_id(user_profile_id)
message_ids = bulk_access_messages_expect_usermessage(user_profile_id, message_ids)

43
zerver/tests/test_message_edit_notifications.py
View File

@ -486,17 +486,17 @@ class EditMessageSideEffectsTest(ZulipTestCase):
# push notifications or message notification emails.
self.assert_length(info["queue_messages"], 0)
def test_clear_notification_when_mention_removed(self) -> None:
@mock.patch("zerver.lib.push_notifications.push_notifications_enabled", return_value=True)
def test_clear_notification_when_mention_removed(
self, mock_push_notifications: mock.MagicMock
) -> None:
mentioned_user = self.example_user("iago")
self.assertEqual(get_apns_badge_count(mentioned_user), 0)
self.assertEqual(get_apns_badge_count_future(mentioned_user), 0)
with mock.patch(
"zerver.lib.push_notifications.push_notifications_enabled", return_value=True
):
message_id = self._login_and_send_original_stream_message(
content="@**Iago**",
)
message_id = self._login_and_send_original_stream_message(
content="@**Iago**",
)
self.assertEqual(get_apns_badge_count(mentioned_user), 0)
self.assertEqual(get_apns_badge_count_future(mentioned_user), 1)
@ -506,17 +506,16 @@ class EditMessageSideEffectsTest(ZulipTestCase):
self.assertEqual(get_apns_badge_count(mentioned_user), 0)
self.assertEqual(get_apns_badge_count_future(mentioned_user), 0)
def test_clear_notification_when_group_mention_removed(self) -> None:
@mock.patch("zerver.lib.push_notifications.push_notifications_enabled", return_value=True)
def test_clear_notification_when_group_mention_removed(
self, mock_push_notifications: mock.MagicMock
) -> None:
group_mentioned_user = self.example_user("cordelia")
self.assertEqual(get_apns_badge_count(group_mentioned_user), 0)
self.assertEqual(get_apns_badge_count_future(group_mentioned_user), 0)
with mock.patch(
"zerver.lib.push_notifications.push_notifications_enabled", return_value=True
):
message_id = self._login_and_send_original_stream_message(
content="Hello @*hamletcharacters*",
)
message_id = self._login_and_send_original_stream_message(
content="Hello @*hamletcharacters*",
)
self.assertEqual(get_apns_badge_count(group_mentioned_user), 0)
self.assertEqual(get_apns_badge_count_future(group_mentioned_user), 1)
@ -530,7 +529,10 @@ class EditMessageSideEffectsTest(ZulipTestCase):
self.assertEqual(get_apns_badge_count(group_mentioned_user), 0)
self.assertEqual(get_apns_badge_count_future(group_mentioned_user), 0)
def test_not_clear_notification_when_mention_removed_but_stream_notified(self) -> None:
@mock.patch("zerver.lib.push_notifications.push_notifications_enabled", return_value=True)
def test_not_clear_notification_when_mention_removed_but_stream_notified(
self, mock_push_notifications: mock.MagicMock
) -> None:
mentioned_user = self.example_user("iago")
mentioned_user.enable_stream_push_notifications = True
mentioned_user.save()
@ -538,12 +540,9 @@ class EditMessageSideEffectsTest(ZulipTestCase):
self.assertEqual(get_apns_badge_count(mentioned_user), 0)
self.assertEqual(get_apns_badge_count_future(mentioned_user), 0)
with mock.patch(
"zerver.lib.push_notifications.push_notifications_enabled", return_value=True
):
message_id = self._login_and_send_original_stream_message(
content="@**Iago**",
)
message_id = self._login_and_send_original_stream_message(
content="@**Iago**",
)
self.assertEqual(get_apns_badge_count(mentioned_user), 0)
self.assertEqual(get_apns_badge_count_future(mentioned_user), 1)

3
zerver/tests/test_push_notifications.py
View File

@ -1316,11 +1316,14 @@ class HandlePushNotificationTest(PushNotificationTest):
)
with mock.patch(
"zerver.lib.push_notifications.push_notifications_enabled", return_value=True
) as mock_push_notifications, mock.patch(
"zerver.lib.push_notifications.send_android_push_notification"
) as mock_send_android, mock.patch(
"zerver.lib.push_notifications.send_apple_push_notification"
) as mock_send_apple:
handle_remove_push_notification(self.user_profile.id, [message.id])
mock_push_notifications.assert_called_once()
mock_send_android.assert_called_with(
self.user_profile.id,
android_devices,