Merge branch 'fix/majic-nits' into 'develop'

Majic: don't fix extensions See merge request pleroma/pleroma!3287
2021-02-02 18:15:00 +00:00 · 2021-02-02 18:15:00 +00:00 · d37d4106c6
commit d37d4106c6
parent 0888815000 f852e8d2d2
4 changed files with 5 additions and 4 deletions
--- 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 =