diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-09 15:35:28 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-09 15:35:28 +0000 |
| commit | 95c085174dc523f2898f02120d7ff0b120930d91 (patch) | |
| tree | 101ab8c43a0886b76a574478624058e2c0a29704 /test/web/activity_pub | |
| parent | 376a55c97fcf178abec3091db830215642bf23c1 (diff) | |
| parent | abe2e8881f946aafc2012edd43373c22837387af (diff) | |
| download | pleroma-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/activity_pub')
| -rw-r--r-- | test/web/activity_pub/activity_pub_controller_test.exs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index 8b3233729..5a8a67155 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -15,6 +15,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest 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 |