diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-08 15:44:48 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-08 15:44:48 -0500 |
| commit | 77b1ea68a7700ac4a78c7f2e0ea9f118441d23da (patch) | |
| tree | 06243af101a609256b517f48175380a7c4f5bfbb /test/emails | |
| parent | 4af1b803811cbb59d41f0149706d6dda340b4755 (diff) | |
| parent | 74be4de3f6c2c34447029649526637411acfa9f3 (diff) | |
| download | pleroma-77b1ea68a7700ac4a78c7f2e0ea9f118441d23da.tar.gz pleroma-77b1ea68a7700ac4a78c7f2e0ea9f118441d23da.zip | |
Merge remote-tracking branch 'upstream/develop' into aliases
Diffstat (limited to 'test/emails')
| -rw-r--r-- | test/emails/mailer_test.exs | 4 |
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) |