diff options
| author | minibikini <egor@kislitsyn.com> | 2020-10-27 18:59:19 +0000 |
|---|---|---|
| committer | minibikini <egor@kislitsyn.com> | 2020-10-27 18:59:19 +0000 |
| commit | 1bfd8528bbc71c8c34253eb245de7df498064fb4 (patch) | |
| tree | 97387260c85bb6b5505924de806110d8f71eb3fc /test/support | |
| parent | 18a91d85e59eb67a2d58a28aae732c34b75ebe97 (diff) | |
| parent | 5aff4799515c141cb0a42686733b2f40faba6f86 (diff) | |
| download | pleroma-1bfd8528bbc71c8c34253eb245de7df498064fb4.tar.gz pleroma-1bfd8528bbc71c8c34253eb245de7df498064fb4.zip | |
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
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 |