Merge branch 'test-cases-mox-setup' into 'develop'

Mox mode setup tweak; refactoring

See merge request pleroma/pleroma!3263

test/pleroma/gun/connection_pool_test.exs

@@ -19,7 +19,6 @@ defmodule Pleroma.Gun.ConnectionPoolTest do
     :ok
   end
 
-  setup :set_mox_from_context
   setup :gun_mock
 
   test "gives the same connection to 2 concurrent requests" do

test/support/channel_case.ex

@@ -30,19 +30,5 @@ defmodule Pleroma.Web.ChannelCase do
     end
   end
 
-  setup tags do
-    :ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
-
-    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
-  end
+  setup tags, do: Pleroma.DataCase.setup_multi_process_mode(tags)
 end

test/support/conn_case.ex

@@ -19,6 +19,8 @@ defmodule Pleroma.Web.ConnCase do
 
   use ExUnit.CaseTemplate
 
+  alias Pleroma.DataCase
+
   using do
     quote do
       # Import conveniences for testing with connections
@@ -116,27 +118,9 @@ defmodule Pleroma.Web.ConnCase do
   end
 
   setup tags do
-    :ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
-
-    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
-
-    if tags[:needs_streamer] do
-      start_supervised(%{
-        id: Pleroma.Web.Streamer.registry(),
-        start:
-          {Registry, :start_link, [[keys: :duplicate, name: Pleroma.Web.Streamer.registry()]]}
-      })
-    end
-
-    Pleroma.DataCase.stub_pipeline()
+    DataCase.setup_multi_process_mode(tags)
+    DataCase.setup_streamer(tags)
+    DataCase.stub_pipeline()
 
     Mox.verify_on_exit!()
 

test/support/data_case.ex

@@ -64,7 +64,7 @@ defmodule Pleroma.DataCase do
     end)
   end
 
-  setup tags do
+  def setup_multi_process_mode(tags) do
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
 
     if tags[:async] do
@@ -72,11 +72,16 @@ defmodule Pleroma.DataCase do
       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()
+      Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
       clear_cachex()
     end
 
+    :ok
+  end
+
+  def setup_streamer(tags) do
     if tags[:needs_streamer] do
       start_supervised(%{
         id: Pleroma.Web.Streamer.registry(),
@@ -85,6 +90,12 @@ defmodule Pleroma.DataCase do
       })
     end
 
+    :ok
+  end
+
+  setup tags do
+    setup_multi_process_mode(tags)
+    setup_streamer(tags)
     stub_pipeline()
 
     Mox.verify_on_exit!()