flisk/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'email-tests' into 'develop'

Browse source 
Fix for sometimes failing email tests

See merge request pleroma/pleroma!2906
This commit is contained in:
lain 2020-08-19 10:56:07 +00:00
commit 4681771af4
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/emails/mailer_test.exs
View file

@ -14,10 +14,10 @@ defmodule Pleroma.Emails.MailerTest do
subject: "Pleroma test email", subject: "Pleroma test email",
to: [{"Test User", "user1@example.com"}] 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 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) Mailer.deliver(@email)
:timer.sleep(100) :timer.sleep(100)

2
test/tasks/digest_test.exs
View file

@ -17,6 +17,8 @@ defmodule Mix.Tasks.Pleroma.DigestTest do
:ok :ok
end end
setup do: clear_config([Pleroma.Emails.Mailer, :enabled], true)
describe "pleroma.digest test" do describe "pleroma.digest test" do
test "Sends digest to the given user" do test "Sends digest to the given user" do
user1 = insert(:user) user1 = insert(:user)

2
test/tasks/email_test.exs
View file

@ -16,6 +16,8 @@ defmodule Mix.Tasks.Pleroma.EmailTest do
:ok :ok
end end
setup do: clear_config([Pleroma.Emails.Mailer, :enabled], true)
describe "pleroma.email test" do describe "pleroma.email test" do
test "Sends test email with no given address" do test "Sends test email with no given address" do
mail_to = Config.get([:instance, :email]) mail_to = Config.get([:instance, :email])