diff options
author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-08-11 15:12:43 +0300 |
---|---|---|
committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-09-24 10:12:05 +0300 |
commit | 99ca69c159be7b2192de19f6e85a52f56fa0b107 (patch) | |
tree | a3153fdb909860a963f7280598ac601706780ce9 | |
parent | 56ff851d5942989215549f2b34e2923f9963f9bd (diff) | |
download | pleroma-99ca69c159be7b2192de19f6e85a52f56fa0b107.tar.gz |
tests fixes after rebase
-rw-r--r-- | test/application/requirements_test.exs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/application/requirements_test.exs b/test/application/requirements_test.exs index 09fbbf20e..bc583f58f 100644 --- a/test/application/requirements_test.exs +++ b/test/application/requirements_test.exs @@ -16,18 +16,18 @@ defmodule Pleroma.Application.RequirementsTest do setup do: clear_config([Pleroma.Emails.Mailer]) test "raises if welcome email enabled but mail disabled" do - Pleroma.Config.put([:welcome, :email, :enabled], true) - Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false) + Config.put([:welcome, :email, :enabled], true) + Config.put([Pleroma.Emails.Mailer, :enabled], false) - assert_raise Pleroma.ApplicationRequirements.VerifyError, "The mail disabled.", fn -> - capture_log(&Pleroma.ApplicationRequirements.verify!/0) + assert_raise Requirements.VerifyError, "The mail disabled.", fn -> + capture_log(&Requirements.verify!/0) end end end describe "check_confirmation_accounts!" do setup_with_mocks([ - {Pleroma.ApplicationRequirements, [:passthrough], + {Pleroma.Application.Requirements, [:passthrough], [ check_migrations_applied!: fn _ -> :ok end ]} @@ -38,26 +38,26 @@ defmodule Pleroma.Application.RequirementsTest do setup do: clear_config([:instance, :account_activation_required]) test "raises if account confirmation is required but mailer isn't enable" do - Pleroma.Config.put([:instance, :account_activation_required], true) - Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false) + Config.put([:instance, :account_activation_required], true) + Config.put([Pleroma.Emails.Mailer, :enabled], false) - assert_raise Pleroma.ApplicationRequirements.VerifyError, + assert_raise Requirements.VerifyError, "Account activation enabled, but Mailer is disabled. Cannot send confirmation emails.", fn -> - capture_log(&Pleroma.ApplicationRequirements.verify!/0) + capture_log(&Requirements.verify!/0) end end test "doesn't do anything if account confirmation is disabled" do - Pleroma.Config.put([:instance, :account_activation_required], false) - Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false) - assert Pleroma.ApplicationRequirements.verify!() == :ok + Config.put([:instance, :account_activation_required], false) + Config.put([Pleroma.Emails.Mailer, :enabled], false) + assert Requirements.verify!() == :ok end test "doesn't do anything if account confirmation is required and mailer is enabled" do - Pleroma.Config.put([:instance, :account_activation_required], true) - Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], true) - assert Pleroma.ApplicationRequirements.verify!() == :ok + Config.put([:instance, :account_activation_required], true) + Config.put([Pleroma.Emails.Mailer, :enabled], true) + assert Requirements.verify!() == :ok end end |