diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-25 07:15:33 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-25 07:22:56 +0300 |
| commit | 10f452ad1feae9a882b6dc4cd35e09adb7e78208 (patch) | |
| tree | 62083f08fbe99cd38002d1f6896cd2fd79675320 /test/web/media_proxy/media_proxy_controller_test.exs | |
| parent | 28701c08ad9219219a32f31b2ed9dcb83f92cd59 (diff) | |
| parent | 035c2c1415ed46abb268cf85c141384416a799e2 (diff) | |
| download | pleroma-10f452ad1feae9a882b6dc4cd35e09adb7e78208.tar.gz pleroma-10f452ad1feae9a882b6dc4cd35e09adb7e78208.zip | |
Merge branch 'develop' into issue/1276
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) |