diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-20 01:03:25 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-20 01:03:25 +0300 |
| commit | 36049f08efadb5f6f727753ecc1f7be6a5b4e3d8 (patch) | |
| tree | 2f1e1b5a20ad654cda4021115e621887d2735959 /test/support | |
| parent | e7c175c943e9e3f53df76d812c09cfeffdb1c56b (diff) | |
| parent | 33729bbb2834bfa1f223b11d47dc8e3230d47657 (diff) | |
| download | pleroma-36049f08efadb5f6f727753ecc1f7be6a5b4e3d8.tar.gz | |
Merge develop
Diffstat (limited to 'test/support')
| -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 |