diff options
| author | lain <lain@soykaf.club> | 2019-08-19 17:00:59 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-19 17:00:59 +0000 |
| commit | d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff (patch) | |
| tree | cd76bb5d4cf7716624378a9cbf9cd42a63eee735 /test/web/media_proxy | |
| parent | cb222b72b39ae4dc887657d1eae03d0360cbd429 (diff) | |
| parent | e5d2c0c66949ad90f9ee02874bdea2aa94f7f683 (diff) | |
| download | pleroma-d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff.tar.gz pleroma-d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff.zip | |
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/web/media_proxy')
| -rw-r--r-- | test/web/media_proxy/media_proxy_test.exs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs index 0c94755df..79699cac5 100644 --- a/test/web/media_proxy/media_proxy_test.exs +++ b/test/web/media_proxy/media_proxy_test.exs @@ -4,14 +4,11 @@ defmodule Pleroma.Web.MediaProxyTest do use ExUnit.Case + use Pleroma.Tests.Helpers import Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy.MediaProxyController - setup do - enabled = Pleroma.Config.get([:media_proxy, :enabled]) - on_exit(fn -> Pleroma.Config.put([:media_proxy, :enabled], enabled) end) - :ok - end + clear_config([:media_proxy, :enabled]) describe "when enabled" do setup do |