summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/views
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-02-11 10:33:41 -0600
committerMark Felder <feld@FreeBSD.org>2020-02-11 10:33:41 -0600
commitf9eb35d48e9f129df240c2c2134b4664121cecfe (patch)
tree2aca1a10c2df0852bd56e6eecf8446265eaac57d /test/web/mastodon_api/views
parentde0fea463486537766403baa6663a618c93aa941 (diff)
parent3fee859b60d2b97e8210faf872a03d99cfc574cc (diff)
downloadpleroma-f9eb35d48e9f129df240c2c2134b4664121cecfe.tar.gz
pleroma-f9eb35d48e9f129df240c2c2134b4664121cecfe.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
Diffstat (limited to 'test/web/mastodon_api/views')
-rw-r--r--test/web/mastodon_api/views/status_view_test.exs8
1 files changed, 4 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 fc110417c..ba58e48e8 100644
--- a/test/web/mastodon_api/views/status_view_test.exs
+++ b/test/web/mastodon_api/views/status_view_test.exs
@@ -37,15 +37,15 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
status = StatusView.render("show.json", activity: activity)
assert status[:pleroma][:emoji_reactions] == [
- %{emoji: "☕", count: 2, reacted: false},
- %{emoji: "🍵", count: 1, reacted: false}
+ %{name: "☕", count: 2, me: false},
+ %{name: "🍵", count: 1, me: false}
]
status = StatusView.render("show.json", activity: activity, for: user)
assert status[:pleroma][:emoji_reactions] == [
- %{emoji: "☕", count: 2, reacted: true},
- %{emoji: "🍵", count: 1, reacted: false}
+ %{name: "☕", count: 2, me: true},
+ %{name: "🍵", count: 1, me: false}
]
end