summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-10-28 02:11:49 +0000
committerfeld <feld@feld.me>2024-10-28 02:11:49 +0000
commit6099a94dbc26c9f86e340769af34c7b28725d831 (patch)
treed3df021015cf7e0aa2706494553f1b3fe1be2ca2 /test
parent2d591aedaeda3d80e9c1b31c0c83eae954849f36 (diff)
parent7d5ef8173735015c473fbc292a7f4b23d3e504a1 (diff)
downloadpleroma-6099a94dbc26c9f86e340769af34c7b28725d831.tar.gz
pleroma-6099a94dbc26c9f86e340769af34c7b28725d831.zip
Merge branch 'mediav2-fix' into 'develop'
Fix /api/v2/media returning the wrong status code for media processed synchronously See merge request pleroma/pleroma!4291
Diffstat (limited to 'test')
-rw-r--r--test/pleroma/web/mastodon_api/controllers/media_controller_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs
index 4adbaa640..3f696d94d 100644
--- a/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs
@@ -56,7 +56,7 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do
conn
|> put_req_header("content-type", "multipart/form-data")
|> post("/api/v2/media", %{"file" => image, "description" => desc})
- |> json_response_and_validate_schema(202)
+ |> json_response_and_validate_schema(200)
assert media_id = response["id"]
@@ -111,7 +111,7 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do
"file" => large_binary,
"description" => desc
})
- |> json_response_and_validate_schema(202)
+ |> json_response_and_validate_schema(200)
assert media_id = response["id"]