Merge branch 'bugfix/mock' into 'develop'

mockfix but for non-secteam because gitlab See merge request pleroma/pleroma!2973
2020-09-08 16:42:27 +00:00 · 2020-09-08 16:42:27 +00:00 · 073f5490ec
parent 7528a7e447
commit 073f5490ec
2 changed files with 2 additions and 2 deletions
--- 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
--- 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