diff options
| author | Mark Felder <feld@feld.me> | 2021-01-14 17:49:37 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-14 17:49:37 -0600 |
| commit | d0e0396528c55f1b61c1d48452e855ea69ec3e89 (patch) | |
| tree | 739a36d799416e2004b2cef86729fa0435f769d2 | |
| parent | 0b725f5d216cfd2b11f81cddd792338c23161a60 (diff) | |
| download | pleroma-d0e0396528c55f1b61c1d48452e855ea69ec3e89.tar.gz | |
Hack to fix tests not passing. Unclear why the filters are being set to nil.
Both of these changes are needed or it doesn't work.
| -rw-r--r-- | lib/pleroma/upload/filter.ex | 2 | ||||
| -rw-r--r-- | test/support/data_case.ex | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/upload/filter.ex b/lib/pleroma/upload/filter.ex index 661135634..367acd214 100644 --- a/lib/pleroma/upload/filter.ex +++ b/lib/pleroma/upload/filter.ex @@ -43,4 +43,6 @@ defmodule Pleroma.Upload.Filter do error end end + + def filter(nil, upload), do: filter([], upload) end diff --git a/test/support/data_case.ex b/test/support/data_case.ex index 0b41f0f63..23c858d2a 100644 --- a/test/support/data_case.ex +++ b/test/support/data_case.ex @@ -107,7 +107,7 @@ defmodule Pleroma.DataCase do def ensure_local_uploader(context) do test_uploader = Map.get(context, :uploader, Pleroma.Uploaders.Local) uploader = Pleroma.Config.get([Pleroma.Upload, :uploader]) - filters = Pleroma.Config.get([Pleroma.Upload, :filters]) + filters = Pleroma.Config.get([Pleroma.Upload, :filters]) || [] Pleroma.Config.put([Pleroma.Upload, :uploader], test_uploader) Pleroma.Config.put([Pleroma.Upload, :filters], []) |