diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/plugs/http_security_plug_test.exs | 2 | ||||
| -rw-r--r-- | test/web/media_proxy/media_proxy_test.exs | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/plugs/http_security_plug_test.exs b/test/plugs/http_security_plug_test.exs index 944a9a139..6ba2dfe85 100644 --- a/test/plugs/http_security_plug_test.exs +++ b/test/plugs/http_security_plug_test.exs @@ -67,7 +67,7 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlugTest do [csp] = Conn.get_resp_header(conn, "content-security-policy") - assert csp =~ ~r|report-uri https://endpoint.com; report-to csp-endpoint;| + assert csp =~ ~r|report-uri https://endpoint.com;report-to csp-endpoint;| [reply_to] = Conn.get_resp_header(conn, "reply-to") diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs index 8f5fcf2eb..dc4388f58 100644 --- a/test/web/media_proxy/media_proxy_test.exs +++ b/test/web/media_proxy/media_proxy_test.exs @@ -125,15 +125,8 @@ defmodule Pleroma.Web.MediaProxyTest do 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") - + on_exit(fn -> Pleroma.Config.put([:media_proxy, :base_url], base_url) end) url = "https://pleroma.soykaf.com/static/logo.png" encoded = url(url) @@ -213,9 +206,16 @@ defmodule Pleroma.Web.MediaProxyTest do end test "does not change whitelisted urls" do + whitelist = Pleroma.Config.get([:media_proxy, :whitelist]) + base_url = Pleroma.Config.get([:media_proxy, :base_url]) Pleroma.Config.put([:media_proxy, :whitelist], ["mycdn.akamai.com"]) Pleroma.Config.put([:media_proxy, :base_url], "https://cache.pleroma.social") + on_exit(fn -> + Pleroma.Config.put([:media_proxy, :whitelist], whitelist) + Pleroma.Config.put([:media_proxy, :base_url], base_url) + end) + media_url = "https://mycdn.akamai.com" url = "#{media_url}/static/logo.png" |