Update test case to 406 when accept header does not accept jsonapi mime type

Author: jerelmiller

lib/jsonapi/acts_as_resource_controller.rb

@@ -3,6 +3,7 @@
 module JSONAPI
   module ActsAsResourceController
     MEDIA_TYPE_MATCHER = /(.+".+"[^,]*|[^,]+)/
+    ALL_MEDIA_TYPES = '*/*'
 
     def self.included(base)
       base.extend ClassMethods
@@ -110,18 +111,25 @@ def ensure_valid_accept_media_type
     end
 
     def invalid_accept_media_type?
-      jsonapi_media_types = media_types('Accept').select do |media_type|
+      media_types = media_types_for('Accept')
+
+      return false if media_types.blank? || media_types.include?(ALL_MEDIA_TYPES)
+
+      jsonapi_media_types = media_types.select do |media_type|
         media_type.include?(JSONAPI::MEDIA_TYPE)
       end
 
-      jsonapi_media_types.size > 0 &&
+      jsonapi_media_types.size.zero? ||
         jsonapi_media_types.none? do |media_type|
-          media_type.strip == JSONAPI::MEDIA_TYPE
+          media_type == JSONAPI::MEDIA_TYPE
         end
     end
 
-    def media_types(header)
-      (request.headers[header] || '').match(MEDIA_TYPE_MATCHER).to_a
+    def media_types_for(header)
+      (request.headers[header] || '')
+        .match(MEDIA_TYPE_MATCHER)
+        .to_a
+        .map(&:strip)
     end
 
     # override to set context

test/controllers/controller_test.rb

@@ -60,7 +60,9 @@ def test_accept_header_not_jsonapi
     @request.headers['Accept'] = 'text/plain'
 
     get :index
-    assert_response :success
+    assert_response 406
+    assert_equal 'Not acceptable', json_response['errors'][0]['title']
+    assert_equal "All requests must use the '#{JSONAPI::MEDIA_TYPE}' Accept without media type parameters. This request specified '#{@request.headers['Accept']}'.", json_response['errors'][0]['detail']
   end
 
   def test_exception_class_whitelist