diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
| commit | 9570a5be405c4cf4f07907eab4ced21e07fa20c9 (patch) | |
| tree | 9575741206d0604e74ab2d8f719c3da0a3002b1d /test/support/data_case.ex | |
| parent | 418ae6638d64c915ce4dae742dd493f43c8025d8 (diff) | |
| parent | 16cfee708ec8e9c6cbbeb15432127c7757c5c173 (diff) | |
| download | pleroma-9570a5be405c4cf4f07907eab4ced21e07fa20c9.tar.gz | |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'test/support/data_case.ex')
| -rw-r--r-- | test/support/data_case.ex | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/test/support/data_case.ex b/test/support/data_case.ex index df260bd3f..f3d98e7e3 100644 --- a/test/support/data_case.ex +++ b/test/support/data_case.ex @@ -42,19 +42,18 @@ defmodule Pleroma.DataCase do :ok end - def ensure_local_uploader(_context) 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]) - unless uploader == Pleroma.Uploaders.Local || filters != [] do - Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local) - Pleroma.Config.put([Pleroma.Upload, :filters], []) + Pleroma.Config.put([Pleroma.Upload, :uploader], test_uploader) + Pleroma.Config.put([Pleroma.Upload, :filters], []) - on_exit(fn -> - Pleroma.Config.put([Pleroma.Upload, :uploader], uploader) - Pleroma.Config.put([Pleroma.Upload, :filters], filters) - end) - end + on_exit(fn -> + Pleroma.Config.put([Pleroma.Upload, :uploader], uploader) + Pleroma.Config.put([Pleroma.Upload, :filters], filters) + end) :ok end |