diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-01-22 21:18:27 +0400 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-01-22 21:18:27 +0400 |
commit | 5c842e3b680708bedf13a63427e5e853e0184219 (patch) | |
tree | ebd6332b1d3257eb582d8c89e368e730b3f5ffac /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
parent | b6f5b326e7b7b7e209a436190d28ac2a165cb057 (diff) | |
parent | 15db18af691f91ae7c834aa65f4b4d11d1c32d4c (diff) | |
download | pleroma-5c842e3b680708bedf13a63427e5e853e0184219.tar.gz pleroma-5c842e3b680708bedf13a63427e5e853e0184219.zip |
Merge branch 'develop' into feature/new-registrations-digest
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 | 9 |
1 files changed, 2 insertions, 7 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 3f7ef13bc..a79ecd05b 100644 --- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs @@ -57,17 +57,12 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do {:ok, activity} = CommonAPI.post(user, %{"status" => "#cofe"}) - conn = - conn - |> assign(:user, user) - |> assign(:token, insert(:oauth_token, user: user, scopes: ["read:statuses"])) - result = conn |> 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, "🎅") @@ -76,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 |