diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-02 23:33:58 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-02 23:38:57 +0200 |
| commit | 73c94ed97ab6639d06dade1738aa5b9f49294340 (patch) | |
| tree | 8f63ad355c2dbcb893be4bf8097a857fccc4f4dd /actionpack/test/dispatch | |
| parent | 79a9bebcbf53673cab5d588869819702ac5a9607 (diff) | |
| download | rails-73c94ed97ab6639d06dade1738aa5b9f49294340.tar.gz rails-73c94ed97ab6639d06dade1738aa5b9f49294340.tar.bz2 rails-73c94ed97ab6639d06dade1738aa5b9f49294340.zip | |
Add ignore_accept_header config to AD::Request.
Diffstat (limited to 'actionpack/test/dispatch')
| -rw-r--r-- | actionpack/test/dispatch/request_test.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index f03ae7f2b3..86bbbab175 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -452,6 +452,28 @@ class RequestTest < ActiveSupport::TestCase assert request.formats.empty? end + test "ignore_accept_header" do + ActionDispatch::Request.ignore_accept_header = true + + begin + request = stub_request 'HTTP_ACCEPT' => 'application/xml' + request.expects(:parameters).at_least_once.returns({}) + assert_equal [ Mime::HTML ], request.formats + + request = stub_request 'HTTP_ACCEPT' => 'application/xml', + 'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest" + request.expects(:parameters).at_least_once.returns({}) + assert_equal [ Mime::JS ], request.formats + + request = stub_request 'HTTP_ACCEPT' => 'application/xml', + 'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest" + request.expects(:parameters).at_least_once.returns({:format => :json}) + assert_equal [ Mime::JSON ], request.formats + ensure + ActionDispatch::Request.ignore_accept_header = false + end + end + test "negotiate_mime" do request = stub_request 'HTTP_ACCEPT' => 'text/html', 'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest" |