summaryrefslogtreecommitdiff
path: root/test/conversation_test.exs
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-20 20:47:54 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-20 20:47:54 +0300
commit9bae9b1b1bf4f48e20ce0b2d9b670648d052e069 (patch)
treee6755e3d585d753ad7da171a858508d4a1603a49 /test/conversation_test.exs
parent51ce0813d351cad900966aea49a6f6d17d33f964 (diff)
parentd74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff)
downloadpleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.tar.gz
pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.zip
Merge branch 'develop' into gun
Diffstat (limited to 'test/conversation_test.exs')
-rw-r--r--test/conversation_test.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/conversation_test.exs b/test/conversation_test.exs
index dc0027d04..056a0e920 100644
--- a/test/conversation_test.exs
+++ b/test/conversation_test.exs
@@ -11,9 +11,7 @@ defmodule Pleroma.ConversationTest do
import Pleroma.Factory
- clear_config_all([:instance, :federating]) do
- Pleroma.Config.put([:instance, :federating], true)
- end
+ setup_all do: clear_config([:instance, :federating], true)
test "it goes through old direct conversations" do
user = insert(:user)