Merge pull request #1 from easyPEP/fix_deprecation_warnings

Fix deprecation warnings

Author: JRfromAustria

.ruby-version

@@ -0,0 +1 @@
+2.6.9

lib/jsonapi/rails.rb

@@ -37,7 +37,7 @@ def self.install!
     # @return [NilClass]
     def self.add_errors_renderer!
       ActionController::Renderers.add(:jsonapi_errors) do |resource, options|
-        self.content_type ||= Mime[:jsonapi]
+        self.content_type = Mime[:jsonapi] if self.media_type.nil?
 
         many = JSONAPI::Rails.is_collection?(resource, options[:is_collection])
         resource = [resource] unless many
@@ -47,7 +47,7 @@ def self.add_errors_renderer!
         ) unless resource.is_a?(ActiveModel::Errors)
 
         errors = []
-        model = resource.instance_variable_get('@base')
+        model = resource.instance_variable_get(:@base)
 
         if respond_to?(:jsonapi_serializer_class, true)
           model_serializer = jsonapi_serializer_class(model, false)
@@ -90,7 +90,7 @@ def self.add_errors_renderer!
     # @return [NilClass]
     def self.add_renderer!
       ActionController::Renderers.add(:jsonapi) do |resource, options|
-        self.content_type ||= Mime[:jsonapi]
+        self.content_type = Mime[:jsonapi] if self.media_type.nil?
 
         JSONAPI_METHODS_MAPPING.to_a[0..1].each do |opt, method_name|
           next unless respond_to?(method_name, true)

spec/errors_spec.rb

@@ -31,6 +31,7 @@
 
       it do
         expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.media_type).to eq('application/vnd.api+json')
         expect(response_json['errors'].size).to eq(1)
         expect(response_json['errors'][0]['status']).to eq('422')
         expect(response_json['errors'][0]['title'])

spec/fetching_spec.rb

@@ -25,6 +25,7 @@
         it do
           expect(response).to have_http_status(:ok)
           expect(response_json['data'].size).to eq(users.size)
+          expect(response.media_type).to eq('application/vnd.api+json')
 
           response_json['data'].each do |item|
             user = users.detect { |u| u.id == item['id'].to_i }