diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-08 17:24:09 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-08 17:24:09 -0500 |
| commit | 3f9263fb16ad519d2dd45106549a8ba42b68fc1f (patch) | |
| tree | a48eb564f7f037a876a4d2131f8571aa33702b22 /test/emails | |
| parent | 24ce9c011caf7401fb261c7df4196b2ef9ba3d90 (diff) | |
| parent | 74be4de3f6c2c34447029649526637411acfa9f3 (diff) | |
| download | pleroma-3f9263fb16ad519d2dd45106549a8ba42b68fc1f.tar.gz pleroma-3f9263fb16ad519d2dd45106549a8ba42b68fc1f.zip | |
Merge remote-tracking branch 'upstream/develop' into restrict-origin
Diffstat (limited to 'test/emails')
| -rw-r--r-- | test/emails/mailer_test.exs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/emails/mailer_test.exs b/test/emails/mailer_test.exs index e6e34cba8..9e232d2a0 100644 --- a/test/emails/mailer_test.exs +++ b/test/emails/mailer_test.exs @@ -14,11 +14,12 @@ 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) refute_email_sent( from: {"Pleroma", "noreply@example.com"}, @@ -30,6 +31,7 @@ defmodule Pleroma.Emails.MailerTest do test "send email" do Mailer.deliver(@email) + :timer.sleep(100) assert_email_sent( from: {"Pleroma", "noreply@example.com"}, @@ -41,6 +43,7 @@ defmodule Pleroma.Emails.MailerTest do test "perform" do Mailer.perform(:deliver_async, @email, []) + :timer.sleep(100) assert_email_sent( from: {"Pleroma", "noreply@example.com"}, |