alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix/cast-and-validate' into 'develop' 

Fix CastAndValidate plug

Closes #1889

See merge request pleroma/pleroma!2704
This commit is contained in:
lain 2020-06-29 15:59:40 +00:00
parent 344a9b28b3 3aa04b81c4
commit b2b332984c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/api_spec/cast_and_validate.ex
View File

@ -40,7 +40,7 @@ def call(%{private: %{open_api_spex: private_data}} = conn, %{
|> List.first() |> List.first()
_ -> _ ->
nil "application/json"
end end
private_data = Map.put(private_data, :operation_id, operation_id) private_data = Map.put(private_data, :operation_id, operation_id)

1
test/web/mastodon_api/controllers/account_controller_test.exs
View File

@ -780,7 +780,6 @@ test "with notifications", %{conn: conn} do
assert %{"id" => _id, "muting" => true, "muting_notifications" => true} = assert %{"id" => _id, "muting" => true, "muting_notifications" => true} =
conn conn
|> put_req_header("content-type", "application/json")
|> post("/api/v1/accounts/#{other_user.id}/mute") |> post("/api/v1/accounts/#{other_user.id}/mute")
|> json_response_and_validate_schema(200) |> json_response_and_validate_schema(200)