diff options
| author | feld <feld@feld.me> | 2020-10-22 20:33:52 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-11-04 17:05:21 +0300 |
| commit | 6c8469664a08d2cd02bd8e6d998d8e2d5f07dac5 (patch) | |
| tree | ed1d6e555e7b06dd93e0c24d6db69df4ef8c8cf6 /test/support | |
| parent | 49b43e668eb208a95a621f667f72f41b69bc10e5 (diff) | |
| download | pleroma-6c8469664a08d2cd02bd8e6d998d8e2d5f07dac5.tar.gz pleroma-6c8469664a08d2cd02bd8e6d998d8e2d5f07dac5.zip | |
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
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 |