TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #8977 from Soylent/master

Browse Source 
Resovled issue rails#7774
This commit is contained in:
Aaron Patterson 2013-01-18 17:27:19 -08:00
commit f209b176c3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_dispatch/http/mime_negotiation.rb
View File

@ -122,7 +122,7 @@ def negotiate_mime(order)
def valid_accept_header
(xhr? && (accept || content_mime_type)) ||
(accept && accept !~ BROWSER_LIKE_ACCEPTS)
(accept.present? && accept !~ BROWSER_LIKE_ACCEPTS)
end
def use_accept_header

4
actionpack/test/dispatch/request_test.rb
View File

@ -587,6 +587,10 @@ def url_for(options = {})
request.expects(:parameters).at_least_once.returns({})
assert_equal [Mime::HTML], request.formats
request = stub_request 'HTTP_ACCEPT' => ''
request.expects(:parameters).at_least_once.returns({})
assert_equal [Mime::HTML], request.formats
request = stub_request 'CONTENT_TYPE' => 'application/xml; charset=UTF-8',
'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
request.expects(:parameters).at_least_once.returns({})