Merge remote-tracking branch 'upstream/develop' into admin-create-users

[akkoma] / test / activity_test.exs

diff --git a/test/activity_test.exs b/test/activity_test.exs
index dd149543cd09e20952f67e547b612d81d39a309c..15c95502ab4af78beae377dac861439a57977e0d 100644 (file)
--- a/test/activity_test.exs
+++ b/test/activity_test.exs
@@ -6,7 +6,7 @@ defmodule Pleroma.ActivityTest do
   use Pleroma.DataCase
   alias Pleroma.Activity
   alias Pleroma.Bookmark
-  alias Pleroma.Object
+  alias Pleroma.ThreadMute
   import Pleroma.Factory
 
   test "returns an activity by it's AP id" do
@@ -31,52 +31,72 @@ defmodule Pleroma.ActivityTest do
     assert activity == found_activity
   end
 
-  describe "preloading bookmarks" do
-    setup do
-      user1 = insert(:user)
-      user2 = insert(:user)
-      activity = insert(:note_activity)
-      {:ok, bookmark1} = Bookmark.create(user1.id, activity.id)
-      {:ok, bookmark2} = Bookmark.create(user2.id, activity.id)
-      [activity: activity, bookmarks: Enum.sort([bookmark1, bookmark2])]
-    end
+  test "preloading a bookmark" do
+    user = insert(:user)
+    user2 = insert(:user)
+    user3 = insert(:user)
+    activity = insert(:note_activity)
+    {:ok, _bookmark} = Bookmark.create(user.id, activity.id)
+    {:ok, _bookmark2} = Bookmark.create(user2.id, activity.id)
+    {:ok, bookmark3} = Bookmark.create(user3.id, activity.id)
 
-    test "using with_preloaded_bookmarks", %{activity: activity, bookmarks: bookmarks} do
-      queried_activity =
-        Ecto.Query.from(a in Activity, where: a.id == ^activity.id)
-        |> Activity.with_preloaded_bookmarks()
-        |> Repo.one()
+    queried_activity =
+      Ecto.Query.from(Pleroma.Activity)
+      |> Activity.with_preloaded_bookmark(user3)
+      |> Repo.one()
 
-      assert Enum.sort(queried_activity.bookmarks) == bookmarks
-    end
+    assert queried_activity.bookmark == bookmark3
+  end
+
+  test "setting thread_muted?" do
+    activity = insert(:note_activity)
+    user = insert(:user)
+    annoyed_user = insert(:user)
+    {:ok, _} = ThreadMute.add_mute(annoyed_user.id, activity.data["context"])
+
+    activity_with_unset_thread_muted_field =
+      Ecto.Query.from(Activity)
+      |> Repo.one()
+
+    activity_for_user =
+      Ecto.Query.from(Activity)
+      |> Activity.with_set_thread_muted_field(user)
+      |> Repo.one()
+
+    activity_for_annoyed_user =
+      Ecto.Query.from(Activity)
+      |> Activity.with_set_thread_muted_field(annoyed_user)
+      |> Repo.one()
+
+    assert activity_with_unset_thread_muted_field.thread_muted? == nil
+    assert activity_for_user.thread_muted? == false
+    assert activity_for_annoyed_user.thread_muted? == true
+  end
+
+  describe "getting a bookmark" do
+    test "when association is loaded" do
+      user = insert(:user)
+      activity = insert(:note_activity)
+      {:ok, bookmark} = Bookmark.create(user.id, activity.id)
 
-    test "using with_preloaded_object", %{activity: activity, bookmarks: bookmarks} do
       queried_activity =
-        Ecto.Query.from(a in Activity, where: a.id == ^activity.id)
-        |> Activity.with_preloaded_object()
+        Ecto.Query.from(Pleroma.Activity)
+        |> Activity.with_preloaded_bookmark(user)
         |> Repo.one()
 
-      assert Enum.sort(queried_activity.bookmarks) == bookmarks
-    end
-
-    test "using get_by_ap_id_with_object", %{activity: activity, bookmarks: bookmarks} do
-      queried_activity = Activity.get_by_ap_id_with_object(activity.data["id"])
-      assert Enum.sort(queried_activity.bookmarks) == bookmarks
+      assert Activity.get_bookmark(queried_activity, user) == bookmark
     end
 
-    test "using get_by_id_with_object", %{activity: activity, bookmarks: bookmarks} do
-      queried_activity = Activity.get_by_id_with_object(activity.id)
-      assert Enum.sort(queried_activity.bookmarks) == bookmarks
-    end
+    test "when association is not loaded" do
+      user = insert(:user)
+      activity = insert(:note_activity)
+      {:ok, bookmark} = Bookmark.create(user.id, activity.id)
 
-    test "using get_create_by_object_ap_id_with_object", %{
-      activity: activity,
-      bookmarks: bookmarks
-    } do
       queried_activity =
-        Activity.get_create_by_object_ap_id_with_object(Object.normalize(activity).data["id"])
+        Ecto.Query.from(Pleroma.Activity)
+        |> Repo.one()
 
-      assert Enum.sort(queried_activity.bookmarks) == bookmarks
+      assert Activity.get_bookmark(queried_activity, user) == bookmark
     end
   end
 end