aboutsummaryrefslogtreecommitdiff
path: root/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-01-23 11:42:10 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-01-23 11:42:10 +0300
commit2cfe1b93854c117fda19e54ea17c99f72413a569 (patch)
tree1ae8ca344d7f970db4f6f6cb9283d3cf21d1756a /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
parent5ea859644897354dfea47655ce39dda46439040a (diff)
parentdddebee047efc4ab1dff6565bef32954695846a7 (diff)
downloadpleroma-2cfe1b93854c117fda19e54ea17c99f72413a569.tar.gz
Merge branch 'develop' into feature/tag_feed
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.exs4
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