diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-18 17:27:19 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-18 17:27:19 -0800 |
| commit | f209b176c3a39af11f25e7a77fd856b5ad55c996 (patch) | |
| tree | 6ad667e6bfa66a2d82ed4b56a08f98c398df7618 /actionpack | |
| parent | e636f555310d679c26dcac7b28c8caa6f62263e6 (diff) | |
| parent | bebb02fd1c5ea0e8da9fb61eefcbb6ec8b9ab11f (diff) | |
| download | rails-f209b176c3a39af11f25e7a77fd856b5ad55c996.tar.gz rails-f209b176c3a39af11f25e7a77fd856b5ad55c996.tar.bz2 rails-f209b176c3a39af11f25e7a77fd856b5ad55c996.zip | |
Merge pull request #8977 from Soylent/master
Resovled issue rails#7774
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_negotiation.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/request_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb index 57660e93c4..89a7b12818 100644 --- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb +++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb @@ -122,7 +122,7 @@ module ActionDispatch 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 diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index 39923d0d2b..8a01b29340 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -587,6 +587,10 @@ class RequestTest < ActiveSupport::TestCase 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({}) |