diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
| commit | dfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (patch) | |
| tree | 92d77142391ed6eab45a4bec792ed02be91fbe39 /test/upload | |
| parent | edb659dc579fe56227adef0b0704ff13b6ef717e (diff) | |
| parent | 4e81b4b190161ebb0c496c682fa8e1e0c38a3903 (diff) | |
| download | pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.tar.gz pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.zip | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/upload')
| -rw-r--r-- | test/upload/filter/anonymize_filename_test.exs | 2 | ||||
| -rw-r--r-- | test/upload/filter/mogrify_test.exs | 2 | ||||
| -rw-r--r-- | test/upload/filter_test.exs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/upload/filter/anonymize_filename_test.exs b/test/upload/filter/anonymize_filename_test.exs index 330158580..2d5c580f1 100644 --- a/test/upload/filter/anonymize_filename_test.exs +++ b/test/upload/filter/anonymize_filename_test.exs @@ -18,7 +18,7 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do %{upload_file: upload_file} end - clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text]) + setup do: clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text]) test "it replaces filename on pre-defined text", %{upload_file: upload_file} do Config.put([Upload.Filter.AnonymizeFilename, :text], "custom-file.png") diff --git a/test/upload/filter/mogrify_test.exs b/test/upload/filter/mogrify_test.exs index 52483d80c..b6a463e8c 100644 --- a/test/upload/filter/mogrify_test.exs +++ b/test/upload/filter/mogrify_test.exs @@ -10,7 +10,7 @@ defmodule Pleroma.Upload.Filter.MogrifyTest do alias Pleroma.Upload alias Pleroma.Upload.Filter - clear_config([Filter.Mogrify, :args]) + setup do: clear_config([Filter.Mogrify, :args]) test "apply mogrify filter" do Config.put([Filter.Mogrify, :args], [{"tint", "40"}]) diff --git a/test/upload/filter_test.exs b/test/upload/filter_test.exs index 2ffc5247b..352b66402 100644 --- a/test/upload/filter_test.exs +++ b/test/upload/filter_test.exs @@ -8,7 +8,7 @@ defmodule Pleroma.Upload.FilterTest do alias Pleroma.Config alias Pleroma.Upload.Filter - clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text]) + setup do: clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text]) test "applies filters" do Config.put([Pleroma.Upload.Filter.AnonymizeFilename, :text], "custom-file.png") |