summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/status_view_test.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-01-25 10:40:51 +0300
committerrinpatch <rinpatch@sdf.org>2019-01-25 10:40:51 +0300
commit3a5b3c5a3aca6886b96afb7d12628be6d42e427a (patch)
tree48e376b83da9c1f221a9eb2817025e264cf08318 /test/web/mastodon_api/status_view_test.exs
parentc9b418e5477229017b3750c55cf3ea3d03b7e609 (diff)
parent4c99b6d35abe2beb184a12f7cba6f84a0fc6a27a (diff)
downloadpleroma-3a5b3c5a3aca6886b96afb7d12628be6d42e427a.tar.gz
pleroma-3a5b3c5a3aca6886b96afb7d12628be6d42e427a.zip
Merge remote-tracking branch 'pl/develop' into oembed_provider
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