diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-20 12:55:51 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-20 12:55:51 -0600 |
| commit | 390bf9b097cab96b9d3a0214f974044667524442 (patch) | |
| tree | 2f0a6fbefb264dcedb12910870db0f9aea8c3d29 /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
| parent | cde828ff7df64740f36b2fc9dfdbfc8d76a8a78d (diff) | |
| parent | ab36459464311389c2929ff1c48537889066a9f8 (diff) | |
| download | pleroma-390bf9b097cab96b9d3a0214f974044667524442.tar.gz pleroma-390bf9b097cab96b9d3a0214f974044667524442.zip | |
Merge branch 'develop' into fix/attachments-cleanup
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 | 5 |
1 files changed, 0 insertions, 5 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..fb7500134 100644 --- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs @@ -57,11 +57,6 @@ 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") |