diff options
| author | feld <feld@feld.me> | 2020-10-27 17:42:24 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-27 17:42:24 +0000 |
| commit | e062329a177e1a1382cb3a44ef71e6d278b4963e (patch) | |
| tree | 1d98291af1a0d0c64794bc2b4e13ee7e62c634bc /test/support/conn_case.ex | |
| parent | d16336e7fbf7851ee5f50a17747067f2be741581 (diff) | |
| parent | 2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff) | |
| download | pleroma-e062329a177e1a1382cb3a44ef71e6d278b4963e.tar.gz pleroma-e062329a177e1a1382cb3a44ef71e6d278b4963e.zip | |
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/support/conn_case.ex')
| -rw-r--r-- | test/support/conn_case.ex | 3 |
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 |