Skip to content
Browse files

Adds tests for content negotiation change introduced in dc5300a

Signed-off-by: wycats <wycats@gmail.com>
  • Loading branch information...
1 parent 3cb5375 commit 7f7480f6fc1e88ce19bee8ac7f6fb2243343495e Patrik Stenmark committed with wycats May 15, 2010
Showing with 20 additions and 0 deletions.
  1. +20 −0 actionpack/test/controller/mime_responds_test.rb
View
20 actionpack/test/controller/mime_responds_test.rb
@@ -36,6 +36,15 @@ def html_or_xml
type.all { render :text => "Nothing" }
end
end
+
+ def json_xml_or_html
+ respond_to do |type|
+ type.json { render :text => 'JSON' }
+ type.xml { render :xml => 'XML' }
+ type.html { render :text => 'HTML' }
+ end
+ end
+
def forced_xml
request.format = :xml
@@ -364,6 +373,17 @@ def test_handle_any_any_xml
get :handle_any_any
assert_equal 'Whatever you ask for, I got it', @response.body
end
+
+ def test_browser_check_with_any_any
+ @request.accept = "application/json, application/xml"
+ get :json_xml_or_html
+ assert_equal 'JSON', @response.body
+
+ @request.accept = "application/json, application/xml, */*"
+ get :json_xml_or_html
+ assert_equal 'HTML', @response.body
+ end
+
def test_rjs_type_skips_layout
@request.accept = "text/javascript"

0 comments on commit 7f7480f

Please sign in to comment.
Something went wrong with that request. Please try again.