pleroma

commit: 09416d8a03854e946e681ea65f90fe4f3eca2018
parent bf048ab72f3b0a994b5d8dd6c82bf30780468173
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Tue,  8 Sep 2020 16:42:27 +0000

Merge branch 'bugfix/mock' into 'develop'

mockfix but for non-secteam because gitlab

See merge request pleroma/pleroma!2973
Diffstat:
M
lib/pleroma/stats.ex
1
+
M
test/plugs/admin_secret_authentication_plug_test.exs
2
+-
M
test/plugs/oauth_scopes_plug_test.exs
2
+-

3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex
@@ -23,6 +23,7 @@ defmodule Pleroma.Stats do
 
   @impl true
   def init(_args) do
+    if Pleroma.Config.get(:env) == :test, do: :ok = Ecto.Adapters.SQL.Sandbox.checkout(Repo)
     {:ok, nil, {:continue, :calculate_stats}}
   end
 
diff --git a/test/plugs/admin_secret_authentication_plug_test.exs b/test/plugs/admin_secret_authentication_plug_test.exs
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.AdminSecretAuthenticationPlugTest do
-  use Pleroma.Web.ConnCase, async: true
+  use Pleroma.Web.ConnCase
 
   import Mock
   import Pleroma.Factory
diff --git a/test/plugs/oauth_scopes_plug_test.exs b/test/plugs/oauth_scopes_plug_test.exs
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.OAuthScopesPlugTest do
-  use Pleroma.Web.ConnCase, async: true
+  use Pleroma.Web.ConnCase
 
   alias Pleroma.Plugs.OAuthScopesPlug
   alias Pleroma.Repo