summaryrefslogtreecommitdiff
path: root/test/support/data_case.ex
diff options
context:
space:
mode:
authorMaksim <parallel588@gmail.com>2019-07-18 12:30:18 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-18 12:30:18 +0000
commitb6b748d3e7f3383303a2fcccb17b7b0f7054100f (patch)
treed053d9e529254abc5f1a3b290b9444f3cf31ea6d /test/support/data_case.ex
parente2c39e1cc077c77f3bd8325b99e9a21d42b8133e (diff)
downloadpleroma-b6b748d3e7f3383303a2fcccb17b7b0f7054100f.tar.gz
pleroma-b6b748d3e7f3383303a2fcccb17b7b0f7054100f.zip
tests for Uploader with webhook
Diffstat (limited to 'test/support/data_case.ex')
-rw-r--r--test/support/data_case.ex17
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