diff options
| author | lain <lain@soykaf.club> | 2019-08-19 17:00:59 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-19 17:00:59 +0000 |
| commit | d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff (patch) | |
| tree | cd76bb5d4cf7716624378a9cbf9cd42a63eee735 /test/web/websub/websub_controller_test.exs | |
| parent | cb222b72b39ae4dc887657d1eae03d0360cbd429 (diff) | |
| parent | e5d2c0c66949ad90f9ee02874bdea2aa94f7f683 (diff) | |
| download | pleroma-d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff.tar.gz pleroma-d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff.zip | |
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/web/websub/websub_controller_test.exs')
| -rw-r--r-- | test/web/websub/websub_controller_test.exs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/test/web/websub/websub_controller_test.exs b/test/web/websub/websub_controller_test.exs index aa7262beb..59cacbe68 100644 --- a/test/web/websub/websub_controller_test.exs +++ b/test/web/websub/websub_controller_test.exs @@ -9,14 +9,8 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do alias Pleroma.Web.Websub alias Pleroma.Web.Websub.WebsubClientSubscription - setup_all do - 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 + clear_config_all([:instance, :federating]) do + Pleroma.Config.put([:instance, :federating], true) end test "websub subscription request", %{conn: conn} do |