From d6bbd337ef1b96ed246bccaaf6e8b15a7077b9aa Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Sun, 29 Apr 2012 10:13:59 +0100
Subject: Don't convert params if the request isn't HTML - fixes #5341 (cherry
 picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f)

Conflicts:

	actionpack/test/controller/test_test.rb
---
 actionpack/test/controller/test_test.rb | 42 +++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index b64e275363..6a5843f9d7 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -46,6 +46,10 @@ class TestTest < ActionController::TestCase
       render :text => request.fullpath
     end
 
+    def test_format
+      render :text => request.format
+    end
+
     def test_query_string
       render :text => request.query_string
     end
@@ -527,14 +531,34 @@ XML
     )
   end
 
+  def test_params_passing_with_fixnums_when_not_html_request
+    get :test_params, :format => 'json', :count => 999
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_test/test', 'action' => 'test_params',
+       'format' => 'json', 'count' => 999 },
+      parsed_params
+    )
+  end
+
+  def test_params_passing_path_parameter_is_string_when_not_html_request
+    get :test_params, :format => 'json', :id => 1
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_test/test', 'action' => 'test_params',
+       'format' => 'json', 'id' => '1' },
+      parsed_params
+    )
+  end
+
   def test_params_passing_with_frozen_values
     assert_nothing_raised do
-      get :test_params, :frozen => 'icy'.freeze, :frozens => ['icy'.freeze].freeze
+      get :test_params, :frozen => 'icy'.freeze, :frozens => ['icy'.freeze].freeze, :deepfreeze => { :frozen => 'icy'.freeze }.freeze
     end
     parsed_params = eval(@response.body)
     assert_equal(
       {'controller' => 'test_test/test', 'action' => 'test_params',
-       'frozen' => 'icy', 'frozens' => ['icy']},
+       'frozen' => 'icy', 'frozens' => ['icy'], 'deepfreeze' => { 'frozen' => 'icy' }},
       parsed_params
     )
   end
@@ -635,6 +659,20 @@ XML
     assert_equal "http://", @response.body
   end
 
+  def test_request_format
+    get :test_format, :format => 'html'
+    assert_equal 'text/html', @response.body
+
+    get :test_format, :format => 'json'
+    assert_equal 'application/json', @response.body
+
+    get :test_format, :format => 'xml'
+    assert_equal 'application/xml', @response.body
+
+    get :test_format
+    assert_equal 'text/html', @response.body
+  end
+
   def test_should_have_knowledge_of_client_side_cookie_state_even_if_they_are_not_set
     cookies['foo'] = 'bar'
     get :no_op
-- 
cgit v1.2.3