Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...

[akkoma] / test / support / helpers.ex

diff --git a/test/support/helpers.ex b/test/support/helpers.ex
index 5cbf2e29197c14de391dcef39aea3126ef3401d3..ecd4b1e185889cb5b3398511f7fb804a2d2a7aad 100644 (file)
--- a/test/support/helpers.ex
+++ b/test/support/helpers.ex
@@ -17,9 +17,19 @@ defmodule Pleroma.Tests.Helpers do
 
   defmacro clear_config(config_path, do: yield) do
     quote do
-      initial_setting = Config.get(unquote(config_path))
+      initial_setting = Config.fetch(unquote(config_path))
       unquote(yield)
-      on_exit(fn -> Config.put(unquote(config_path), initial_setting) end)
+
+      on_exit(fn ->
+        case initial_setting do
+          :error ->
+            Config.delete(unquote(config_path))
+
+          {:ok, value} ->
+            Config.put(unquote(config_path), value)
+        end
+      end)
+
       :ok
     end
   end