diff options
| author | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
| commit | d23e81903dfe5032bb20b92bcc7dfb47434ba669 (patch) | |
| tree | db7724289ac074e0b70b7405d9080e50b8a8175d /test/upload | |
| parent | 5efa5b0c4a08c2bf73d6926ee7c418e31a04195c (diff) | |
| parent | 1c05f539aaea32fe993e5299e656aa44c322e8de (diff) | |
| download | pleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.tar.gz pleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.zip | |
Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management
See merge request pleroma/pleroma!2312
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") |