diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-17 17:53:47 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-17 17:53:47 +0300 |
| commit | 9ea31b373fdb75bb6aa04d006e5f493158897efa (patch) | |
| tree | b7301d21a9bc675984bb11b40c96148c0205270e /test/pleroma/web/mastodon_api/controllers/status_controller_test.exs | |
| parent | a859d9bc15cd1e4ff15bb63d6c114f71783118ef (diff) | |
| parent | 023f726d7f497705d766adee8874b94efb08a0aa (diff) | |
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
Diffstat (limited to 'test/pleroma/web/mastodon_api/controllers/status_controller_test.exs')
| -rw-r--r-- | test/pleroma/web/mastodon_api/controllers/status_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs index 497a6bb12..436608e51 100644 --- a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs +++ b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs @@ -167,7 +167,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do test "posting an undefined status with an attachment", %{user: user, conn: conn} do file = %Plug.Upload{ - content_type: "image/jpg", + content_type: "image/jpeg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg" } @@ -408,7 +408,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do |> Kernel.<>("Z") file = %Plug.Upload{ - content_type: "image/jpg", + content_type: "image/jpeg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg" } |