pleroma

commit: 4681771af46172cf09d016f7e2a8d3be1231503f
parent: 1c6303f62090056ab57a8bbe489c1e375b50f0cc
Author: lain <lain@soykaf.club>
Date:   Wed, 19 Aug 2020 10:56:07 +0000

Merge branch 'email-tests' into 'develop'

Fix for sometimes failing email tests

See merge request pleroma/pleroma!2906
Diffstat:
M
test/emails/mailer_test.exs
4
++--
M
test/tasks/digest_test.exs
2
++
M
test/tasks/email_test.exs
2
++

3 files changed, 6 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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])