diff options
| author | feld <feld@feld.me> | 2020-10-22 20:33:52 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-22 20:33:52 +0000 |
| commit | d6907e6e0c50e8c965d07dd902ead94ff2d20f12 (patch) | |
| tree | a49bb13a96a0b6f200d35f8df66a37ed8c6ca3f0 /test/support | |
| parent | d031b185e2c9f143b134b1813a799910adf10bad (diff) | |
| parent | 14900164b8e56d8dc5506016e5a0b55632306e34 (diff) | |
| download | pleroma-d6907e6e0c50e8c965d07dd902ead94ff2d20f12.tar.gz pleroma-d6907e6e0c50e8c965d07dd902ead94ff2d20f12.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 |