diff options
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 | 
