Merge remote-tracking branch 'pleroma/develop' into feature/disable-account

[akkoma] / test / user_test.exs

diff --git a/test/user_test.exs b/test/user_test.exs
index ac1675d0f774677f3b13362a2d745636f54bf771..a5f9318533d49ba4dd9ada1c17498543f281d7ee 100644 (file)
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -5,7 +5,7 @@
 defmodule Pleroma.UserTest do
   alias Pleroma.Activity
   alias Pleroma.Builders.UserBuilder
-  alias Pleroma.Notification
+  alias Pleroma.Object
   alias Pleroma.Repo
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ActivityPub
@@ -258,7 +258,7 @@ defmodule Pleroma.UserTest do
 
       activity = Repo.one(Pleroma.Activity)
       assert registered_user.ap_id in activity.recipients
-      assert activity.data["object"]["content"] =~ "cool site"
+      assert Object.normalize(activity).data["content"] =~ "cool site"
       assert activity.actor == welcome_user.ap_id
 
       Pleroma.Config.put([:instance, :welcome_user_nickname], nil)
@@ -864,8 +864,8 @@ defmodule Pleroma.UserTest do
 
       {:ok, activity} = CommonAPI.post(user, %{"status" => "hey @#{user2.nickname}"})
 
-      [notification] = Notification.for_user(user2)
-      assert notification.activity == activity
+      [notification] = Pleroma.Notification.for_user(user2)
+      assert notification.activity.id == activity.id
 
       assert [activity] == ActivityPub.fetch_public_activities(%{})
 
@@ -876,7 +876,7 @@ defmodule Pleroma.UserTest do
       {:ok, _user} = User.deactivate(user)
 
       assert [] == ActivityPub.fetch_public_activities(%{})
-      assert [] == Notification.for_user(user2)
+      assert [] == Pleroma.Notification.for_user(user2)
 
       assert [] ==
                ActivityPub.fetch_activities([user2.ap_id | user2.following], %{"user" => user2})
@@ -1192,14 +1192,14 @@ defmodule Pleroma.UserTest do
         "status" => "heweoo!"
       })
 
-    id1 = activity1.data["object"]["id"]
+    id1 = Object.normalize(activity1).data["id"]
 
     {:ok, activity2} =
       CommonAPI.post(user, %{
         "status" => "heweoo!"
       })
 
-    id2 = activity2.data["object"]["id"]
+    id2 = Object.normalize(activity2).data["id"]
 
     assert {:ok, user_state1} = User.bookmark(user, id1)
     assert user_state1.bookmarks == [id1]