pleroma

commit: cca6c20eb6acd0f510054d1a1050d12ea2a32482
parent a989b793de5790987e1a6a82a7da37be673b11f8
Author: Lain Soykaf <lain@lain.com>
Date:   Tue, 12 Dec 2023 19:35:19 +0400

Revert "EmailTest: use config mock"

This reverts commit dca41cc4a37999a6971b70ef5e0996e528b79bf5.

Diffstat:
M
config/test.exs
2
--
M
lib/pleroma/emails/mailer.ex
3
+--
M
lib/pleroma/user.ex
3
+--
M
test/mix/tasks/pleroma/email_test.exs
17
++++-------------

4 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/config/test.exs b/config/test.exs
@@ -152,8 +152,6 @@ config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock
 config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock
-config :pleroma, Pleroma.Emails.Mailer, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.User, config_impl: Pleroma.UnstubbedConfigMock
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
diff --git a/lib/pleroma/emails/mailer.ex b/lib/pleroma/emails/mailer.ex
@@ -14,10 +14,9 @@ defmodule Pleroma.Emails.Mailer do
 
   @otp_app :pleroma
   @mailer_config [otp: :pleroma]
-  @config_impl Application.compile_env(:pleroma, [__MODULE__, :config_impl], Pleroma.Config)
 
   @spec enabled?() :: boolean()
-  def enabled?, do: @config_impl.get([__MODULE__, :enabled])
+  def enabled?, do: Pleroma.Config.get([__MODULE__, :enabled])
 
   @doc "add email to queue"
   def deliver_async(email, config \\ []) do
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
@@ -86,7 +86,6 @@ defmodule Pleroma.User do
   ]
 
   @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
-  @config_impl Application.compile_env(:pleroma, [__MODULE__, :config_impl], Pleroma.Config)
 
   schema "users" do
     field(:bio, :string, default: "")
@@ -1001,7 +1000,7 @@ defmodule Pleroma.User do
   @spec maybe_send_confirmation_email(User.t()) :: {:ok, :enqueued | :noop}
   def maybe_send_confirmation_email(%User{is_confirmed: false, email: email} = user)
       when is_binary(email) do
-    if @config_impl.get([:instance, :account_activation_required]) do
+    if Config.get([:instance, :account_activation_required]) do
       send_confirmation_email(user)
       {:ok, :enqueued}
     else
diff --git a/test/mix/tasks/pleroma/email_test.exs b/test/mix/tasks/pleroma/email_test.exs
@@ -3,15 +3,13 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Mix.Tasks.Pleroma.EmailTest do
-  use Pleroma.DataCase, async: true
+  use Pleroma.DataCase
 
   import Swoosh.TestAssertions
 
-  alias Pleroma.Test.StaticConfig, as: Config
+  alias Pleroma.Config
   alias Pleroma.Tests.ObanHelpers
-  alias Pleroma.UnstubbedConfigMock, as: ConfigMock
 
-  import Mox
   import Pleroma.Factory
 
   setup_all do
@@ -24,15 +22,8 @@ defmodule Mix.Tasks.Pleroma.EmailTest do
     :ok
   end
 
-  setup do
-    ConfigMock
-    |> stub(:get, fn
-      [Pleroma.Emails.Mailer, :enabled] -> true
-      [:instance, :account_activation_required] -> true
-    end)
-
-    :ok
-  end
+  setup do: clear_config([Pleroma.Emails.Mailer, :enabled], true)
+  setup do: clear_config([:instance, :account_activation_required], true)
 
   describe "pleroma.email test" do
     test "Sends test email with no given address" do