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/web/twitter_api/twitter_api_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/web/twitter_api/twitter_api_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 76de68783..05f832de0 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -182,13 +182,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do end test "upload a file" do + user = insert(:user) + file = %Plug.Upload{ content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg" } - response = TwitterAPI.upload(file) + response = TwitterAPI.upload(file, user) assert is_binary(response) end |