diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-01-22 14:11:01 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-01-22 14:11:01 +0000 |
| commit | 34aa0c542bd0d2e84829146d26bc573320d54a4f (patch) | |
| tree | f4031dc749d9232869fa3575032b795736881cb3 /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
| parent | 71bffbf0b7a3f0e245408a977c48a51763021508 (diff) | |
| parent | 043cd5aa5458bb5b2ae0b44e475db59c195bec24 (diff) | |
| download | pleroma-34aa0c542bd0d2e84829146d26bc573320d54a4f.tar.gz pleroma-34aa0c542bd0d2e84829146d26bc573320d54a4f.zip | |
Merge branch 'emoji-reaction-extensions-2' into 'develop'
Emoji Reactions: In the API, sort them by first emoji insertion date
See merge request pleroma/pleroma!2126
Diffstat (limited to 'test/web/pleroma_api/controllers/pleroma_api_controller_test.exs')
| -rw-r--r-- | test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
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 fb7500134..a79ecd05b 100644 --- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs @@ -62,7 +62,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do |> get("/api/v1/pleroma/statuses/#{activity.id}/emoji_reactions_by") |> json_response(200) - assert result == %{} + assert result == [] {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "🎅") @@ -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["🎅"] + [["🎅", [represented_user]]] = result assert represented_user["id"] == other_user.id end |