Merge pull request #18323 from kirs/controller-test-kwargs

Use kwargs in ActionController::TestCase and ActionDispatch::Integration HTTP methods

1 files changed, 16 insertions, 7 deletions

diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 2b109ff19e..5ca2c9381c 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -35,7 +35,9 @@ class WebServiceTest < ActionDispatch::IntegrationTest
 
   def test_post_json
     with_test_route_set do
-      post "/", '{"entry":{"summary":"content..."}}', 'CONTENT_TYPE' => 'application/json'
+      post "/",
+        params: '{"entry":{"summary":"content..."}}',
+        headers: {'CONTENT_TYPE' => 'application/json'}
 
       assert_equal 'entry', @controller.response.body
       assert @controller.params.has_key?(:entry)
@@ -45,7 +47,9 @@ class WebServiceTest < ActionDispatch::IntegrationTest
 
   def test_put_json
     with_test_route_set do
-      put "/", '{"entry":{"summary":"content..."}}', 'CONTENT_TYPE' => 'application/json'
+      put "/",
+        params: '{"entry":{"summary":"content..."}}',
+        headers: { 'CONTENT_TYPE' => 'application/json' }
 
       assert_equal 'entry', @controller.response.body
       assert @controller.params.has_key?(:entry)
@@ -56,8 +60,9 @@ class WebServiceTest < ActionDispatch::IntegrationTest
   def test_register_and_use_json_simple
     with_test_route_set do
       with_params_parsers Mime::JSON => Proc.new { |data| ActiveSupport::JSON.decode(data)['request'].with_indifferent_access } do
-        post "/", '{"request":{"summary":"content...","title":"JSON"}}',
-          'CONTENT_TYPE' => 'application/json'
+        post "/",
+          params: '{"request":{"summary":"content...","title":"JSON"}}',
+          headers: {'CONTENT_TYPE' => 'application/json'}
 
         assert_equal 'summary, title', @controller.response.body
         assert @controller.params.has_key?(:summary)
@@ -70,14 +75,16 @@ class WebServiceTest < ActionDispatch::IntegrationTest
 
   def test_use_json_with_empty_request
     with_test_route_set do
-      assert_nothing_raised { post "/", "", 'CONTENT_TYPE' => 'application/json' }
+      assert_nothing_raised { post "/", headers: {'CONTENT_TYPE' => 'application/json'} }
       assert_equal '', @controller.response.body
     end
   end
 
   def test_dasherized_keys_as_json
     with_test_route_set do
-      post "/?full=1", '{"first-key":{"sub-key":"..."}}', 'CONTENT_TYPE' => 'application/json'
+      post "/?full=1",
+        params: '{"first-key":{"sub-key":"..."}}',
+        headers: {'CONTENT_TYPE' => 'application/json'}
       assert_equal 'action, controller, first-key(sub-key), full', @controller.response.body
       assert_equal "...", @controller.params['first-key']['sub-key']
     end
@@ -87,7 +94,9 @@ class WebServiceTest < ActionDispatch::IntegrationTest
     with_test_route_set do
       with_params_parsers Mime::JSON => Proc.new { |data| raise Interrupt } do
         assert_raises(Interrupt) do
-          post "/", '{"title":"JSON"}}', 'CONTENT_TYPE' => 'application/json'
+          post "/",
+            params: '{"title":"JSON"}}',
+            headers: {'CONTENT_TYPE' => 'application/json'}
         end
       end
     end