diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-21 00:59:24 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-21 00:59:24 +0000 |
| commit | b68fb3dc172a2cb13c07d7e42351947ecade1e3b (patch) | |
| tree | 55e8bced7b0ccdff2f02cb1c69c1fbd9cf9fb263 /test | |
| parent | 0d14def0ca781b79ffb3c1022472ac64f990cdf8 (diff) | |
| parent | 00c5d7248ff9137ad3c4db9ec654f30c8f00ab9c (diff) | |
| download | pleroma-b68fb3dc172a2cb13c07d7e42351947ecade1e3b.tar.gz | |
Merge branch 'imageoptim' into 'develop'
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/image.jpg | bin | 291666 -> 284468 bytes | |||
| -rw-r--r-- | test/upload_test.exs | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/test/fixtures/image.jpg b/test/fixtures/image.jpg Binary files differindex 09834bb5c..edff6246b 100644 --- a/test/fixtures/image.jpg +++ b/test/fixtures/image.jpg diff --git a/test/upload_test.exs b/test/upload_test.exs index bdda01b3f..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 |
