diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-24 20:32:49 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-24 20:32:49 +0100 |
| commit | 212c31c63796a21233e8decf7ce46853383286fd (patch) | |
| tree | 0cc01fbf91ddb5037d67b39f0af80737aeec51ad /test/conversation_test.exs | |
| parent | 64165d1df95bc3a22260dafa4584471427685864 (diff) | |
| parent | 8eebc75c152ee339bac347350266e3bc6536016b (diff) | |
| download | pleroma-212c31c63796a21233e8decf7ce46853383286fd.tar.gz pleroma-212c31c63796a21233e8decf7ce46853383286fd.zip | |
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
Diffstat (limited to 'test/conversation_test.exs')
| -rw-r--r-- | test/conversation_test.exs | 4 |
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) |