diff options
author | rinpatch <rinpatch@sdf.org> | 2020-05-27 19:34:56 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-05-27 19:34:56 +0300 |
commit | 78c46fb7ba2aa9e9842d3c7d8331488fd10a3b9d (patch) | |
tree | 1f7184299635adfb33ddb52e97eb8ed4206daf02 | |
parent | d35be02e7064da8ffce51fb10a937af30b145c7b (diff) | |
download | pleroma-78c46fb7ba2aa9e9842d3c7d8331488fd10a3b9d.tar.gz |
MediaProxy test: use config macros instead of directly putting values
They were not properly cleaned later and caused trouble for another tests
-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" |