summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-01-24 21:46:57 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-01-24 21:46:57 +0300
commit055edd3d72504d3bfa8426b2fd90d49d97ad193b (patch)
tree5cde475e72a5c01807d1ea17fff1e3fa63042dec /test/web/mastodon_api
parent293281fcbdba793604316f16f42d0de5ed816941 (diff)
parent28f822877fd9a524e442d13a3c0029ae797c875d (diff)
downloadpleroma-055edd3d72504d3bfa8426b2fd90d49d97ad193b.tar.gz
pleroma-055edd3d72504d3bfa8426b2fd90d49d97ad193b.zip
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'test/web/mastodon_api')
-rw-r--r--test/web/mastodon_api/views/status_view_test.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/web/mastodon_api/views/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs
index 069bb8eac..25777b011 100644
--- a/test/web/mastodon_api/views/status_view_test.exs
+++ b/test/web/mastodon_api/views/status_view_test.exs
@@ -36,7 +36,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
activity = Repo.get(Activity, activity.id)
status = StatusView.render("show.json", activity: activity)
- assert status[:pleroma][:emoji_reactions] == [["☕", 2], ["🍵", 1]]
+ assert status[:pleroma][:emoji_reactions] == [
+ %{emoji: "☕", count: 2},
+ %{emoji: "🍵", count: 1}
+ ]
end
test "loads and returns the direct conversation id when given the `with_direct_conversation_id` option" do