diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-22 15:05:39 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-22 15:05:39 -0600 |
| commit | ae78059ff433739b83aaa3ccff9245ace153146d (patch) | |
| tree | f25e9b709b567b33377c5b9bb0c29a91dbb1c9b9 /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
| parent | 7bfb8ed14d2d222e6fcd7afe54f229f68370f061 (diff) | |
| parent | be2777715650d0ac80509f0bd22b4cea8641f9b3 (diff) | |
| download | pleroma-ae78059ff433739b83aaa3ccff9245ace153146d.tar.gz pleroma-ae78059ff433739b83aaa3ccff9245ace153146d.zip | |
Merge branch 'develop' into features/remote-follow-userpage-redirect
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 |