summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/status_view_test.exs
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-01-25 05:19:32 +0000
committerkaniini <nenolod@gmail.com>2019-01-25 05:19:32 +0000
commit4c99b6d35abe2beb184a12f7cba6f84a0fc6a27a (patch)
treeea0088876ab982a270a286048316e0eed6c18af7 /test/web/mastodon_api/status_view_test.exs
parent4df71cd88b2725f1838c2899b3078a74dbb0c33f (diff)
parent9274cabe01977a3c2d35059d7889c63e2bd54de1 (diff)
downloadpleroma-4c99b6d35abe2beb184a12f7cba6f84a0fc6a27a.tar.gz
pleroma-4c99b6d35abe2beb184a12f7cba6f84a0fc6a27a.zip
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list Closes #390 See merge request pleroma/pleroma!683
Diffstat (limited to 'test/web/mastodon_api/status_view_test.exs')
-rw-r--r--test/web/mastodon_api/status_view_test.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index e33479368..ebf6273e8 100644
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -149,7 +149,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
status = StatusView.render("status.json", %{activity: activity})
- assert status.mentions == [AccountView.render("mention.json", %{user: user})]
+ actor = Repo.get_by(User, ap_id: activity.actor)
+
+ assert status.mentions ==
+ Enum.map([user, actor], fn u -> AccountView.render("mention.json", %{user: u}) end)
end
test "attachments" do