summaryrefslogtreecommitdiff
path: root/test/web/web_finger
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-07-09 15:35:28 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-07-09 15:35:28 +0000
commit95c085174dc523f2898f02120d7ff0b120930d91 (patch)
tree101ab8c43a0886b76a574478624058e2c0a29704 /test/web/web_finger
parent376a55c97fcf178abec3091db830215642bf23c1 (diff)
parentabe2e8881f946aafc2012edd43373c22837387af (diff)
downloadpleroma-95c085174dc523f2898f02120d7ff0b120930d91.tar.gz
pleroma-95c085174dc523f2898f02120d7ff0b120930d91.zip
Merge branch 'test-speedup' into 'develop'
Testing: Don't federate in testing. See merge request pleroma/pleroma!1391
Diffstat (limited to 'test/web/web_finger')
-rw-r--r--test/web/web_finger/web_finger_controller_test.exs6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/web/web_finger/web_finger_controller_test.exs b/test/web/web_finger/web_finger_controller_test.exs
index 43fccfc7a..a14ed3126 100644
--- a/test/web/web_finger/web_finger_controller_test.exs
+++ b/test/web/web_finger/web_finger_controller_test.exs
@@ -10,6 +10,12 @@ defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do
setup do
mock(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