From: Roman Chvanikov <chvanikoff@pm.me>
Date: Wed, 5 Aug 2020 14:46:14 +0000 (+0300)
Subject: Update clear_config macro
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=97b57014496003cabb416766457552ef854fa658;p=akkoma

Update clear_config macro
---

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)