1 files changed, 36 insertions, 34 deletions
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index a07138b55e..10234a4815 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "abstract_unit"
 
 class JsonParamsParsingTest < ActionDispatch::IntegrationTest
   class TestController < ActionController::Base
@@ -18,44 +18,44 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
 
   test "parses json params for application json" do
     assert_parses(
-      {"person" => {"name" => "David"}},
-      "{\"person\": {\"name\": \"David\"}}", { 'CONTENT_TYPE' => 'application/json' }
+      { "person" => { "name" => "David" } },
+      "{\"person\": {\"name\": \"David\"}}", "CONTENT_TYPE" => "application/json"
     )
   end
 
   test "parses boolean and number json params for application json" do
     assert_parses(
-      {"item" => {"enabled" => false, "count" => 10}},
-      "{\"item\": {\"enabled\": false, \"count\": 10}}", { 'CONTENT_TYPE' => 'application/json' }
+      { "item" => { "enabled" => false, "count" => 10 } },
+      "{\"item\": {\"enabled\": false, \"count\": 10}}", "CONTENT_TYPE" => "application/json"
     )
   end
 
   test "parses json params for application jsonrequest" do
     assert_parses(
-      {"person" => {"name" => "David"}},
-      "{\"person\": {\"name\": \"David\"}}", { 'CONTENT_TYPE' => 'application/jsonrequest' }
+      { "person" => { "name" => "David" } },
+      "{\"person\": {\"name\": \"David\"}}", "CONTENT_TYPE" => "application/jsonrequest"
     )
   end
 
   test "does not parse unregistered media types such as application/vnd.api+json" do
     assert_parses(
       {},
-      "{\"person\": {\"name\": \"David\"}}", { 'CONTENT_TYPE' => 'application/vnd.api+json' }
+      "{\"person\": {\"name\": \"David\"}}", "CONTENT_TYPE" => "application/vnd.api+json"
     )
   end
 
   test "nils are stripped from collections" do
     assert_parses(
-      {"person" => []},
-      "{\"person\":[null]}", { 'CONTENT_TYPE' => 'application/json' }
+      { "person" => [] },
+      "{\"person\":[null]}", "CONTENT_TYPE" => "application/json"
     )
     assert_parses(
-      {"person" => ['foo']},
-      "{\"person\":[\"foo\",null]}", { 'CONTENT_TYPE' => 'application/json' }
+      { "person" => ["foo"] },
+      "{\"person\":[\"foo\",null]}", "CONTENT_TYPE" => "application/json"
     )
     assert_parses(
-      {"person" => []},
-      "{\"person\":[null, null]}", { 'CONTENT_TYPE' => 'application/json' }
+      { "person" => [] },
+      "{\"person\":[null, null]}", "CONTENT_TYPE" => "application/json"
     )
   end
 
@@ -63,7 +63,7 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
     with_test_routing do
       output = StringIO.new
       json = "[\"person]\": {\"name\": \"David\"}}"
-      post "/parse", params: json, headers: { 'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => ActiveSupport::Logger.new(output) }
+      post "/parse", params: json, headers: { "CONTENT_TYPE" => "application/json", "action_dispatch.show_exceptions" => true, "action_dispatch.logger" => ActiveSupport::Logger.new(output) }
       assert_response :bad_request
       output.rewind && err = output.read
       assert err =~ /Error occurred while parsing request parameters/
@@ -75,7 +75,9 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
       begin
         $stderr = StringIO.new # suppress the log
         json = "[\"person]\": {\"name\": \"David\"}}"
-        exception = assert_raise(ActionDispatch::ParamsParser::ParseError) { post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => false} }
+        exception = assert_raise(ActionDispatch::Http::Parameters::ParseError) do
+          post "/parse", params: json, headers: { "CONTENT_TYPE" => "application/json", "action_dispatch.show_exceptions" => false }
+        end
         assert_equal JSON::ParserError, exception.cause.class
         assert_equal exception.cause.message, exception.message
       ensure
