summaryrefslogtreecommitdiff
path: root/test/emails
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
commit212c31c63796a21233e8decf7ce46853383286fd (patch)
tree0cc01fbf91ddb5037d67b39f0af80737aeec51ad /test/emails
parent64165d1df95bc3a22260dafa4584471427685864 (diff)
parent8eebc75c152ee339bac347350266e3bc6536016b (diff)
downloadpleroma-212c31c63796a21233e8decf7ce46853383286fd.tar.gz
pleroma-212c31c63796a21233e8decf7ce46853383286fd.zip
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
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)