Merge pull request #808 from shunwen/feature/fix_request_tests

lgebhardt · web-flow · commit b4f488172b9e · 2016-08-30T20:25:45.000-04:00
Fix request tests
diff --git a/test/integration/requests/request_test.rb b/test/integration/requests/request_test.rb
@@ -93,7 +93,7 @@ def test_get_camelized_route_and_links
     JSONAPI.configuration = original_config
   end
 
-  def test_get_accepting_multiple_content_types
+  def test_get_multiple_accept_media_types
     get '/posts', headers:
       {
         'Accept' => "application/json, #{JSONAPI::MEDIA_TYPE}, */*"
@@ -121,7 +121,7 @@ def test_put_single_without_content_type
         }
       }.to_json,
       headers: {
-        'CONTENT_TYPE' => 'application/json',
+        'CONTENT_TYPE' => nil,
         'Accept' => JSONAPI::MEDIA_TYPE
       }
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ def test_get_camelized_route_and_links`
`93`	`93`	`JSONAPI.configuration = original_config`
`94`	`94`	`end`
`95`	`95`
`96`		`- def test_get_accepting_multiple_content_types`
	`96`	`+ def test_get_multiple_accept_media_types`
`97`	`97`	`get '/posts', headers:`
`98`	`98`	`{`
`99`	`99`	`'Accept' => "application/json, #{JSONAPI::MEDIA_TYPE}, /"`
`@@ -121,7 +121,7 @@ def test_put_single_without_content_type`
`121`	`121`	`}`
`122`	`122`	`}.to_json,`
`123`	`123`	`headers: {`
`124`		`- 'CONTENT_TYPE' => 'application/json',`
	`124`	`+ 'CONTENT_TYPE' => nil,`
`125`	`125`	`'Accept' => JSONAPI::MEDIA_TYPE`
`126`	`126`	`}`
`127`	`127`