@@ -84,9 +86,9 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'raw_post is not empty for JSON request' do
+  test "raw_post is not empty for JSON request" do
     with_test_routing do
-      post '/parse', params: '{"posts": [{"title": "Post Title"}]}', headers: { 'CONTENT_TYPE' => 'application/json' }
+      post "/parse", params: '{"posts": [{"title": "Post Title"}]}', headers: { "CONTENT_TYPE" => "application/json" }
       assert_equal '{"posts": [{"title": "Post Title"}]}', request.raw_post
     end
   end
@@ -104,7 +106,7 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
       with_routing do |set|
         set.draw do
           ActiveSupport::Deprecation.silence do
-            post ':action', :to => ::JsonParamsParsingTest::TestController
+            post ":action", to: ::JsonParamsParsingTest::TestController
           end
         end
         yield
@@ -114,7 +116,7 @@ end
 
 class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
   class UsersController < ActionController::Base
-    wrap_parameters :format => :json
+    wrap_parameters format: :json
 
     class << self
       attr_accessor :last_request_parameters, :last_parameters
@@ -133,32 +135,32 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
 
   test "parses json params for application json" do
     assert_parses(
-      {"user" => {"username" => "sikachu"}, "username" => "sikachu"},
-      "{\"username\": \"sikachu\"}", { 'CONTENT_TYPE' => 'application/json' }
+      { "user" => { "username" => "sikachu" }, "username" => "sikachu" },
+      "{\"username\": \"sikachu\"}", "CONTENT_TYPE" => "application/json"
     )
   end
 
   test "parses json params for application jsonrequest" do
     assert_parses(
-      {"user" => {"username" => "sikachu"}, "username" => "sikachu"},
-      "{\"username\": \"sikachu\"}", { 'CONTENT_TYPE' => 'application/jsonrequest' }
+      { "user" => { "username" => "sikachu" }, "username" => "sikachu" },
+      "{\"username\": \"sikachu\"}", "CONTENT_TYPE" => "application/jsonrequest"
     )
   end
 
   test "parses json with non-object JSON content" do
     assert_parses(
-      {"user" => {"_json" => "string content" }, "_json" => "string content" },
-      "\"string content\"", { 'CONTENT_TYPE' => 'application/json' }
+      { "user" => { "_json" => "string content" }, "_json" => "string content" },
+      "\"string content\"", "CONTENT_TYPE" => "application/json"
     )
   end
 
   test "parses json params after custom json mime type registered" do
     begin
       Mime::Type.unregister :json
-      Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
+      Mime::Type.register "application/json", :json, %w(application/vnd.rails+json)
       assert_parses(
-        {"user" => {"username" => "meinac"}, "username" => "meinac"},
-        "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/json' }
+        { "user" => { "username" => "meinac" }, "username" => "meinac" },
+        "{\"username\": \"meinac\"}", "CONTENT_TYPE" => "application/json"
       )
     ensure
       Mime::Type.unregister :json
@@ -169,10 +171,10 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
   test "parses json params after custom json mime type registered with synonym" do
     begin
       Mime::Type.unregister :json
-      Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
+      Mime::Type.register "application/json", :json, %w(application/vnd.rails+json)
       assert_parses(
-        {"user" => {"username" => "meinac"}, "username" => "meinac"},
-        "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/vnd.api+json' }
+        { "user" => { "username" => "meinac" }, "username" => "meinac" },
+        "{\"username\": \"meinac\"}", "CONTENT_TYPE" => "application/vnd.rails+json"
       )
     ensure
       Mime::Type.unregister :json
@@ -186,7 +188,7 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
         post "/parse", params: actual, headers: headers
         assert_response :ok
         assert_equal(expected, UsersController.last_request_parameters)
-        assert_equal(expected.merge({"action" => "parse"}), UsersController.last_parameters)
+        assert_equal(expected.merge("action" => "parse"), UsersController.last_parameters)
       end
     end
 
@@ -194,7 +196,7 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
       with_routing do |set|
         set.draw do
           ActiveSupport::Deprecation.silence do
-            post ':action', :to => controller
+            post ":action", to: controller
           end
         end
         yield