Skip to content

Rails 7.0 deprecates content_type in favor of media_type #1390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgebhardt merged 1 commit into from
Jan 11, 2023
Merged

Rails 7.0 deprecates content_type in favor of media_type #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/jsonapi/acts_as_resource_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ def resource_klass_name

def verify_content_type_header
if ['create', 'create_relationship', 'update_relationship', 'update'].include?(params[:action])
unless request.content_type == JSONAPI::MEDIA_TYPE
fail JSONAPI::Exceptions::UnsupportedMediaTypeError.new(request.content_type)
unless request.media_type == JSONAPI::MEDIA_TYPE
fail JSONAPI::Exceptions::UnsupportedMediaTypeError.new(request.media_type)
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions test/helpers/functional_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ module FunctionalHelpers
# end
# end
#
# if @response.content_type
# ct = @response.content_type
# if @response.media_type
# ct = @response.media_type
# elsif methods.include?('assert_response_response')
# ct = assert_response_response
# else
Expand Down
2 changes: 1 addition & 1 deletion test/test_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ class ActionDispatch::IntegrationTest
fixtures :all

def assert_jsonapi_response(expected_status, msg = nil)
assert_equal JSONAPI::MEDIA_TYPE, response.content_type
assert_equal JSONAPI::MEDIA_TYPE, response.media_type
if status != expected_status && status >= 400
pp json_response rescue nil
end
Expand Down