Merge branch 'hex-flake-id' into 'develop'

[akkoma] / test / conversation_test.exs

diff --git a/test/conversation_test.exs b/test/conversation_test.exs
index f917aa69105d7c2369738f63e8b298abc2a49f30..693427d800aa5ad803bb62909159256df2b1fa8a 100644 (file)
--- a/test/conversation_test.exs
+++ b/test/conversation_test.exs
@@ -11,14 +11,8 @@ defmodule Pleroma.ConversationTest do
 
   import Pleroma.Factory
 
-  setup_all do
-    config_path = [:instance, :federating]
-    initial_setting = Pleroma.Config.get(config_path)
-
-    Pleroma.Config.put(config_path, true)
-    on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)
-
-    :ok
+  clear_config_all([:instance, :federating]) do
+    Pleroma.Config.put([:instance, :federating], true)
   end
 
   test "it goes through old direct conversations" do