X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=test%2Fconversation_test.exs;h=dc0027d0440a00fdc5fc79735b1b12f69c2a0731;hb=4427161ca3798aeee0290f0ed7ac5536039509d8;hp=f917aa69105d7c2369738f63e8b298abc2a49f30;hpb=8778c16dac1789eeb6dd51524573163216200b5d;p=akkoma

diff --git a/test/conversation_test.exs b/test/conversation_test.exs
index f917aa691..dc0027d04 100644
--- a/test/conversation_test.exs
+++ b/test/conversation_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.ConversationTest do
@@ -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