diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-09 21:46:16 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-09 21:46:16 +0300 |
| commit | 829e99722396c2372770f50d9fc7cfa40c441005 (patch) | |
| tree | 6b72aa4ac5e049eb8bf444ade64e8da4499ef023 /test/web/web_finger/web_finger_controller_test.exs | |
| parent | 46cf81a544edd91f4c3893897fbe2db053f5f6d5 (diff) | |
| parent | 2bb945cb70751bc8e72c036040130bb54c32f391 (diff) | |
| download | pleroma-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/web_finger/web_finger_controller_test.exs')
| -rw-r--r-- | test/web/web_finger/web_finger_controller_test.exs | 6 |
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 |