diff options
author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-21 10:32:27 +0300 |
---|---|---|
committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-21 10:32:27 +0300 |
commit | 503d966e9f7d4c41a1bfbd215b375443a858564a (patch) | |
tree | 634499f234fcd8d9f2b81523c66eaaf339ee52f8 /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
parent | dcae5914d1f7d540e3c20be5988d5e3547a349cd (diff) | |
parent | ab36459464311389c2929ff1c48537889066a9f8 (diff) | |
download | pleroma-503d966e9f7d4c41a1bfbd215b375443a858564a.tar.gz pleroma-503d966e9f7d4c41a1bfbd215b375443a858564a.zip |
Merge branch 'develop' into admin-be
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") |