diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/upload/filter/anonymize_filename_test.exs | 6 | ||||
| -rw-r--r-- | test/upload/filter/dedupe_test.exs | 1 | ||||
| -rw-r--r-- | test/upload/filter/exiftool_test.exs | 11 | ||||
| -rw-r--r-- | test/upload/filter/mogrifun_test.exs | 2 | ||||
| -rw-r--r-- | test/upload/filter/mogrify_test.exs | 2 | 
5 files changed, 16 insertions, 6 deletions
| diff --git a/test/upload/filter/anonymize_filename_test.exs b/test/upload/filter/anonymize_filename_test.exs index adff70f57..19b915cc8 100644 --- a/test/upload/filter/anonymize_filename_test.exs +++ b/test/upload/filter/anonymize_filename_test.exs @@ -24,18 +24,18 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do    test "it replaces filename on pre-defined text", %{upload_file: upload_file} do      Config.put([Upload.Filter.AnonymizeFilename, :text], "custom-file.png") -    {:ok, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file) +    {:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)      assert name == "custom-file.png"    end    test "it replaces filename on pre-defined text expression", %{upload_file: upload_file} do      Config.put([Upload.Filter.AnonymizeFilename, :text], "custom-file.{extension}") -    {:ok, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file) +    {:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)      assert name == "custom-file.jpg"    end    test "it replaces filename on random text", %{upload_file: upload_file} do -    {:ok, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file) +    {:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)      assert <<_::bytes-size(14)>> <> ".jpg" = name      refute name == "an… image.jpg"    end diff --git a/test/upload/filter/dedupe_test.exs b/test/upload/filter/dedupe_test.exs index 966c353f7..75c7198e1 100644 --- a/test/upload/filter/dedupe_test.exs +++ b/test/upload/filter/dedupe_test.exs @@ -25,6 +25,7 @@ defmodule Pleroma.Upload.Filter.DedupeTest do      assert {               :ok, +             :filtered,               %Pleroma.Upload{id: @shasum, path: @shasum <> ".jpg"}             } = Dedupe.filter(upload)    end diff --git a/test/upload/filter/exiftool_test.exs b/test/upload/filter/exiftool_test.exs index 8ed7d650b..d4cd4ba11 100644 --- a/test/upload/filter/exiftool_test.exs +++ b/test/upload/filter/exiftool_test.exs @@ -21,7 +21,7 @@ defmodule Pleroma.Upload.Filter.ExiftoolTest do        tempfile: Path.absname("test/fixtures/DSCN0010_tmp.jpg")      } -    assert Filter.Exiftool.filter(upload) == :ok +    assert Filter.Exiftool.filter(upload) == {:ok, :filtered}      {exif_original, 0} = System.cmd("exiftool", ["test/fixtures/DSCN0010.jpg"])      {exif_filtered, 0} = System.cmd("exiftool", ["test/fixtures/DSCN0010_tmp.jpg"]) @@ -30,4 +30,13 @@ defmodule Pleroma.Upload.Filter.ExiftoolTest do      assert String.match?(exif_original, ~r/GPS/)      refute String.match?(exif_filtered, ~r/GPS/)    end + +  test "verify webp files are skipped" do +    upload = %Pleroma.Upload{ +      name: "sample.webp", +      content_type: "image/webp" +    } + +    assert Filter.Exiftool.filter(upload) == {:ok, :noop} +  end  end diff --git a/test/upload/filter/mogrifun_test.exs b/test/upload/filter/mogrifun_test.exs index 2426a8496..dc1e9e78f 100644 --- a/test/upload/filter/mogrifun_test.exs +++ b/test/upload/filter/mogrifun_test.exs @@ -36,7 +36,7 @@ defmodule Pleroma.Upload.Filter.MogrifunTest do           save: fn _f, _o -> :ok end         ]}      ]) do -      assert Filter.Mogrifun.filter(upload) == :ok +      assert Filter.Mogrifun.filter(upload) == {:ok, :filtered}      end      Task.await(task) diff --git a/test/upload/filter/mogrify_test.exs b/test/upload/filter/mogrify_test.exs index 62ca30487..bf64b96b3 100644 --- a/test/upload/filter/mogrify_test.exs +++ b/test/upload/filter/mogrify_test.exs @@ -33,7 +33,7 @@ defmodule Pleroma.Upload.Filter.MogrifyTest do        custom: fn _m, _a -> :ok end,        custom: fn m, a, o -> send(task.pid, {:apply_filter, {m, a, o}}) end,        save: fn _f, _o -> :ok end do -      assert Filter.Mogrify.filter(upload) == :ok +      assert Filter.Mogrify.filter(upload) == {:ok, :filtered}      end      Task.await(task) | 
