diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-08-25 11:57:23 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-08-25 11:57:23 -0500 |
| commit | 479578b148f28f311a7d20f6da99bbc0dab1652c (patch) | |
| tree | 2b0e5bfe6bfa5c4b954b9442d4d2a1d4ad4bc8cf /test/emails | |
| parent | 98f8851f29f940051656caa1715820bce70f8c29 (diff) | |
| parent | 361aa22e2862c1c914baf8257fdc8b20cbc7941d (diff) | |
| download | pleroma-479578b148f28f311a7d20f6da99bbc0dab1652c.tar.gz pleroma-479578b148f28f311a7d20f6da99bbc0dab1652c.zip | |
Merge branch 'develop' into feld-2168-media-preview-proxy
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) |