summaryrefslogtreecommitdiff
path: root/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-01-21 09:23:35 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-01-21 09:23:35 +0300
commit41e233200730dca4a0d6d846d44653eef4de0fec (patch)
tree2920b8740145114b034fcdc860b2bc1b89f406dc /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
parenta5db044e579ed9923e610cdf89dff6146d9b0986 (diff)
parentab36459464311389c2929ff1c48537889066a9f8 (diff)
downloadpleroma-41e233200730dca4a0d6d846d44653eef4de0fec.tar.gz
pleroma-41e233200730dca4a0d6d846d44653eef4de0fec.zip
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.exs5
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")