Merge branch 'develop' into refactor/notification_settings

[akkoma] / test / tasks / user_test.exs

diff --git a/test/tasks/user_test.exs b/test/tasks/user_test.exs
index c962819db6f56128e8ff132f812e36a6c91aa5a8..ce43a9cc72947f58e3dcff327b08ee8393735057 100644 (file)
--- a/test/tasks/user_test.exs
+++ b/test/tasks/user_test.exs
@@ -124,16 +124,9 @@ defmodule Mix.Tasks.Pleroma.UserTest do
           Keyword.put(meta, :local, true)
         )
 
-      like_obj = Pleroma.Object.get_by_ap_id(like_activity.data["object"])
-
-      data =
-        Map.merge(like_activity.data, %{"object" => "tag:gnusocial.cc,2019-01-09:noticeId=210716"})
-
-      like_activity
-      |> Ecto.Changeset.change(data: data)
-      |> Repo.update()
-
-      Repo.delete(like_obj)
+      like_activity.data["object"]
+      |> Pleroma.Object.get_by_ap_id()
+      |> Repo.delete()
 
       clear_config([:instance, :federating], true)
 
@@ -488,17 +481,17 @@ defmodule Mix.Tasks.Pleroma.UserTest do
       moot = insert(:user, nickname: "moot")
       kawen = insert(:user, nickname: "kawen", name: "fediverse expert moon")
 
-      {:ok, user} = User.follow(user, kawen)
+      {:ok, user} = User.follow(user, moon)
 
       assert [moon.id, kawen.id] == User.Search.search("moon") |> Enum.map(& &1.id)
+
       res = User.search("moo") |> Enum.map(& &1.id)
-      assert moon.id in res
-      assert moot.id in res
-      assert kawen.id in res
-      assert [moon.id, kawen.id] == User.Search.search("moon fediverse") |> Enum.map(& &1.id)
+      assert Enum.sort([moon.id, moot.id, kawen.id]) == Enum.sort(res)
+
+      assert [kawen.id, moon.id] == User.Search.search("expert fediverse") |> Enum.map(& &1.id)
 
-      assert [kawen.id, moon.id] ==
-               User.Search.search("moon fediverse", for_user: user) |> Enum.map(& &1.id)
+      assert [moon.id, kawen.id] ==
+               User.Search.search("expert fediverse", for_user: user) |> Enum.map(& &1.id)
     end
   end