diff options
| author | feld <feld@feld.me> | 2021-02-02 18:15:00 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-02-02 18:15:00 +0000 |
| commit | d37d4106c627e0d3a06765c5b46da40cb8ac41fe (patch) | |
| tree | a2431ebe5fcd8ceeff321e4e4e8a7fa9d7aee431 /test | |
| parent | 08888150007bc8a3ea5c65d47cf7383d3853080e (diff) | |
| parent | f852e8d2d21657dae36871a8c0ef65e33192f8da (diff) | |
| download | pleroma-d37d4106c627e0d3a06765c5b46da40cb8ac41fe.tar.gz | |
Merge branch 'fix/majic-nits' into 'develop'
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
Diffstat (limited to 'test')
| -rw-r--r-- | test/pleroma/web/activity_pub/activity_pub_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs index f7417de31..91a3109bb 100644 --- a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs +++ b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs @@ -1607,9 +1607,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do desc = "Description of the image" image = %Plug.Upload{ - content_type: "bad/content-type", + content_type: "image/jpeg", path: Path.absname("test/fixtures/image.jpg"), - filename: "an_image.png" + filename: "an_image.jpg" } object = |