summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-01-22 15:05:39 -0600
committerMark Felder <feld@FreeBSD.org>2020-01-22 15:05:39 -0600
commitae78059ff433739b83aaa3ccff9245ace153146d (patch)
treef25e9b709b567b33377c5b9bb0c29a91dbb1c9b9 /test/web/mastodon_api
parent7bfb8ed14d2d222e6fcd7afe54f229f68370f061 (diff)
parentbe2777715650d0ac80509f0bd22b4cea8641f9b3 (diff)
downloadpleroma-ae78059ff433739b83aaa3ccff9245ace153146d.tar.gz
pleroma-ae78059ff433739b83aaa3ccff9245ace153146d.zip
Merge branch 'develop' into features/remote-follow-userpage-redirect
Diffstat (limited to 'test/web/mastodon_api')
-rw-r--r--test/web/mastodon_api/views/status_view_test.exs7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/web/mastodon_api/views/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs
index b54b19c0b..069bb8eac 100644
--- a/test/web/mastodon_api/views/status_view_test.exs
+++ b/test/web/mastodon_api/views/status_view_test.exs
@@ -31,13 +31,12 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
{:ok, activity} = CommonAPI.post(user, %{"status" => "dae cofe??"})
{:ok, _, _} = CommonAPI.react_with_emoji(activity.id, user, "☕")
- {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "☕")
{:ok, _, _} = CommonAPI.react_with_emoji(activity.id, third_user, "🍵")
+ {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "☕")
activity = Repo.get(Activity, activity.id)
status = StatusView.render("show.json", activity: activity)
- assert status[:pleroma][:emoji_reactions]["🍵"] == 1
- assert status[:pleroma][:emoji_reactions]["☕"] == 2
+ assert status[:pleroma][:emoji_reactions] == [["☕", 2], ["🍵", 1]]
end
test "loads and returns the direct conversation id when given the `with_direct_conversation_id` option" do
@@ -189,7 +188,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
expires_at: nil,
direct_conversation_id: nil,
thread_muted: false,
- emoji_reactions: %{}
+ emoji_reactions: []
}
}