Merge develop

[akkoma] / test / conversation_test.exs

diff --git a/test/conversation_test.exs b/test/conversation_test.exs
index 5903d10ff05b1ffd94b4d4594952a1b393283b6f..aa193e0d40dadf907f974ef2cfa378ee7788844e 100644 (file)
--- a/test/conversation_test.exs
+++ b/test/conversation_test.exs
@@ -11,6 +11,16 @@ 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
+  end
+
   test "it goes through old direct conversations" do
     user = insert(:user)
     other_user = insert(:user)