Browse Source

Lint and fix test to match new log message

chores/our-libs-hex-releases
Mark Felder 4 years ago
parent
commit
777a7edc6b
2 changed files with 3 additions and 2 deletions
  1. +2
    -1
      lib/pleroma/application_requirements.ex
  2. +1
    -1
      test/application_requirements_test.exs

+ 2
- 1
lib/pleroma/application_requirements.ex View File

@@ -34,7 +34,8 @@ defmodule Pleroma.ApplicationRequirements do
"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
:ok
end


+ 1
- 1
test/application_requirements_test.exs View File

@@ -26,7 +26,7 @@ defmodule Pleroma.ApplicationRequirementsTest do
Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false)

assert_raise Pleroma.ApplicationRequirements.VerifyError,
"Confirmation account: Mailer is disabled",
"Account activation enabled, but Mailer is disabled. Cannot send confirmation emails.",
fn ->
capture_log(&Pleroma.ApplicationRequirements.verify!/0)
end


Loading…
Cancel
Save