Merge branch 'remake-remodel-2' into 'develop'

[akkoma] / test / web / media_proxy / media_proxy_test.exs

diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs
index 2be5c9de0336457acf72b73baf5b43ddb9f7dc31..69c2d5dae89fe8dc3a34da08ed7ad8e87ec9f806 100644 (file)
--- a/test/web/media_proxy/media_proxy_test.exs
+++ b/test/web/media_proxy/media_proxy_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.MediaProxyTest do
@@ -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