aboutsummaryrefslogtreecommitdiff
path: root/test/emails/mailer_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-08-26 16:37:25 -0500
committerMark Felder <feld@FreeBSD.org>2020-08-26 16:37:25 -0500
commitc199e18bb5b1a923029248783c60acf7c9597f64 (patch)
treeeaae6461c41c5ed526cc1a7cb106c6c881cafcb4 /test/emails/mailer_test.exs
parent98f8851f29f940051656caa1715820bce70f8c29 (diff)
parent6f17aea066498bf070f0decb3ac0508c6b04e3b8 (diff)
downloadpleroma-2168-media-preview-proxy.tar.gz
Merge branch 'develop' into 2168-media-preview-proxy2168-media-preview-proxy
Diffstat (limited to 'test/emails/mailer_test.exs')
-rw-r--r--test/emails/mailer_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/emails/mailer_test.exs b/test/emails/mailer_test.exs
index 3da45056b..9e232d2a0 100644
--- 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)