diff options
| author | lain <lain@soykaf.club> | 2020-02-20 11:36:48 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-02-20 11:36:48 +0000 |
| commit | cf4ecffcea84d9b214f922a973d50c699317a202 (patch) | |
| tree | 27eeb915193738f167db55119afb5a5ebafa9b6b /test/web/media_proxy/media_proxy_controller_test.exs | |
| parent | 3b78695c9828bc49a5c7706437af5f24fc4475de (diff) | |
| parent | 226f4d5ef93805e2ff93f00d443238ab7afeb3e6 (diff) | |
| download | pleroma-cf4ecffcea84d9b214f922a973d50c699317a202.tar.gz pleroma-cf4ecffcea84d9b214f922a973d50c699317a202.zip | |
Merge branch 'tests-clear-config-tweaks' into 'develop'
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
Diffstat (limited to 'test/web/media_proxy/media_proxy_controller_test.exs')
| -rw-r--r-- | test/web/media_proxy/media_proxy_controller_test.exs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/web/media_proxy/media_proxy_controller_test.exs b/test/web/media_proxy/media_proxy_controller_test.exs index fdfdb5ec6..8c0c2a0e2 100644 --- a/test/web/media_proxy/media_proxy_controller_test.exs +++ b/test/web/media_proxy/media_proxy_controller_test.exs @@ -7,11 +7,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do import Mock alias Pleroma.Config - setup do - media_proxy_config = Config.get([:media_proxy]) || [] - on_exit(fn -> Config.put([:media_proxy], media_proxy_config) end) - :ok - end + clear_config(:media_proxy) + clear_config([Pleroma.Web.Endpoint, :secret_key_base]) test "it returns 404 when MediaProxy disabled", %{conn: conn} do Config.put([:media_proxy, :enabled], false) |