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-22 09:30:30 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-01-22 09:30:30 +0300
commitb8d5c09f48a4b643f0dc60930bc69772a32a3b5e (patch)
tree59d1903f2d204b8a5e244430cb17ef772ced5f4e /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
parentb7908844f24f4ede4244261d43f30ed3724efbb7 (diff)
parent71bffbf0b7a3f0e245408a977c48a51763021508 (diff)
downloadpleroma-b8d5c09f48a4b643f0dc60930bc69772a32a3b5e.tar.gz
pleroma-b8d5c09f48a4b643f0dc60930bc69772a32a3b5e.zip
Merge branch 'develop' into issue/1383
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")