summaryrefslogtreecommitdiff
path: root/test/web/web_finger/web_finger_controller_test.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-17 19:30:05 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-17 19:30:05 +0000
commit078b8b6d228bee28697fda4bbefe65736f8b0d3c (patch)
tree5ab5ffc319a32beaa954af9f6f216642651c444d /test/web/web_finger/web_finger_controller_test.exs
parent567359790ea623949585629c41580961c59a01ff (diff)
parentba9ef77b6ae7fd6ade9eb87a418f9c87c7d94647 (diff)
downloadpleroma-078b8b6d228bee28697fda4bbefe65736f8b0d3c.tar.gz
pleroma-078b8b6d228bee28697fda4bbefe65736f8b0d3c.zip
Merge branch 'phoenix14' into 'develop'
Upgrade to Phoenix 1.4 Closes #451 See merge request pleroma/pleroma!560
Diffstat (limited to 'test/web/web_finger/web_finger_controller_test.exs')
-rw-r--r--test/web/web_finger/web_finger_controller_test.exs4
1 files changed, 0 insertions, 4 deletions
diff --git a/test/web/web_finger/web_finger_controller_test.exs b/test/web/web_finger/web_finger_controller_test.exs
index 3bc878532..844ff51d2 100644
--- a/test/web/web_finger/web_finger_controller_test.exs
+++ b/test/web/web_finger/web_finger_controller_test.exs
@@ -1,11 +1,7 @@
defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do
use Pleroma.Web.ConnCase
- alias Pleroma.User
- alias Pleroma.Web.WebFinger.WebFingerController
-
import Pleroma.Factory
- import ExUnit.CaptureLog
import Tesla.Mock
setup do