diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-25 09:05:17 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-25 09:05:17 +0300 |
| commit | 012d428e1ffdd83888f339e4dbaec344202eebe1 (patch) | |
| tree | 41483fdfb5c75e6d338ad48b83f7d4e621365694 /test/web/media_proxy/media_proxy_test.exs | |
| parent | e743c2232970e321c833604b232520587ad8e402 (diff) | |
| parent | 8eebc75c152ee339bac347350266e3bc6536016b (diff) | |
| download | pleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.tar.gz pleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
Diffstat (limited to 'test/web/media_proxy/media_proxy_test.exs')
| -rw-r--r-- | test/web/media_proxy/media_proxy_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
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 |