diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-01-24 11:31:24 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-01-24 11:31:24 +0000 |
| commit | ecff8e92ffca75465ef607d10ad59b318e68cd1e (patch) | |
| tree | b61db46c679b776c4e77df3d0d34aad0c8bacf3f /test | |
| parent | a182d400d7d5aa414240b156965533c0e9b222d0 (diff) | |
| parent | 9a994878f18e4804f83d36eed441de53b53b3691 (diff) | |
| download | pleroma-ecff8e92ffca75465ef607d10ad59b318e68cd1e.tar.gz | |
Merge branch 'emoji-reaction-api-change-2' into 'develop'
Emoji reaction api change 2
See merge request pleroma/pleroma!2140
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/mastodon_api/views/status_view_test.exs | 5 | ||||
| -rw-r--r-- | test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | 2 |
2 files changed, 5 insertions, 2 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 diff --git a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs index a79ecd05b..3978c2ec5 100644 --- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs @@ -71,7 +71,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do |> get("/api/v1/pleroma/statuses/#{activity.id}/emoji_reactions_by") |> json_response(200) - [["🎅", [represented_user]]] = result + [%{"emoji" => "🎅", "count" => 1, "accounts" => [represented_user]}] = result assert represented_user["id"] == other_user.id end |