projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/config-test-warning' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
media_proxy_test.exs
diff --git
a/test/pleroma/web/media_proxy_test.exs
b/test/pleroma/web/media_proxy_test.exs
index 0e6df826c3b612fd874df34b8938b6967d90771e..d97874f3ae2c43727533a943bb491e76ff91d262 100644
(file)
--- a/
test/pleroma/web/media_proxy_test.exs
+++ b/
test/pleroma/web/media_proxy_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MediaProxyTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MediaProxyTest do
@@
-11,8
+11,7
@@
defmodule Pleroma.Web.MediaProxyTest do
alias Pleroma.Web.MediaProxy
defp decode_result(encoded) 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
decoded
end
@@
-42,7
+41,7
@@
defmodule Pleroma.Web.MediaProxyTest do
assert String.starts_with?(
encoded,
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")
)
assert String.ends_with?(encoded, "/logo.png")