From 7f7480f6fc1e88ce19bee8ac7f6fb2243343495e Mon Sep 17 00:00:00 2001
From: Patrik Stenmark <patrik.stenmark@gmail.com>
Date: Sat, 15 May 2010 14:10:40 +0200
Subject: [PATCH] Adds tests for content negotiation change introduced in
 dc5300adb6d46252c26e

Signed-off-by: wycats <wycats@gmail.com>
---
 .../test/controller/mime_responds_test.rb     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index d654338dba3d2..b5ce391b61ad9 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/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"