URI.encode_query needs an enum, add test for this case
This commit is contained in:
parent
80db6f1328
commit
99a1c0890a
2 changed files with 21 additions and 1 deletions
|
|
@ -241,7 +241,8 @@ defmodule Pleroma.Upload do
|
||||||
path =
|
path =
|
||||||
HTTP.encode_url(path, encode_opts) <>
|
HTTP.encode_url(path, encode_opts) <>
|
||||||
if Pleroma.Config.get([__MODULE__, :link_name], false) do
|
if Pleroma.Config.get([__MODULE__, :link_name], false) do
|
||||||
"?name=#{URI.encode_query(name)}"
|
enum = %{name: name}
|
||||||
|
"?#{URI.encode_query(enum)}"
|
||||||
else
|
else
|
||||||
""
|
""
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -282,4 +282,23 @@ defmodule Pleroma.UploadTest do
|
||||||
refute String.starts_with?(url, base_url <> "/media/")
|
refute String.starts_with?(url, base_url <> "/media/")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "Setting a link_name for uploaded media" do
|
||||||
|
setup do: clear_config([Pleroma.Upload, :link_name], true)
|
||||||
|
|
||||||
|
test "encodes name parameter in query" do
|
||||||
|
File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
|
||||||
|
|
||||||
|
file = %Plug.Upload{
|
||||||
|
content_type: "image/jpeg",
|
||||||
|
path: Path.absname("test/fixtures/image_tmp.jpg"),
|
||||||
|
filename: "test file.jpg"
|
||||||
|
}
|
||||||
|
|
||||||
|
{:ok, data} = Upload.store(file)
|
||||||
|
[attachment_url | _] = data["url"]
|
||||||
|
|
||||||
|
assert Path.basename(attachment_url["href"]) == "test%20file.jpg?name=test+file.jpg"
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue