diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-25 13:41:10 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-25 13:41:10 +0700 |
| commit | c157e27a000a12dc8f660c056744a6611beb01b1 (patch) | |
| tree | 36ae4721a1cb92983c7a8fed41b737e0a5a57486 /test/web/mastodon_api/status_view_test.exs | |
| parent | e8c2f9a73a37636a9a8ed5c2998617b841f482da (diff) | |
| parent | 3789945784a331790d73f69b407751df9f7d6e8f (diff) | |
| download | pleroma-c157e27a000a12dc8f660c056744a6611beb01b1.tar.gz pleroma-c157e27a000a12dc8f660c056744a6611beb01b1.zip | |
Merge branch 'develop' into feature/disable-account
Diffstat (limited to 'test/web/mastodon_api/status_view_test.exs')
| -rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index a02c7c210..f74726212 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -128,6 +128,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do pleroma: %{ local: true, conversation_id: convo_id, + in_reply_to_account_acct: nil, content: %{"text/plain" => HtmlSanitizeEx.strip_tags(note.data["object"]["content"])}, spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(note.data["object"]["summary"])} } @@ -178,7 +179,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do status = StatusView.render("status.json", %{activity: activity}) - actor = User.get_by_ap_id(activity.actor) + actor = User.get_cached_by_ap_id(activity.actor) assert status.mentions == Enum.map([user, actor], fn u -> AccountView.render("mention.json", %{user: u}) end) |