diff options
| author | maximerety <maxime.rety@gmail.com> | 2013-03-04 14:43:31 +0000 |
|---|---|---|
| committer | maximerety <maxime.rety@gmail.com> | 2013-03-04 14:43:31 +0000 |
| commit | 1d217abc3db4d229686525fd7fa448ebd5746cad (patch) | |
| tree | b50f9b2059532094cc1e8bef857660ef2486beb1 /actionpack/test/dispatch | |
| parent | 2e28045b487d66cbd5519317ec18a93c65a4d04b (diff) | |
| download | rails-1d217abc3db4d229686525fd7fa448ebd5746cad.tar.gz rails-1d217abc3db4d229686525fd7fa448ebd5746cad.tar.bz2 rails-1d217abc3db4d229686525fd7fa448ebd5746cad.zip | |
Fix formats on xhr requests when HTTP_ACCEPT is empty string
Fix ActionDispatch::Request#formats on xhr requests when HTTP_ACCEPT
header is empty string. About issue #7774, same fix as in commit bebb02f
but for xhr requests.
Diffstat (limited to 'actionpack/test/dispatch')
| -rw-r--r-- | actionpack/test/dispatch/request_test.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index 91810864d5..f6de9748ca 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -594,6 +594,11 @@ class RequestTest < ActiveSupport::TestCase request.expects(:parameters).at_least_once.returns({}) assert_equal [Mime::HTML], request.formats + request = stub_request 'HTTP_ACCEPT' => '', + 'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest" + request.expects(:parameters).at_least_once.returns({}) + assert_equal [Mime::JS], request.formats + request = stub_request 'CONTENT_TYPE' => 'application/xml; charset=UTF-8', 'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest" request.expects(:parameters).at_least_once.returns({}) |