X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fconversation_test.exs;h=056a0e920eb89803d3253b62604d6a45b3eed8e8;hb=dbcfac11b45b367185a3b18a2db3e3fb07e8f20d;hp=5903d10ff05b1ffd94b4d4594952a1b393283b6f;hpb=557f0e33a7de7ef89c72441ffc3a9c09c56fe9a7;p=akkoma

diff --git a/test/conversation_test.exs b/test/conversation_test.exs
index 5903d10ff..056a0e920 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,6 +11,8 @@ defmodule Pleroma.ConversationTest do
 
   import Pleroma.Factory
 
+  setup_all do: clear_config([:instance, :federating], true)
+
   test "it goes through old direct conversations" do
     user = insert(:user)
     other_user = insert(:user)
@@ -18,6 +20,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)