diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-06 07:36:21 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-06 07:36:21 +0000 |
| commit | ccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916 (patch) | |
| tree | ff377034c4c91bf34e56220fd23a121d9f983942 /test/upload_test.exs | |
| parent | 48a03156465ec5c653101a57d4c899d0c6ffe1cf (diff) | |
| parent | 3e90f688f14310e92fe9343f2680c58d74f71cb6 (diff) | |
| download | pleroma-ccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916.tar.gz pleroma-ccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916.zip | |
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
Diffstat (limited to 'test/upload_test.exs')
| -rw-r--r-- | test/upload_test.exs | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/test/upload_test.exs b/test/upload_test.exs index b2ce755d2..f2cad4cf0 100644 --- a/test/upload_test.exs +++ b/test/upload_test.exs @@ -3,22 +3,7 @@ defmodule Pleroma.UploadTest do use Pleroma.DataCase describe "Storing a file with the Local uploader" do - setup do - 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], []) - - on_exit(fn -> - Pleroma.Config.put([Pleroma.Upload, :uploader], uploader) - Pleroma.Config.put([Pleroma.Upload, :filters], filters) - end) - end - - :ok - end + setup [:ensure_local_uploader] test "returns a media url" do File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg") |