hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/account-export

Browse source
This commit is contained in:
Mark Felder 2020-10-27 12:51:31 -05:00
commit 9e54ef086b
43 changed files with 274 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/support/channel_case.ex
View file

@ -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

3
test/support/conn_case.ex
View file

@ -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