diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 |
| commit | 9bae9b1b1bf4f48e20ce0b2d9b670648d052e069 (patch) | |
| tree | e6755e3d585d753ad7da171a858508d4a1603a49 /test/web/media_proxy | |
| parent | 51ce0813d351cad900966aea49a6f6d17d33f964 (diff) | |
| parent | d74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff) | |
| download | pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.tar.gz pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.zip | |
Merge branch 'develop' into gun
Diffstat (limited to 'test/web/media_proxy')
| -rw-r--r-- | test/web/media_proxy/media_proxy_controller_test.exs | 4 | ||||
| -rw-r--r-- | test/web/media_proxy/media_proxy_test.exs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/web/media_proxy/media_proxy_controller_test.exs b/test/web/media_proxy/media_proxy_controller_test.exs index 7ac7e4af1..da79d38a5 100644 --- a/test/web/media_proxy/media_proxy_controller_test.exs +++ b/test/web/media_proxy/media_proxy_controller_test.exs @@ -7,8 +7,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do import Mock alias Pleroma.Config - clear_config(:media_proxy) - clear_config([Pleroma.Web.Endpoint, :secret_key_base]) + setup do: clear_config(:media_proxy) + setup do: clear_config([Pleroma.Web.Endpoint, :secret_key_base]) test "it returns 404 when MediaProxy disabled", %{conn: conn} do Config.put([:media_proxy, :enabled], false) diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs index 8f5fcf2eb..69c2d5dae 100644 --- a/test/web/media_proxy/media_proxy_test.exs +++ b/test/web/media_proxy/media_proxy_test.exs @@ -8,8 +8,8 @@ defmodule Pleroma.Web.MediaProxyTest do import Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy.MediaProxyController - clear_config([:media_proxy, :enabled]) - clear_config(Pleroma.Upload) + setup do: clear_config([:media_proxy, :enabled]) + setup do: clear_config(Pleroma.Upload) describe "when enabled" do setup do |