summaryrefslogtreecommitdiff
path: root/test/web/federator_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivant.business@gmail.com>2019-07-09 21:46:16 +0300
committerIvan Tashkinov <ivant.business@gmail.com>2019-07-09 21:46:16 +0300
commit829e99722396c2372770f50d9fc7cfa40c441005 (patch)
tree6b72aa4ac5e049eb8bf444ade64e8da4499ef023 /test/web/federator_test.exs
parent46cf81a544edd91f4c3893897fbe2db053f5f6d5 (diff)
parent2bb945cb70751bc8e72c036040130bb54c32f391 (diff)
downloadpleroma-829e99722396c2372770f50d9fc7cfa40c441005.tar.gz
pleroma-829e99722396c2372770f50d9fc7cfa40c441005.zip
[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
# Conflicts: # lib/pleroma/object.ex # test/web/activity_pub/transmogrifier_test.exs # test/web/ostatus/ostatus_test.exs
Diffstat (limited to 'test/web/federator_test.exs')
-rw-r--r--test/web/federator_test.exs7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs
index 0f43bc8f2..69dd4d747 100644
--- a/test/web/federator_test.exs
+++ b/test/web/federator_test.exs
@@ -12,6 +12,13 @@ defmodule Pleroma.Web.FederatorTest do
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
+
+ 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