diff options
author | Mark Felder <feld@FreeBSD.org> | 2019-07-15 17:10:27 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2019-07-15 17:10:27 -0500 |
commit | ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38 (patch) | |
tree | b397d1192c69a7d089c86d41b6e09e89954ea798 /test/conversation_test.exs | |
parent | e912f81c828cc7e1d2c0dff8daed3ad52f407a61 (diff) | |
parent | 03bcb40883dafa2886110e2b625c4cc5c21106f1 (diff) | |
download | pleroma-ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38.tar.gz pleroma-ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38.zip |
Merge branch 'develop' into feature/matstodon-statuses-by-name
Diffstat (limited to 'test/conversation_test.exs')
-rw-r--r-- | test/conversation_test.exs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/test/conversation_test.exs b/test/conversation_test.exs index 5903d10ff..aa193e0d4 100644 --- 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) |