X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fpleroma%2Fweb%2Fmastodon_api%2Fcontrollers%2Fnotification_controller_test.exs;h=f463bfae1cbcc287adfd8c2db6a1ca996deaf145;hb=7f4d218cffaafd97d9a5fe636a1acef7ca1053d8;hp=2615912a8dac5fe06ca50ea0cbd1d4e19a78a7f0;hpb=111bfdd3a04358750028a3a3ca75c942df3df7d5;p=akkoma
diff --git a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
index 2615912a8..f463bfae1 100644
--- a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
@@ -44,9 +44,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
|> get("/api/v1/notifications")
expected_response =
- "hi @#{user.nickname}"
+ "hi @#{user.nickname}"
assert [%{"status" => %{"content" => response}} | _rest] =
json_response_and_validate_schema(conn, 200)
@@ -54,27 +52,6 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
assert response == expected_response
end
- test "by default, does not contain pleroma:chat_mention" do
- %{user: user, conn: conn} = oauth_access(["read:notifications"])
- other_user = insert(:user)
-
- {:ok, _activity} = CommonAPI.post_chat_message(other_user, user, "hey")
-
- result =
- conn
- |> get("/api/v1/notifications")
- |> json_response_and_validate_schema(200)
-
- assert [] == result
-
- result =
- conn
- |> get("/api/v1/notifications?include_types[]=pleroma:chat_mention")
- |> json_response_and_validate_schema(200)
-
- assert [_] = result
- end
-
test "by default, does not contain pleroma:report" do
%{user: user, conn: conn} = oauth_access(["read:notifications"])
other_user = insert(:user)
@@ -103,40 +80,40 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
assert [_] = result
end
- test "getting a single notification" do
+ test "excludes mentions from blockers when blockers_visible is false" do
+ clear_config([:activitypub, :blockers_visible], false)
+
%{user: user, conn: conn} = oauth_access(["read:notifications"])
- other_user = insert(:user)
+ blocker = insert(:user)
- {:ok, activity} = CommonAPI.post(other_user, %{status: "hi @#{user.nickname}"})
+ {:ok, _} = CommonAPI.block(blocker, user)
+ {:ok, activity} = CommonAPI.post(blocker, %{status: "hi @#{user.nickname}"})
- {:ok, [notification]} = Notification.create_notifications(activity)
-
- conn = get(conn, "/api/v1/notifications/#{notification.id}")
+ {:ok, [_notification]} = Notification.create_notifications(activity)
- expected_response =
- "hi @#{user.nickname}"
+ conn =
+ conn
+ |> assign(:user, user)
+ |> get("/api/v1/notifications")
- assert %{"status" => %{"content" => response}} = json_response_and_validate_schema(conn, 200)
- assert response == expected_response
+ assert [] == json_response_and_validate_schema(conn, 200)
end
- test "dismissing a single notification (deprecated endpoint)" do
- %{user: user, conn: conn} = oauth_access(["write:notifications"])
+ test "getting a single notification" do
+ %{user: user, conn: conn} = oauth_access(["read:notifications"])
other_user = insert(:user)
{:ok, activity} = CommonAPI.post(other_user, %{status: "hi @#{user.nickname}"})
{:ok, [notification]} = Notification.create_notifications(activity)
- conn =
- conn
- |> assign(:user, user)
- |> put_req_header("content-type", "application/json")
- |> post("/api/v1/notifications/dismiss", %{"id" => to_string(notification.id)})
+ conn = get(conn, "/api/v1/notifications/#{notification.id}")
- assert %{} = json_response_and_validate_schema(conn, 200)
+ expected_response =
+ "hi @#{user.nickname}"
+
+ assert %{"status" => %{"content" => response}} = json_response_and_validate_schema(conn, 200)
+ assert response == expected_response
end
test "dismissing a single notification" do