summaryrefslogtreecommitdiff
path: root/test/web/web_finger/web_finger_controller_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-07-15 17:10:27 -0500
committerMark Felder <feld@FreeBSD.org>2019-07-15 17:10:27 -0500
commitffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38 (patch)
treeb397d1192c69a7d089c86d41b6e09e89954ea798 /test/web/web_finger/web_finger_controller_test.exs
parente912f81c828cc7e1d2c0dff8daed3ad52f407a61 (diff)
parent03bcb40883dafa2886110e2b625c4cc5c21106f1 (diff)
downloadpleroma-ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38.tar.gz
pleroma-ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38.zip
Merge branch 'develop' into feature/matstodon-statuses-by-name
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