Merge branch 'change-containment-default' into 'develop'

[akkoma] / test / media_proxy_test.exs

diff --git a/test/media_proxy_test.exs b/test/media_proxy_test.exs
index 0a02039a6ee9cf16db304c7debc31fe9b4fc2048..b23aeb88be580c9642dd6675a55ded62d1af951a 100644 (file)
--- a/test/media_proxy_test.exs
+++ b/test/media_proxy_test.exs
@@ -149,6 +149,21 @@ defmodule Pleroma.MediaProxyTest do
       encoded = url(url)
       assert decode_result(encoded) == url
     end
+
+    test "does not change whitelisted urls" do
+      upload_config = Pleroma.Config.get([Pleroma.Upload])
+      media_url = "https://media.pleroma.social"
+      Pleroma.Config.put([Pleroma.Upload, :base_url], media_url)
+      Pleroma.Config.put([:media_proxy, :whitelist], ["media.pleroma.social"])
+      Pleroma.Config.put([:media_proxy, :base_url], "https://cache.pleroma.social")
+
+      url = "#{media_url}/static/logo.png"
+      encoded = url(url)
+
+      assert String.starts_with?(encoded, media_url)
+
+      Pleroma.Config.put([Pleroma.Upload], upload_config)
+    end
   end
 
   describe "when disabled" do