diff options
| author | lain <lain@soykaf.club> | 2020-08-19 10:56:07 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-19 10:56:07 +0000 |
| commit | 4681771af46172cf09d016f7e2a8d3be1231503f (patch) | |
| tree | 96d617ae99a992c4817b176e4077457d2fba983c /test/emails | |
| parent | 1c6303f62090056ab57a8bbe489c1e375b50f0cc (diff) | |
| parent | c68bcae362921a16dfb0995539a97ca521036dd7 (diff) | |
| download | pleroma-4681771af46172cf09d016f7e2a8d3be1231503f.tar.gz pleroma-4681771af46172cf09d016f7e2a8d3be1231503f.zip | |
Merge branch 'email-tests' into 'develop'
Fix for sometimes failing email tests
See merge request pleroma/pleroma!2906
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) |