summaryrefslogtreecommitdiff
path: root/test/support/conn_case.ex
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-27 12:51:31 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-27 12:51:31 -0500
commit9e54ef086b45c9df38eb293e4db2ea653261c83b (patch)
tree4510ec649a6db5116b4a50c0fe9363592938a45b /test/support/conn_case.ex
parent034ac43f3a91178694d3c621c52ce68207ec4f69 (diff)
parent2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff)
downloadpleroma-9e54ef086b45c9df38eb293e4db2ea653261c83b.tar.gz
pleroma-9e54ef086b45c9df38eb293e4db2ea653261c83b.zip
Merge branch 'develop' into feature/account-export
Diffstat (limited to 'test/support/conn_case.ex')
-rw-r--r--test/support/conn_case.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index 7ef681258..9316a82e4 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -22,7 +22,8 @@ defmodule Pleroma.Web.ConnCase do
using do
quote do
# Import conveniences for testing with connections
- use Phoenix.ConnTest
+ import Plug.Conn
+ import Phoenix.ConnTest
use Pleroma.Tests.Helpers
import Pleroma.Web.Router.Helpers