diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-20 15:00:48 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-20 15:00:48 +0300 |
| commit | 0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd (patch) | |
| tree | 0e0f2ad4f7317b44e11f1df4d2e5fc9a301007e1 /test/web/media_proxy/media_proxy_test.exs | |
| parent | 343229465753ebcc59002a2dd604a910a8ce462d (diff) | |
| parent | e0b2de63853e9a14b72faddf6e1180a098728205 (diff) | |
| download | pleroma-0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd.tar.gz pleroma-0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# config/config.exs
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, 1 insertions, 3 deletions
diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs index 96bdde219..2be5c9de0 100644 --- a/test/web/media_proxy/media_proxy_test.exs +++ b/test/web/media_proxy/media_proxy_test.exs @@ -9,6 +9,7 @@ defmodule Pleroma.Web.MediaProxyTest do alias Pleroma.Web.MediaProxy.MediaProxyController clear_config([:media_proxy, :enabled]) + clear_config(Pleroma.Upload) describe "when enabled" do setup do @@ -224,7 +225,6 @@ defmodule Pleroma.Web.MediaProxyTest do end test "ensure Pleroma.Upload base_url is always whitelisted" do - upload_config = Pleroma.Config.get([Pleroma.Upload]) media_url = "https://media.pleroma.social" Pleroma.Config.put([Pleroma.Upload, :base_url], media_url) @@ -232,8 +232,6 @@ defmodule Pleroma.Web.MediaProxyTest do encoded = url(url) assert String.starts_with?(encoded, media_url) - - Pleroma.Config.put([Pleroma.Upload], upload_config) end end end |