diff options
author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 09:19:10 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 09:19:10 +0300 |
commit | aac48d0cc6893c231c88d5cd7fe0334353bbf299 (patch) | |
tree | c3e423993ff5289dd0ba73a94881bd52d9cda1c2 /test/upload_test.exs | |
parent | f6fab01ba7a08fe0e5147f82d9e3dd294922dc93 (diff) | |
parent | f8aa917eef9280631a5cd2c95cf1db8fab6e14e5 (diff) | |
download | pleroma-aac48d0cc6893c231c88d5cd7fe0334353bbf299.tar.gz pleroma-aac48d0cc6893c231c88d5cd7fe0334353bbf299.zip |
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'test/upload_test.exs')
-rw-r--r-- | test/upload_test.exs | 5 |
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 |