summaryrefslogtreecommitdiff
path: root/test/emails
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-03-20 22:08:34 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-03-20 22:08:34 +0400
commit80e15716102e03323b117ade919035402cc7408f (patch)
tree60b57dde12b4feb693a6383b71f813561a48a928 /test/emails
parent5ad54d1bd556f3dc957aa1d2ebe6314618e75399 (diff)
parentd74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff)
downloadpleroma-80e15716102e03323b117ade919035402cc7408f.tar.gz
pleroma-80e15716102e03323b117ade919035402cc7408f.zip
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/emails')
-rw-r--r--test/emails/mailer_test.exs3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/emails/mailer_test.exs b/test/emails/mailer_test.exs
index f30aa6a72..e6e34cba8 100644
--- a/test/emails/mailer_test.exs
+++ b/test/emails/mailer_test.exs
@@ -14,8 +14,7 @@ defmodule Pleroma.Emails.MailerTest do
subject: "Pleroma test email",
to: [{"Test User", "user1@example.com"}]
}
-
- clear_config([Pleroma.Emails.Mailer, :enabled])
+ setup do: clear_config([Pleroma.Emails.Mailer, :enabled])
test "not send email when mailer is disabled" do
Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false)