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 5903d10ff05b1ffd94b4d4594952a1b393283b6f..693427d800aa5ad803bb62909159256df2b1fa8a 100644 (file)
--- a/test/conversation_test.exs
+++ b/test/conversation_test.exs
@@ -11,6 +11,10 @@ defmodule Pleroma.ConversationTest do
 
   import Pleroma.Factory
 
+  clear_config_all([:instance, :federating]) do
+    Pleroma.Config.put([:instance, :federating], true)
+  end
+
   test "it goes through old direct conversations" do
     user = insert(:user)
     other_user = insert(:user)
@@ -18,6 +22,8 @@ defmodule Pleroma.ConversationTest do
     {:ok, _activity} =
       CommonAPI.post(user, %{"visibility" => "direct", "status" => "hey @#{other_user.nickname}"})
 
+    Pleroma.Tests.ObanHelpers.perform_all()
+
     Repo.delete_all(Conversation)
     Repo.delete_all(Conversation.Participation)