moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lint and fix test to match new log message

This commit is contained in:
Mark Felder 2020-07-14 13:15:37 -05:00
parent 37297a8482
commit 777a7edc6b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/application_requirements.ex
View File

@ -34,7 +34,8 @@ def check_confirmation_accounts!(:ok) do
"Account activation enabled, but no Mailer settings enabled.\nPlease set config :pleroma, :instance, account_activation_required: false\nOtherwise setup and enable Mailer." "Account activation enabled, but no Mailer settings enabled.\nPlease set config :pleroma, :instance, account_activation_required: false\nOtherwise setup and enable Mailer."
) )
{:error, "Account activation enabled, but Mailer is disabled. Cannot send confirmation emails."} {:error,
"Account activation enabled, but Mailer is disabled. Cannot send confirmation emails."}
else else
:ok :ok
end end

2
test/application_requirements_test.exs
View File

@ -26,7 +26,7 @@ test "raises if account confirmation is required but mailer isn't enable" do
Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false) Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false)
assert_raise Pleroma.ApplicationRequirements.VerifyError, assert_raise Pleroma.ApplicationRequirements.VerifyError,
"Confirmation account: Mailer is disabled", "Account activation enabled, but Mailer is disabled. Cannot send confirmation emails.",
fn -> fn ->
capture_log(&Pleroma.ApplicationRequirements.verify!/0) capture_log(&Pleroma.ApplicationRequirements.verify!/0)
end end