summaryrefslogtreecommitdiff
path: root/test/support/data_case.ex
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-07-19 16:55:10 -0500
committerMark Felder <feld@FreeBSD.org>2019-07-19 16:55:10 -0500
commit9169f331b6d481a0aa2b0bfe91500d695fb1b6d6 (patch)
tree734ce297aef5a2482c88cdc7d03914943ba4cf28 /test/support/data_case.ex
parent46c7c53fbbfd9919d429ba15988af0da9e22d444 (diff)
parentc1c64d6d06fb7307245880d6605d9d9153a4784f (diff)
downloadpleroma-9169f331b6d481a0aa2b0bfe91500d695fb1b6d6.tar.gz
pleroma-9169f331b6d481a0aa2b0bfe91500d695fb1b6d6.zip
Merge branch 'develop' into feature/matstodon-statuses-by-name
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