diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-01-26 11:23:05 -0600 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-01-26 11:23:05 -0600 |
commit | d770cffce0aec0eeb427c8851437f04329700da9 (patch) | |
tree | 8a6f4db2849e613e0be968d3c0edc605b7040563 /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
parent | 108a39c8766402dcbd0235d8746e2100a18e5813 (diff) | |
parent | d9e2bd8f40b7d77713a72ef94da2fbe8ffa75b91 (diff) | |
download | pleroma-d770cffce0aec0eeb427c8851437f04329700da9.tar.gz pleroma-d770cffce0aec0eeb427c8851437f04329700da9.zip |
Merge branch 'develop' into issue/1280
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..3978c2ec5 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["🎅"] + [%{"emoji" => "🎅", "count" => 1, "accounts" => [represented_user]}] = result assert represented_user["id"] == other_user.id end |