hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into issue/1276

Browse source
This commit is contained in:
Maksim Pechnikov 2020-02-13 09:20:34 +03:00
commit da44ee5b0f
103 changed files with 396 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/web/mastodon_api/views/status_view_test.exs
View file

@ -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