X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fweb%2Fmastodon_api%2Fcontrollers%2Fnotification_controller_test.exs;h=f463bfae1cbcc287adfd8c2db6a1ca996deaf145;hb=07a48b9293e4046c50b5d424d60a1bf16c7cc198;hp=9ac8488f627ae84f02ce0960dc871fc4e167d458;hpb=fec1ed802ef44a700df27aa132146f79e9e4cd6d;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 9ac8488f6..f463bfae1 100644
--- a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
@@ -44,9 +44,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
       |> get("/api/v1/notifications")
 
     expected_response =
-      "hi <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{user.id}\" href=\"#{
-        user.ap_id
-      }\" rel=\"ugc\">@<span>#{user.nickname}</span></a></span>"
+      "hi <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{user.id}\" href=\"#{user.ap_id}\" rel=\"ugc\">@<span>#{user.nickname}</span></a></span>"
 
     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
-    %{user: user, conn: conn} = oauth_access(["read:notifications"])
-    other_user = insert(:user)
+  test "excludes mentions from blockers when blockers_visible is false" do
+    clear_config([:activitypub, :blockers_visible], false)
 
-    {:ok, activity} = CommonAPI.post(other_user, %{status: "hi @#{user.nickname}"})
+    %{user: user, conn: conn} = oauth_access(["read:notifications"])
+    blocker = insert(:user)
 
-    {:ok, [notification]} = Notification.create_notifications(activity)
+    {:ok, _} = CommonAPI.block(blocker, user)
+    {:ok, activity} = CommonAPI.post(blocker, %{status: "hi @#{user.nickname}"})
 
-    conn = get(conn, "/api/v1/notifications/#{notification.id}")
+    {:ok, [_notification]} = Notification.create_notifications(activity)
 
-    expected_response =
-      "hi <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{user.id}\" href=\"#{
-        user.ap_id
-      }\" rel=\"ugc\">@<span>#{user.nickname}</span></a></span>"
+    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 <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{user.id}\" href=\"#{user.ap_id}\" rel=\"ugc\">@<span>#{user.nickname}</span></a></span>"
+
+    assert %{"status" => %{"content" => response}} = json_response_and_validate_schema(conn, 200)
+    assert response == expected_response
   end
 
   test "dismissing a single notification" do
@@ -555,24 +532,11 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
     assert length(json_response_and_validate_schema(conn, 200)) == 1
   end
 
-  @tag capture_log: true
   test "see move notifications" do
     old_user = insert(:user)
     new_user = insert(:user, also_known_as: [old_user.ap_id])
     %{user: follower, conn: conn} = oauth_access(["read:notifications"])
 
-    old_user_url = old_user.ap_id
-
-    body =
-      File.read!("test/fixtures/users_mock/localhost.json")
-      |> String.replace("{{nickname}}", old_user.nickname)
-      |> Jason.encode!()
-
-    Tesla.Mock.mock(fn
-      %{method: :get, url: ^old_user_url} ->
-        %Tesla.Env{status: 200, body: body}
-    end)
-
     User.follow(follower, old_user)
     Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user)
     Pleroma.Tests.ObanHelpers.perform_all()