diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-08-07 16:35:15 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-08-07 16:35:15 -0500 |
commit | 1a5a7ba6e8a936d3138ca530d3466111e542aef6 (patch) | |
tree | c056138ee21661af45d2363ce01282aafffb3fc0 /test/upload | |
parent | bd1e2e3a58ebd702306e7a6e2df985ac07e5f7d8 (diff) | |
parent | 47698fc322da58894dd41c1bfd5ca0376200dc5e (diff) | |
download | pleroma-1a5a7ba6e8a936d3138ca530d3466111e542aef6.tar.gz pleroma-1a5a7ba6e8a936d3138ca530d3466111e542aef6.zip |
Merge remote-tracking branch 'upstream/develop' into aliases
Diffstat (limited to 'test/upload')
-rw-r--r-- | test/upload/filter/anonymize_filename_test.exs | 2 | ||||
-rw-r--r-- | test/upload/filter/exiftool_test.exs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/test/upload/filter/anonymize_filename_test.exs b/test/upload/filter/anonymize_filename_test.exs index 2d5c580f1..adff70f57 100644 --- a/test/upload/filter/anonymize_filename_test.exs +++ b/test/upload/filter/anonymize_filename_test.exs @@ -9,6 +9,8 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do alias Pleroma.Upload setup do + File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg") + upload_file = %Upload{ name: "an… image.jpg", content_type: "image/jpg", diff --git a/test/upload/filter/exiftool_test.exs b/test/upload/filter/exiftool_test.exs index a1b7e46cd..8ed7d650b 100644 --- a/test/upload/filter/exiftool_test.exs +++ b/test/upload/filter/exiftool_test.exs @@ -7,6 +7,8 @@ defmodule Pleroma.Upload.Filter.ExiftoolTest do alias Pleroma.Upload.Filter test "apply exiftool filter" do + assert Pleroma.Utils.command_available?("exiftool") + File.cp!( "test/fixtures/DSCN0010.jpg", "test/fixtures/DSCN0010_tmp.jpg" |