summaryrefslogtreecommitdiff
path: root/test/web/web_finger/web_finger_controller_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-07-09 12:49:04 -0500
committerMark Felder <feld@FreeBSD.org>2019-07-09 12:49:04 -0500
commit9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96 (patch)
treefc28e2fb05ad0158fe881de7a49e90d941e10ad4 /test/web/web_finger/web_finger_controller_test.exs
parent9f235028569968871ef9ea933459c6e9369e737a (diff)
parente19e82975871388831fd23adc50fcaaea85ad5da (diff)
downloadpleroma-9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96.tar.gz
pleroma-9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96.zip
Merge branch 'develop' into feature/allow-user-query-via-id
Diffstat (limited to 'test/web/web_finger/web_finger_controller_test.exs')
-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