diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-25 09:05:17 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-25 09:05:17 +0300 |
commit | 012d428e1ffdd83888f339e4dbaec344202eebe1 (patch) | |
tree | 41483fdfb5c75e6d338ad48b83f7d4e621365694 /test/emails/mailer_test.exs | |
parent | e743c2232970e321c833604b232520587ad8e402 (diff) | |
parent | 8eebc75c152ee339bac347350266e3bc6536016b (diff) | |
download | pleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.tar.gz pleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
Diffstat (limited to 'test/emails/mailer_test.exs')
-rw-r--r-- | test/emails/mailer_test.exs | 3 |
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) |