summaryrefslogtreecommitdiff
path: root/test/upload_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivant.business@gmail.com>2019-03-27 15:41:40 +0300
committerIvan Tashkinov <ivant.business@gmail.com>2019-03-27 15:41:40 +0300
commit20e0f3660541f19cf878b789aa9f5b9d5ce8cddb (patch)
tree08cb90d62e431beb7ee6a2261dc679b725aec1f1 /test/upload_test.exs
parent2a95014b9d7142aa2549e70f428293af78fae8eb (diff)
parent15aa94f40f73444d67da7cb71ec219b97ec5142e (diff)
downloadpleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.tar.gz
pleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.zip
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
Diffstat (limited to 'test/upload_test.exs')
-rw-r--r--test/upload_test.exs5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/upload_test.exs b/test/upload_test.exs
index 770226478..946ebcb5a 100644
--- a/test/upload_test.exs
+++ b/test/upload_test.exs
@@ -56,7 +56,7 @@ defmodule Pleroma.UploadTest do
assert List.first(data["url"])["href"] ==
Pleroma.Web.base_url() <>
- "/media/e7a6d0cf595bff76f14c9a98b6c199539559e8b844e02e51e5efcfd1f614a2df.jpg"
+ "/media/e30397b58d226d6583ab5b8b3c5defb0c682bda5c31ef07a9f57c1c4986e3781.jpg"
end
test "copies the file to the configured folder without deduping" do
@@ -150,8 +150,7 @@ defmodule Pleroma.UploadTest do
{:ok, data} = Upload.store(file)
[attachment_url | _] = data["url"]
- assert Path.basename(attachment_url["href"]) ==
- "an%E2%80%A6%20image.jpg"
+ assert Path.basename(attachment_url["href"]) == "an%E2%80%A6%20image.jpg"
end
test "escapes reserved uri characters" do