summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-01-24 11:31:24 +0000
committerrinpatch <rinpatch@sdf.org>2020-01-24 11:31:24 +0000
commitecff8e92ffca75465ef607d10ad59b318e68cd1e (patch)
treeb61db46c679b776c4e77df3d0d34aad0c8bacf3f /test/web/mastodon_api
parenta182d400d7d5aa414240b156965533c0e9b222d0 (diff)
parent9a994878f18e4804f83d36eed441de53b53b3691 (diff)
downloadpleroma-ecff8e92ffca75465ef607d10ad59b318e68cd1e.tar.gz
pleroma-ecff8e92ffca75465ef607d10ad59b318e68cd1e.zip
Merge branch 'emoji-reaction-api-change-2' into 'develop'
Emoji reaction api change 2 See merge request pleroma/pleroma!2140
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