diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 17:38:57 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 17:38:57 +0400 |
| commit | 6b84c62d4a51cb17192945d1b67999b2c56a23d2 (patch) | |
| tree | 53744600bd910bb0a62be6ab5884c6972da2ffce /test/web/media_proxy/media_proxy_test.exs | |
| parent | cb8236cda62cddb72f4320af6347defae44b81ca (diff) | |
| parent | e96765df6b04fe5e9766271a9c62e559392758b2 (diff) | |
| download | pleroma-6b84c62d4a51cb17192945d1b67999b2c56a23d2.tar.gz pleroma-6b84c62d4a51cb17192945d1b67999b2c56a23d2.zip | |
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
Diffstat (limited to 'test/web/media_proxy/media_proxy_test.exs')
| -rw-r--r-- | test/web/media_proxy/media_proxy_test.exs | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs index 69c2d5dae..69d2a71a6 100644 --- a/test/web/media_proxy/media_proxy_test.exs +++ b/test/web/media_proxy/media_proxy_test.exs @@ -124,15 +124,7 @@ defmodule Pleroma.Web.MediaProxyTest do end test "uses the configured base_url" do - base_url = Pleroma.Config.get([:media_proxy, :base_url]) - - if base_url do - on_exit(fn -> - Pleroma.Config.put([:media_proxy, :base_url], base_url) - end) - end - - Pleroma.Config.put([:media_proxy, :base_url], "https://cache.pleroma.social") + clear_config([:media_proxy, :base_url], "https://cache.pleroma.social") url = "https://pleroma.soykaf.com/static/logo.png" encoded = url(url) @@ -213,8 +205,8 @@ defmodule Pleroma.Web.MediaProxyTest do end test "does not change whitelisted urls" do - Pleroma.Config.put([:media_proxy, :whitelist], ["mycdn.akamai.com"]) - Pleroma.Config.put([:media_proxy, :base_url], "https://cache.pleroma.social") + clear_config([:media_proxy, :whitelist], ["mycdn.akamai.com"]) + clear_config([:media_proxy, :base_url], "https://cache.pleroma.social") media_url = "https://mycdn.akamai.com" |