diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-27 12:51:31 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-27 12:51:31 -0500 |
| commit | 9e54ef086b45c9df38eb293e4db2ea653261c83b (patch) | |
| tree | 4510ec649a6db5116b4a50c0fe9363592938a45b /test/support | |
| parent | 034ac43f3a91178694d3c621c52ce68207ec4f69 (diff) | |
| parent | 2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff) | |
| download | pleroma-9e54ef086b45c9df38eb293e4db2ea653261c83b.tar.gz pleroma-9e54ef086b45c9df38eb293e4db2ea653261c83b.zip | |
Merge branch 'develop' into feature/account-export
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/channel_case.ex | 2 | ||||
| -rw-r--r-- | test/support/conn_case.ex | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/support/channel_case.ex b/test/support/channel_case.ex index d63a0f06b..114184a9f 100644 --- a/test/support/channel_case.ex +++ b/test/support/channel_case.ex @@ -22,7 +22,7 @@ defmodule Pleroma.Web.ChannelCase do using do quote do # Import conveniences for testing with channels - use Phoenix.ChannelTest + import Phoenix.ChannelTest use Pleroma.Tests.Helpers # The default endpoint for testing 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 |