aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/application_requirements_test.exs5
-rw-r--r--test/support/helpers.ex8
2 files changed, 5 insertions, 8 deletions
diff --git a/test/application_requirements_test.exs b/test/application_requirements_test.exs
index e96295955..21d24ddd0 100644
--- a/test/application_requirements_test.exs
+++ b/test/application_requirements_test.exs
@@ -127,10 +127,7 @@ defmodule Pleroma.ApplicationRequirementsTest do
:ok
end
- setup do
- Pleroma.Config.get(:i_am_aware_this_may_cause_data_loss, 42) |> IO.inspect()
- clear_config([:i_am_aware_this_may_cause_data_loss, :disable_migration_check])
- end
+ setup do: clear_config([:i_am_aware_this_may_cause_data_loss, :disable_migration_check])
test "raises if it detects unapplied migrations" do
assert_raise Pleroma.ApplicationRequirements.VerifyError,
diff --git a/test/support/helpers.ex b/test/support/helpers.ex
index 7d729541d..ecd4b1e18 100644
--- a/test/support/helpers.ex
+++ b/test/support/helpers.ex
@@ -17,16 +17,16 @@ defmodule Pleroma.Tests.Helpers do
defmacro clear_config(config_path, do: yield) do
quote do
- initial_setting = Config.get(unquote(config_path), :__clear_config_absent__)
+ initial_setting = Config.fetch(unquote(config_path))
unquote(yield)
on_exit(fn ->
case initial_setting do
- :__clear_config_absent__ ->
+ :error ->
Config.delete(unquote(config_path))
- _ ->
- Config.put(unquote(config_path), initial_setting)
+ {:ok, value} ->
+ Config.put(unquote(config_path), value)
end
end)