summaryrefslogtreecommitdiff
path: root/test/emails
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-09-22 21:42:10 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-09-22 21:42:10 +0300
commit72d2b34d3bf47705ad5298f2ce2c6bf48a0a8e82 (patch)
treedf79362a63e25b87c492c8568e52c029a7ee7542 /test/emails
parent489a107cf449a10c7f6ac9a4b8d4a7f9f7314c5c (diff)
parent02f12ec6253093d8bedaf84d78d0f7e533745e1b (diff)
downloadpleroma-72d2b34d3bf47705ad5298f2ce2c6bf48a0a8e82.tar.gz
pleroma-72d2b34d3bf47705ad5298f2ce2c6bf48a0a8e82.zip
Merge branch 'develop' into issue/1975
Diffstat (limited to 'test/emails')
-rw-r--r--test/emails/mailer_test.exs4
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)