X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Factivity_test.exs;h=7e91d534b4b391d2654621a3dc27cf1c3a3152c5;hb=15cda998f3bdc03f58c30e34e35ebc026a90cf29;hp=e2a8baada672a8a1be45d5bf1a663b7735ce8daa;hpb=f841eb7cdb83afc444dfe260581b6be6e690a717;p=akkoma

diff --git a/test/activity_test.exs b/test/activity_test.exs
index e2a8baada..7e91d534b 100644
--- a/test/activity_test.exs
+++ b/test/activity_test.exs
@@ -6,7 +6,6 @@ defmodule Pleroma.ActivityTest do
   use Pleroma.DataCase
   alias Pleroma.Activity
   alias Pleroma.Bookmark
-  alias Pleroma.Object
   import Pleroma.Factory
 
   test "returns an activity by it's AP id" do
@@ -31,30 +30,47 @@ defmodule Pleroma.ActivityTest do
     assert activity == found_activity
   end
 
-  test "preloading object preloads bookmarks" do
-    user1 = insert(:user)
+  test "preloading a bookmark" do
+    user = insert(:user)
     user2 = insert(:user)
+    user3 = insert(:user)
     activity = insert(:note_activity)
-    {:ok, bookmark1} = Bookmark.create(user1.id, activity.id)
-    {:ok, bookmark2} = Bookmark.create(user2.id, activity.id)
-    bookmarks = Enum.sort([bookmark1, bookmark2])
+    {:ok, _bookmark} = Bookmark.create(user.id, activity.id)
+    {:ok, _bookmark2} = Bookmark.create(user2.id, activity.id)
+    {:ok, bookmark3} = Bookmark.create(user3.id, activity.id)
 
     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(user3)
       |> Repo.one()
 
-    assert Enum.sort(queried_activity.bookmarks) == bookmarks
+    assert queried_activity.bookmark == bookmark3
+  end
 
-    queried_activity = Activity.get_by_ap_id_with_object(activity.data["id"])
-    assert Enum.sort(queried_activity.bookmarks) == bookmarks
+  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)
 
-    queried_activity = Activity.get_by_id_with_object(activity.id)
-    assert Enum.sort(queried_activity.bookmarks) == bookmarks
+      queried_activity =
+        Ecto.Query.from(Pleroma.Activity)
+        |> Activity.with_preloaded_bookmark(user)
+        |> Repo.one()
 
-    queried_activity =
-      Activity.get_create_by_object_ap_id_with_object(Object.normalize(activity).data["id"])
+      assert Activity.get_bookmark(queried_activity, user) == bookmark
+    end
+
+    test "when association is not loaded" do
+      user = insert(:user)
+      activity = insert(:note_activity)
+      {:ok, bookmark} = Bookmark.create(user.id, activity.id)
+
+      queried_activity =
+        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