diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-08-11 15:13:29 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-08-11 15:13:29 +0300 |
| commit | 2def3cbf417075146da5e54201e9b969e6aa3eca (patch) | |
| tree | 93cdf149a1874f56d2808598f8aeee15e60c8a10 /test/emails | |
| parent | 56ddf20208657487bf0298409cf91b11dac346ff (diff) | |
| parent | 686002164a5ab63ccb22cff015faf87f8f7fc9ec (diff) | |
| download | pleroma-2def3cbf417075146da5e54201e9b969e6aa3eca.tar.gz pleroma-2def3cbf417075146da5e54201e9b969e6aa3eca.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# mix.lock
Diffstat (limited to 'test/emails')
| -rw-r--r-- | test/emails/mailer_test.exs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/emails/mailer_test.exs b/test/emails/mailer_test.exs index e6e34cba8..3da45056b 100644 --- a/test/emails/mailer_test.exs +++ b/test/emails/mailer_test.exs @@ -19,6 +19,7 @@ defmodule Pleroma.Emails.MailerTest do test "not send email when mailer is disabled" do Pleroma.Config.put([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"}, |