aboutsummaryrefslogtreecommitdiff
path: root/test/pleroma/web/media_proxy_test.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-06-17 15:38:10 -0500
committerAlex Gleason <alex@alexgleason.me>2021-06-17 15:38:10 -0500
commit3a03d9b65f96099e7c7a831469532c2cec7294c6 (patch)
tree46d84731c3a53157117fc4c8141fdf6b3d7b8b25 /test/pleroma/web/media_proxy_test.exs
parenta704d5499c03cb5609ea38a5f2ef06095ced3ef3 (diff)
parenta8adc300d4cfc88ef19f1977e32068437ed4ad00 (diff)
downloadpleroma-nsfw-api-mrf.tar.gz
Merge remote-tracking branch 'pleroma/develop' into nsfw-api-mrfnsfw-api-mrf
Diffstat (limited to 'test/pleroma/web/media_proxy_test.exs')
-rw-r--r--test/pleroma/web/media_proxy_test.exs5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/pleroma/web/media_proxy_test.exs b/test/pleroma/web/media_proxy_test.exs
index 7411d0a7a..d97874f3a 100644
--- a/test/pleroma/web/media_proxy_test.exs
+++ b/test/pleroma/web/media_proxy_test.exs
@@ -11,8 +11,7 @@ defmodule Pleroma.Web.MediaProxyTest do
alias Pleroma.Web.MediaProxy
defp decode_result(encoded) do
- [_, "proxy", sig, base64 | _] = URI.parse(encoded).path |> String.split("/")
- {:ok, decoded} = MediaProxy.decode_url(sig, base64)
+ {:ok, decoded} = MediaProxy.decode_url(encoded)
decoded
end
@@ -42,7 +41,7 @@ defmodule Pleroma.Web.MediaProxyTest do
assert String.starts_with?(
encoded,
- Config.get([:media_proxy, :base_url], Pleroma.Web.base_url())
+ Config.get([:media_proxy, :base_url], Pleroma.Web.Endpoint.url())
)
assert String.ends_with?(encoded, "/logo.png")