summaryrefslogtreecommitdiff
path: root/test/upload_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-03-25 13:37:32 +0100
committerlain <lain@soykaf.club>2019-03-25 13:37:32 +0100
commit037fefe21871ee0a1926286c87c334ea1d339394 (patch)
tree2775b91de5652ddd5baa3e32861ac9cac4bc40be /test/upload_test.exs
parentf6fab01ba7a08fe0e5147f82d9e3dd294922dc93 (diff)
parentb028b0f97d4b6310b1402b3b876aa8f8b286bc4d (diff)
downloadpleroma-037fefe21871ee0a1926286c87c334ea1d339394.tar.gz
pleroma-037fefe21871ee0a1926286c87c334ea1d339394.zip
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
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