diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-14 13:15:37 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-14 13:15:37 -0500 |
| commit | 777a7edc6b4bf8b9e0ff3b86bdb780f8f2ae2610 (patch) | |
| tree | 8a53c9b19fb35614657aec1bf58a5566d2e09205 | |
| parent | 37297a8482eedbb0a3adab2748b3e76401d87e4a (diff) | |
| download | pleroma-777a7edc6b4bf8b9e0ff3b86bdb780f8f2ae2610.tar.gz | |
Lint and fix test to match new log message
| -rw-r--r-- | lib/pleroma/application_requirements.ex | 3 | ||||
| -rw-r--r-- | test/application_requirements_test.exs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/application_requirements.ex b/lib/pleroma/application_requirements.ex index d51160b82..ee88c3346 100644 --- a/lib/pleroma/application_requirements.ex +++ b/lib/pleroma/application_requirements.ex @@ -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 diff --git a/test/application_requirements_test.exs b/test/application_requirements_test.exs index 8c92be290..fc609d174 100644 --- a/test/application_requirements_test.exs +++ b/test/application_requirements_test.exs @@ -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 |