summaryrefslogtreecommitdiff
path: root/test/support/channel_case.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-12-30 17:10:02 -0600
committerAlex Gleason <alex@alexgleason.me>2020-12-30 17:10:02 -0600
commitcbce88007672dc810cb345bb9872a009cbdc93d8 (patch)
tree45be2517812f2a598d9b6133554038a87d4b9f46 /test/support/channel_case.ex
parent83770b7b391fdf8bdc22f63047b1cf444a7b16ce (diff)
parent38924166eb3228deb71a2e23f1e8fd3255c6bd85 (diff)
downloadpleroma-cbce88007672dc810cb345bb9872a009cbdc93d8.tar.gz
pleroma-cbce88007672dc810cb345bb9872a009cbdc93d8.zip
Merge remote-tracking branch 'upstream/develop' into aliases
Diffstat (limited to 'test/support/channel_case.ex')
-rw-r--r--test/support/channel_case.ex10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/support/channel_case.ex b/test/support/channel_case.ex
index d63a0f06b..f4696adb3 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
@@ -33,8 +33,14 @@ defmodule Pleroma.Web.ChannelCase do
setup tags do
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
- unless tags[:async] do
+ if tags[:async] do
+ Mox.stub_with(Pleroma.CachexMock, Pleroma.NullCache)
+ Mox.set_mox_private()
+ else
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
+ Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
+ Mox.set_mox_global()
+ Pleroma.DataCase.clear_cachex()
end
:ok