diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-20 19:43:06 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-20 19:43:06 +0700 |
| commit | 60f213bb1a6b1627cd8f6bf2903a42c3f3827f1a (patch) | |
| tree | 297f8ad25104db162b4431f887bb23b3e22255e2 /test/user_test.exs | |
| parent | 05cdb2f2389376081973d96b32e876d2a032d1f1 (diff) | |
| parent | 6ca82c18a738205483dbbef2fd4de662d70227fb (diff) | |
| download | pleroma-60f213bb1a6b1627cd8f6bf2903a42c3f3827f1a.tar.gz pleroma-60f213bb1a6b1627cd8f6bf2903a42c3f3827f1a.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
Diffstat (limited to 'test/user_test.exs')
| -rw-r--r-- | test/user_test.exs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/user_test.exs b/test/user_test.exs index ba02997dc..d11d94263 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -5,6 +5,7 @@ defmodule Pleroma.UserTest do alias Pleroma.Activity alias Pleroma.Builders.UserBuilder + alias Pleroma.Object alias Pleroma.Repo alias Pleroma.User alias Pleroma.Web.CommonAPI @@ -256,7 +257,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) @@ -1132,14 +1133,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] |