commit: 4a9ed319b8916500bcb7b8e7c319fea9acdf95dc
parent 7d234d097c09da138f1ac71a6afb197b3873c8b6
Author: Ilja <ilja@ilja.space>
Date: Sat, 21 May 2022 09:37:20 +0200
Change test pictures
The previous pictures were labeled as public domain, but are actually a collage of pictures under other licenses.
I now replaced them with a jpeg of simply a white pixel.
Diffstat:
7 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/test/fixtures/image_with_caption-abstract.jpg b/test/fixtures/image_with_caption-abstract.jpg
Binary files differ.
diff --git a/test/fixtures/image_with_imagedescription_and_caption-abstract.jpg b/test/fixtures/image_with_imagedescription_and_caption-abstract.jpg
Binary files differ.
diff --git a/test/fixtures/image_with_no_description.jpg b/test/fixtures/image_with_no_description.jpg
Binary files differ.
diff --git a/test/fixtures/portrait_of_owls_caption-abstract_tmp.jpg b/test/fixtures/portrait_of_owls_caption-abstract_tmp.jpg
Binary files differ.
diff --git a/test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg b/test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg
Binary files differ.
diff --git a/test/fixtures/portrait_of_owls_no_description_tmp.jpg b/test/fixtures/portrait_of_owls_no_description_tmp.jpg
Binary files differ.
diff --git a/test/pleroma/upload/filter/exiftool/read_description_test.exs b/test/pleroma/upload/filter/exiftool/read_description_test.exs
@@ -7,26 +7,21 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescriptionTest do
alias Pleroma.Upload.Filter
@uploads %Pleroma.Upload{
- name: "portrait_of_owls_imagedescription_and_caption-abstract.jpg",
+ name: "image_with_imagedescription_and_caption-abstract.jpg",
content_type: "image/jpeg",
- path:
- Path.absname("test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract.jpg"),
- tempfile:
- Path.absname("test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg"),
+ path: Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
+ tempfile: Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
description: nil
}
test "keeps description when not empty" do
uploads = %Pleroma.Upload{
- name: "portrait_of_owls_imagedescription_and_caption-abstract.jpg",
+ name: "image_with_imagedescription_and_caption-abstract.jpg",
content_type: "image/jpeg",
- path:
- Path.absname("test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract.jpg"),
+ path: Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
tempfile:
- Path.absname(
- "test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg"
- ),
- description: "Eight different owls"
+ Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
+ description: "Some description"
}
assert Filter.Exiftool.ReadDescription.filter(uploads) ==
@@ -35,15 +30,12 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescriptionTest do
test "otherwise returns ImageDescription when present" do
uploads_after = %Pleroma.Upload{
- name: "portrait_of_owls_imagedescription_and_caption-abstract.jpg",
+ name: "image_with_imagedescription_and_caption-abstract.jpg",
content_type: "image/jpeg",
- path:
- Path.absname("test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract.jpg"),
+ path: Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
tempfile:
- Path.absname(
- "test/fixtures/portrait_of_owls_imagedescription_and_caption-abstract_tmp.jpg"
- ),
- description: "Pictures of eight different owls"
+ Path.absname("test/fixtures/image_with_imagedescription_and_caption-abstract.jpg"),
+ description: "a descriptive white pixel"
}
assert Filter.Exiftool.ReadDescription.filter(@uploads) ==
@@ -52,19 +44,19 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescriptionTest do
test "otherwise returns iptc:Caption-Abstract when present" do
upload = %Pleroma.Upload{
- name: "portrait_of_owls_caption-abstract.jpg",
+ name: "image_with_caption-abstract.jpg",
content_type: "image/jpeg",
- path: Path.absname("test/fixtures/portrait_of_owls_caption-abstract.jpg"),
- tempfile: Path.absname("test/fixtures/portrait_of_owls_caption-abstract_tmp.jpg"),
+ path: Path.absname("test/fixtures/image_with_caption-abstract.jpg"),
+ tempfile: Path.absname("test/fixtures/image_with_caption-abstract.jpg"),
description: nil
}
upload_after = %Pleroma.Upload{
- name: "portrait_of_owls_caption-abstract.jpg",
+ name: "image_with_caption-abstract.jpg",
content_type: "image/jpeg",
- path: Path.absname("test/fixtures/portrait_of_owls_caption-abstract.jpg"),
- tempfile: Path.absname("test/fixtures/portrait_of_owls_caption-abstract_tmp.jpg"),
- description: "Pictures of eight different owls - iptc"
+ path: Path.absname("test/fixtures/image_with_caption-abstract.jpg"),
+ tempfile: Path.absname("test/fixtures/image_with_caption-abstract.jpg"),
+ description: "an abstract white pixel"
}
assert Filter.Exiftool.ReadDescription.filter(upload) ==
@@ -73,10 +65,10 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescriptionTest do
test "otherwise returns nil" do
uploads = %Pleroma.Upload{
- name: "portrait_of_owls_no_description-abstract.jpg",
+ name: "image_with_no_description.jpg",
content_type: "image/jpeg",
- path: Path.absname("test/fixtures/portrait_of_owls_no_description.jpg"),
- tempfile: Path.absname("test/fixtures/portrait_of_owls_no_description_tmp.jpg"),
+ path: Path.absname("test/fixtures/image_with_no_description.jpg"),
+ tempfile: Path.absname("test/fixtures/image_with_no_description.jpg"),
description: nil
}