summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-10-21 12:38:35 +0300
committerrinpatch <rinpatch@sdf.org>2019-10-25 18:44:23 +0300
commitca1871fbb40e78cc0b56efd4b3ff56474c222d7d (patch)
treece8183307b2b83242a49bddb00a641db397016fa /test
parente91d5a23f4173fa087cf90210b9329294f970b52 (diff)
downloadpleroma-ca1871fbb40e78cc0b56efd4b3ff56474c222d7d.tar.gz
pleroma-ca1871fbb40e78cc0b56efd4b3ff56474c222d7d.zip
Do not include notifications from blocked users when with_muted is set
This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.
Diffstat (limited to 'test')
-rw-r--r--test/notification_test.exs12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/notification_test.exs b/test/notification_test.exs
index d68d4485f..2480d9b20 100644
--- a/test/notification_test.exs
+++ b/test/notification_test.exs
@@ -680,7 +680,7 @@ defmodule Pleroma.NotificationTest do
assert Notification.for_user(user) == []
end
- test "it returns notifications for muted user with notifications and with_muted parameter" do
+ test "it returns notifications from a muted user when with_muted is set" do
user = insert(:user)
muted = insert(:user)
{:ok, user} = User.mute(user, muted)
@@ -690,27 +690,27 @@ defmodule Pleroma.NotificationTest do
assert length(Notification.for_user(user, %{with_muted: true})) == 1
end
- test "it returns notifications for blocked user and with_muted parameter" do
+ test "it doesn't return notifications from a blocked user when with_muted is set" do
user = insert(:user)
blocked = insert(:user)
{:ok, user} = User.block(user, blocked)
{:ok, _activity} = CommonAPI.post(blocked, %{"status" => "hey @#{user.nickname}"})
- assert length(Notification.for_user(user, %{with_muted: true})) == 1
+ assert length(Notification.for_user(user, %{with_muted: true})) == 0
end
- test "it returns notificatitons for blocked domain and with_muted parameter" do
+ test "it doesn't return notifications from a domain-blocked user when with_muted is set" do
user = insert(:user)
blocked = insert(:user, ap_id: "http://some-domain.com")
{:ok, user} = User.block_domain(user, "some-domain.com")
{:ok, _activity} = CommonAPI.post(blocked, %{"status" => "hey @#{user.nickname}"})
- assert length(Notification.for_user(user, %{with_muted: true})) == 1
+ assert length(Notification.for_user(user, %{with_muted: true})) == 0
end
- test "it returns notifications for muted thread with_muted parameter" do
+ test "it returns notifications from muted threads when with_muted is set" do
user = insert(:user)
another_user = insert(:user)