diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-02-21 10:02:37 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-02-21 10:02:37 +0300 |
| commit | 13918cb545d583decfb728300850b307c59e2031 (patch) | |
| tree | 9bf3d5f4c2e51eec87bd0cd1e8a46a6b94816bfc /test/web/media_proxy/media_proxy_controller_test.exs | |
| parent | c9db0507f8d49aee9988b0b63477672f5df9c0b2 (diff) | |
| parent | 292031f6dd809accbcb3a5ba59d0100d807c5d72 (diff) | |
| download | pleroma-13918cb545d583decfb728300850b307c59e2031.tar.gz pleroma-13918cb545d583decfb728300850b307c59e2031.zip | |
Merge branch 'develop' into gun
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) |