fix for sometimes failing tests

diff --git a/test/emails/mailer_test.exs b/test/emails/mailer_test.exs
index 3da45056bed564d0dbce77f7de2b6ba5f8c88e8d..9e232d2a0b8fab77b33e40633d377c0e3d11eeb8 100644 (file)
--- a/test/emails/mailer_test.exs
+++ b/test/emails/mailer_test.exs
@@ -14,10 +14,10 @@ defmodule Pleroma.Emails.MailerTest do
     subject: "Pleroma test email",
     to: [{"Test User", "user1@example.com"}]
   }
-  setup do: clear_config([Pleroma.Emails.Mailer, :enabled])
+  setup do: clear_config([Pleroma.Emails.Mailer, :enabled], true)
 
   test "not send email when mailer is disabled" do
-    Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false)
+    clear_config([Pleroma.Emails.Mailer, :enabled], false)
     Mailer.deliver(@email)
     :timer.sleep(100)
 

diff --git a/test/tasks/digest_test.exs b/test/tasks/digest_test.exs
index eefbc893624d03eb545bb70f81656e39889e2120..0b444c86d8e9dd36469abe5f5ed5d6eb46cf4151 100644 (file)
--- a/test/tasks/digest_test.exs
+++ b/test/tasks/digest_test.exs
@@ -17,6 +17,8 @@ defmodule Mix.Tasks.Pleroma.DigestTest do
     :ok
   end
 
+  setup do: clear_config([Pleroma.Emails.Mailer, :enabled], true)
+
   describe "pleroma.digest test" do
     test "Sends digest to the given user" do
       user1 = insert(:user)

diff --git a/test/tasks/email_test.exs b/test/tasks/email_test.exs
index 944c070641f7f878e136ac5ecebb89031f88c6c3..c3af7ef68ab3a2c7dc9b91844257660f59795789 100644 (file)
--- a/test/tasks/email_test.exs
+++ b/test/tasks/email_test.exs
@@ -16,6 +16,8 @@ defmodule Mix.Tasks.Pleroma.EmailTest do
     :ok
   end
 
+  setup do: clear_config([Pleroma.Emails.Mailer, :enabled], true)
+
   describe "pleroma.email test" do
     test "Sends test email with no given address" do
       mail_to = Config.get([:instance, :email])