Consistent usage of spaces in hashes across our codebase

24 files changed, 109 insertions, 105 deletions

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index fa6ff03e9c..db6233840a 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -34,7 +34,7 @@ module ActionDispatch
       # Example:
       #
       #   get '/feed', params: { since: 201501011400 }
-      #   post '/profile', headers: {"X-Test-Header" => "testvalue" }
+      #   post '/profile', headers: { "X-Test-Header" => "testvalue" }
       def get(path, *args)
         process_with_kwargs(:get, path, *args)
       end
@@ -118,7 +118,7 @@ module ActionDispatch
       #
       #   request_via_redirect :post, '/welcome',
       #     params: { ref_id: 14 },
-      #     headers: {"X-Test-Header" => "testvalue"}
+      #     headers: { "X-Test-Header" => "testvalue" }
       def request_via_redirect(http_method, path, *args)
         process_with_kwargs(http_method, path, *args)
 
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 3f51de2381..f7ad8e5158 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -178,7 +178,7 @@ class UrlOptionsTest < ActionController::TestCase
         get ':controller/:action'
       end
 
-      get :from_view, params: { route: "from_view_url"}
+      get :from_view, params: { route: "from_view_url" }
 
       assert_equal 'http://www.override.com/from_view', @response.body
       assert_equal 'http://www.override.com/from_view', @controller.send(:from_view_url)
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 7bda5ccfe1..a5b246e7ad 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -38,7 +38,7 @@ class SessionTest < ActiveSupport::TestCase
   end
 
   def test_deprecated_request_via_redirect_uses_given_method
-    path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue"}
+    path = "/somepath"; args = { id: '1' }; headers = { "X-Test-Header" => "testvalue" }
     @session.expects(:process).with(:put, path, params: args, headers: headers)
     @session.stubs(:redirect?).returns(false)
     assert_deprecated { @session.request_via_redirect(:put, path, args, headers) }
@@ -65,7 +65,7 @@ class SessionTest < ActiveSupport::TestCase
   end
 
   def test_deprecated_get_via_redirect
-    path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
+    path = "/somepath"; args = { id: '1' }; headers = { "X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:get, path, args, headers)
 
     assert_deprecated do
@@ -80,7 +80,7 @@ class SessionTest < ActiveSupport::TestCase
   end
 
   def test_deprecated_post_via_redirect
-    path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
+    path = "/somepath"; args = { id: '1' }; headers = { "X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:post, path, args, headers)
 
     assert_deprecated do
@@ -95,7 +95,7 @@ class SessionTest < ActiveSupport::TestCase
   end
 
   def test_deprecated_patch_via_redirect
-    path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
+    path = "/somepath"; args = { id: '1' }; headers = { "X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:patch, path, args, headers)
 
     assert_deprecated do
@@ -110,7 +110,7 @@ class SessionTest < ActiveSupport::TestCase
   end
 
   def test_deprecated_put_via_redirect
-    path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
+    path = "/somepath"; args = { id: '1' }; headers = { "X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:put, path, args, headers)
 
     assert_deprecated do
@@ -125,7 +125,7 @@ class SessionTest < ActiveSupport::TestCase
   end
 
   def test_deprecated_delete_via_redirect
-    path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
+    path = "/somepath"; args = { id: '1' }; headers = { "X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:delete, path, args, headers)
 
     assert_deprecated do
@@ -763,7 +763,7 @@ class MetalIntegrationTest < ActionDispatch::IntegrationTest
   end
 
   def test_pass_headers_and_env
-    get "/success", headers: {"X-Test-Header" => "value"}, env: {"HTTP_REFERER" => "http://test.com/", "HTTP_HOST" => "http://test.com"}
+    get "/success", headers: { "X-Test-Header" => "value" }, env: { "HTTP_REFERER" => "http://test.com/", "HTTP_HOST" => "http://test.com" }
 
     assert_equal "http://test.com", @request.env["HTTP_HOST"]
     assert_equal "http://test.com/", @request.env["HTTP_REFERER"]
@@ -771,7 +771,7 @@ class MetalIntegrationTest < ActionDispatch::IntegrationTest
   end
 
   def test_pass_env
-    get "/success", env: {"HTTP_REFERER" => "http://test.com/", "HTTP_HOST" => "http://test.com"}
+    get "/success", env: { "HTTP_REFERER" => "http://test.com/", "HTTP_HOST" => "http://test.com" }
 
     assert_equal "http://test.com", @request.env["HTTP_HOST"]
     assert_equal "http://test.com/", @request.env["HTTP_REFERER"]
@@ -891,7 +891,7 @@ class EnvironmentFilterIntegrationTest < ActionDispatch::IntegrationTest
   end
 
   test "filters rack request form vars" do
-    post "/post", params: {username: 'cjolly', password: 'secret'}
+    post "/post", params: { username: 'cjolly', password: 'secret' }
 
     assert_equal 'cjolly', request.filtered_parameters['username']
     assert_equal '[FILTERED]', request.filtered_parameters['password']
diff --git a/actionpack/test/controller/new_base/content_negotiation_test.rb b/actionpack/test/controller/new_base/content_negotiation_test.rb
index 621d743711..c8166280fc 100644
--- a/actionpack/test/controller/new_base/content_negotiation_test.rb
+++ b/actionpack/test/controller/new_base/content_negotiation_test.rb
@@ -15,12 +15,12 @@ module ContentNegotiation
 
   class TestContentNegotiation < Rack::TestCase
     test "A */* Accept header will return HTML" do
-      get "/content_negotiation/basic/hello", headers: {"HTTP_ACCEPT" => "*/*"}
+      get "/content_negotiation/basic/hello", headers: { "HTTP_ACCEPT" => "*/*" }
       assert_body "Hello world */*!"
     end
 
     test "Not all mimes are converted to symbol" do
-      get "/content_negotiation/basic/all", headers: {"HTTP_ACCEPT" => "text/plain, mime/another"}
+      get "/content_negotiation/basic/all", headers: { "HTTP_ACCEPT" => "text/plain, mime/another" }
       assert_body '[:text, "mime/another"]'
     end
   end
diff --git a/actionpack/test/controller/new_base/content_type_test.rb b/actionpack/test/controller/new_base/content_type_test.rb
index 45b2fd7e13..88453988dd 100644
--- a/actionpack/test/controller/new_base/content_type_test.rb
+++ b/actionpack/test/controller/new_base/content_type_test.rb
@@ -76,7 +76,7 @@ module ContentType
     end
 
     test "sets Content-Type as application/xml when rendering *.xml.erb" do
-      get "/content_type/implied/i_am_xml_erb", params: {"format" => "xml"}
+      get "/content_type/implied/i_am_xml_erb", params: { "format" => "xml" }
 
       assert_header "Content-Type", "application/xml; charset=utf-8"
     end
@@ -88,7 +88,7 @@ module ContentType
     end
 
     test "sets Content-Type as application/xml when rendering *.xml.builder" do
-      get "/content_type/implied/i_am_xml_builder", params: {"format" => "xml"}
+      get "/content_type/implied/i_am_xml_builder", params: { "format" => "xml" }
 
       assert_header "Content-Type", "application/xml; charset=utf-8"
     end
diff --git a/actionpack/test/controller/new_base/render_action_test.rb b/actionpack/test/controller/new_base/render_action_test.rb
index 739b34cc28..3bf1dd0ede 100644
--- a/actionpack/test/controller/new_base/render_action_test.rb
+++ b/actionpack/test/controller/new_base/render_action_test.rb
@@ -88,7 +88,7 @@ module RenderAction
 
     test "rendering with layout => true" do
       assert_raise(ArgumentError) do
-        get "/render_action/basic/hello_world_with_layout", headers: {"action_dispatch.show_exceptions" => false}
+        get "/render_action/basic/hello_world_with_layout", headers: { "action_dispatch.show_exceptions" => false }
       end
     end
 
@@ -108,7 +108,7 @@ module RenderAction
 
     test "rendering with layout => 'greetings'" do
       assert_raise(ActionView::MissingTemplate) do
-        get "/render_action/basic/hello_world_with_custom_layout", headers: {"action_dispatch.show_exceptions" => false}
+        get "/render_action/basic/hello_world_with_custom_layout", headers: { "action_dispatch.show_exceptions" => false }
       end
     end
   end
diff --git a/actionpack/test/controller/new_base/render_layout_test.rb b/actionpack/test/controller/new_base/render_layout_test.rb
index 1536f25afe..7ab3777026 100644
--- a/actionpack/test/controller/new_base/render_layout_test.rb
+++ b/actionpack/test/controller/new_base/render_layout_test.rb
@@ -86,7 +86,7 @@ module ControllerLayouts
     XML_INSTRUCT = %Q(<?xml version="1.0" encoding="UTF-8"?>\n)
 
     test "if XML is selected, an HTML template is not also selected" do
-      get :index, params: {format: "xml"}
+      get :index, params: { format: "xml" }
       assert_response XML_INSTRUCT
     end
 
@@ -96,7 +96,7 @@ module ControllerLayouts
     end
 
     test "a layout for JS is ignored even if explicitly provided for HTML" do
-      get :explicit, params: {format: "js"}
+      get :explicit, params: { format: "js" }
       assert_response "alert('foo');"
     end
   end
@@ -120,7 +120,7 @@ module ControllerLayouts
     testing ControllerLayouts::FalseLayoutMethodController
 
     test "access false layout returned by a method/proc" do
-      get :index, params: {format: "js"}
+      get :index, params: { format: "js" }
       assert_response "alert('foo');"
     end
   end
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index 1255659c6f..9ea056194a 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -97,7 +97,7 @@ module RenderStreaming
     end
 
     test "do not stream on HTTP/1.0" do
-      get "/render_streaming/basic/hello_world", headers: {"HTTP_VERSION" => "HTTP/1.0"}
+      get "/render_streaming/basic/hello_world", headers: { "HTTP_VERSION" => "HTTP/1.0" }
       assert_body "Hello world, I'm here!"
       assert_status 200
       assert_equal "22", headers["Content-Length"]
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index 56464b74f1..19fef718e7 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -111,7 +111,7 @@ module RenderTemplate
     end
 
     test "rendering a builder template" do
-      get :builder_template, params: {"format" => "xml"}
+      get :builder_template, params: { "format" => "xml" }
       assert_response "<html>\n  <p>Hello</p>\n</html>\n"
     end
 
@@ -126,7 +126,7 @@ module RenderTemplate
       assert_body "Hello <strong>this is also raw</strong> in an html template"
       assert_status 200
 
-      get :with_implicit_raw, params: {format: 'text'}
+      get :with_implicit_raw, params: { format: 'text' }
 
       assert_body "Hello <strong>this is also raw</strong> in a text template"
       assert_status 200
diff --git a/actionpack/test/controller/new_base/render_test.rb b/actionpack/test/controller/new_base/render_test.rb
index 2866be7d9b..11a19ab783 100644
--- a/actionpack/test/controller/new_base/render_test.rb
+++ b/actionpack/test/controller/new_base/render_test.rb
@@ -74,7 +74,7 @@ module Render
         end
 
         assert_raises(AbstractController::DoubleRenderError) do
-          get "/render/double_render", headers: {"action_dispatch.show_exceptions" => false}
+          get "/render/double_render", headers: { "action_dispatch.show_exceptions" => false }
         end
       end
     end
@@ -84,13 +84,13 @@ module Render
     # Only public methods on actual controllers are callable actions
     test "raises an exception when a method of Object is called" do
       assert_raises(AbstractController::ActionNotFound) do
-        get "/render/blank_render/clone", headers: {"action_dispatch.show_exceptions" => false}
+        get "/render/blank_render/clone", headers: { "action_dispatch.show_exceptions" => false }
       end
     end
 
     test "raises an exception when a private method is called" do
       assert_raises(AbstractController::ActionNotFound) do
-        get "/render/blank_render/secretz", headers: {"action_dispatch.show_exceptions" => false}
+        get "/render/blank_render/secretz", headers: { "action_dispatch.show_exceptions" => false }
       end
     end
   end
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index 674e89243d..fba5ebba15 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -58,13 +58,13 @@ module ShowExceptions
   class ShowExceptionsOverriddenTest < ActionDispatch::IntegrationTest
     test 'show error page' do
       @app = ShowExceptionsOverriddenController.action(:boom)
-      get '/', params: {'detailed' => '0'}
+      get '/', params: { 'detailed' => '0' }
       assert_equal "500 error fixture\n", body
     end
 
     test 'show diagnostics message' do
       @app = ShowExceptionsOverriddenController.action(:boom)
-      get '/', params: {'detailed' => '1'}
+      get '/', params: { 'detailed' => '1' }
       assert_match(/boom/, body)
     end
   end
@@ -72,7 +72,7 @@ module ShowExceptions
   class ShowExceptionsFormatsTest < ActionDispatch::IntegrationTest
     def test_render_json_exception
       @app = ShowExceptionsOverriddenController.action(:boom)
-      get "/", headers: {'HTTP_ACCEPT' => 'application/json'}
+      get "/", headers: { 'HTTP_ACCEPT' => 'application/json' }
       assert_response :internal_server_error
       assert_equal 'application/json', response.content_type.to_s
       assert_equal({ :status => '500', :error => 'Internal Server Error' }.to_json, response.body)
@@ -80,7 +80,7 @@ module ShowExceptions
 
     def test_render_xml_exception
       @app = ShowExceptionsOverriddenController.action(:boom)
-      get "/", headers: {'HTTP_ACCEPT' => 'application/xml'}
+      get "/", headers: { 'HTTP_ACCEPT' => 'application/xml' }
       assert_response :internal_server_error
       assert_equal 'application/xml', response.content_type.to_s
       assert_equal({ :status => '500', :error => 'Internal Server Error' }.to_xml, response.body)
@@ -88,7 +88,7 @@ module ShowExceptions
 
     def test_render_fallback_exception
       @app = ShowExceptionsOverriddenController.action(:boom)
-      get "/", headers: {'HTTP_ACCEPT' => 'text/csv'}
+      get "/", headers: { 'HTTP_ACCEPT' => 'text/csv' }
       assert_response :internal_server_error
       assert_equal 'text/html', response.content_type.to_s
     end
@@ -101,7 +101,7 @@ module ShowExceptions
       @app.instance_variable_set(:@exceptions_app, nil)
       $stderr = StringIO.new
 
-      get '/', headers: {'HTTP_ACCEPT' => 'text/json'}
+      get '/', headers: { 'HTTP_ACCEPT' => 'text/json' }
       assert_response :internal_server_error
       assert_equal 'text/plain', response.content_type.to_s
     ensure
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 72faf655fe..901db63e39 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -129,7 +129,7 @@ XML
 
     def test_assigns
       @foo = "foo"
-      @foo_hash = {foo: :bar}
+      @foo_hash = { foo: :bar }
       render nothing: true
     end
 
@@ -209,7 +209,7 @@ XML
   end
 
   def test_raw_post_handling
-    params = Hash[:page, {name: 'page name'}, 'some key', 123]
+    params = Hash[:page, { name: 'page name' }, 'some key', 123]
     post :render_raw_post, params: params.dup
 
     assert_equal params.to_query, @response.body
@@ -381,7 +381,7 @@ XML
   end
 
   def test_deprecated_process_with_request_uri_with_params
-    assert_deprecated { process :test_uri, "GET", id: 7}
+    assert_deprecated { process :test_uri, "GET", id: 7 }
     assert_equal "/test_case_test/test/test_uri/7", @response.body
   end
 
@@ -401,7 +401,7 @@ XML
 
   def test_process_with_request_uri_with_params_with_explicit_uri
     @request.env['PATH_INFO'] = "/explicit/uri"
-    process :test_uri, method: "GET", params: {id: 7}
+    process :test_uri, method: "GET", params: { id: 7 }
     assert_equal "/explicit/uri", @response.body
   end
 
@@ -466,10 +466,10 @@ XML
 
   def test_assert_generates
     assert_generates 'controller/action/5', controller: 'controller', action: 'action', id: '5'
-    assert_generates 'controller/action/7', {id: "7"}, {controller: "controller", action: "action"}
-    assert_generates 'controller/action/5', {controller: "controller", action: "action", id: "5", name: "bob"}, {}, {name: "bob"}
-    assert_generates 'controller/action/7', {id: "7", name: "bob"}, {controller: "controller", action: "action"}, {name: "bob"}
-    assert_generates 'controller/action/7', {id: "7"}, {controller: "controller", action: "action", name: "bob"}, {}
+    assert_generates 'controller/action/7', { id: "7" }, { controller: "controller", action: "action" }
+    assert_generates 'controller/action/5', { controller: "controller", action: "action", id: "5", name: "bob" }, {}, { name: "bob" }
+    assert_generates 'controller/action/7', { id: "7", name: "bob" }, { controller: "controller", action: "action" }, { name: "bob" }
+    assert_generates 'controller/action/7', { id: "7" }, { controller: "controller", action: "action", name: "bob" }, {}
   end
 
   def test_assert_routing
@@ -504,12 +504,14 @@ XML
 
   def test_deprecated_params_passing
     assert_deprecated {
-      get :test_params, page: {name: "Page name", month: '4', year: '2004', day: '6'}
+      get :test_params, page: { name: "Page name", month: '4', year: '2004', day: '6' }
     }
     parsed_params = eval(@response.body)
     assert_equal(
-      {'controller' => 'test_case_test/test', 'action' => 'test_params',
-       'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
+      {
+        'controller' => 'test_case_test/test', 'action' => 'test_params',
+        'page' => { 'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6' }
+      },
       parsed_params
     )
   end
@@ -525,8 +527,10 @@ XML
     }
     parsed_params = eval(@response.body)
     assert_equal(
-      {'controller' => 'test_case_test/test', 'action' => 'test_params',
-       'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
+      {
+        'controller' => 'test_case_test/test', 'action' => 'test_params',
+        'page' => { 'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6' }
+      },
       parsed_params
     )
   end
@@ -609,7 +613,7 @@ XML
   end
 
   def test_params_passing_doesnt_modify_in_place
-    page = {name: "Page name", month: 4, year: 2004, day: 6}
+    page = { name: "Page name", month: 4, year: 2004, day: 6 }
     get :test_params, params: { page: page }
     assert_equal 2004, page[:year]
   end
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 5ca2c9381c..21fa670bb6 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -37,7 +37,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest
     with_test_route_set do
       post "/",
         params: '{"entry":{"summary":"content..."}}',
-        headers: {'CONTENT_TYPE' => 'application/json'}
+        headers: { 'CONTENT_TYPE' => 'application/json' }
 
       assert_equal 'entry', @controller.response.body
       assert @controller.params.has_key?(:entry)
@@ -62,7 +62,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest
       with_params_parsers Mime::JSON => Proc.new { |data| ActiveSupport::JSON.decode(data)['request'].with_indifferent_access } do
         post "/",
           params: '{"request":{"summary":"content...","title":"JSON"}}',
-          headers: {'CONTENT_TYPE' => 'application/json'}
+          headers: { 'CONTENT_TYPE' => 'application/json' }
 
         assert_equal 'summary, title', @controller.response.body
         assert @controller.params.has_key?(:summary)
@@ -75,7 +75,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest
 
   def test_use_json_with_empty_request
     with_test_route_set do
-      assert_nothing_raised { post "/", headers: {'CONTENT_TYPE' => 'application/json'} }
+      assert_nothing_raised { post "/", headers: { 'CONTENT_TYPE' => 'application/json' } }
       assert_equal '', @controller.response.body
     end
   end
@@ -84,7 +84,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest
     with_test_route_set do
       post "/?full=1",
         params: '{"first-key":{"sub-key":"..."}}',
-        headers: {'CONTENT_TYPE' => 'application/json'}
+        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
@@ -96,7 +96,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest
         assert_raises(Interrupt) do
           post "/",
             params: '{"title":"JSON"}}',
-            headers: {'CONTENT_TYPE' => 'application/json'}
+            headers: { 'CONTENT_TYPE' => 'application/json' }
         end
       end
     end
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index c665d68583..7921f05688 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -86,21 +86,21 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   test 'skip diagnosis if not showing detailed exceptions' do
     @app = ProductionApp
     assert_raise RuntimeError do
-      get "/", headers: {'action_dispatch.show_exceptions' => true}
+      get "/", headers: { 'action_dispatch.show_exceptions' => true }
     end
   end
 
   test 'skip diagnosis if not showing exceptions' do
     @app = DevelopmentApp
     assert_raise RuntimeError do
-      get "/", headers: {'action_dispatch.show_exceptions' => false}
+      get "/", headers: { 'action_dispatch.show_exceptions' => false }
     end
   end
 
   test 'raise an exception on cascade pass' do
     @app = ProductionApp
     assert_raise ActionController::RoutingError do
-      get "/pass", headers: {'action_dispatch.show_exceptions' => true}
+      get "/pass", headers: { 'action_dispatch.show_exceptions' => true }
     end
   end
 
@@ -108,14 +108,14 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     boomer = Boomer.new(false)
     @app = ActionDispatch::DebugExceptions.new(boomer)
     assert_raise ActionController::RoutingError do
-      get "/pass", headers: {'action_dispatch.show_exceptions' => true}
+      get "/pass", headers: { 'action_dispatch.show_exceptions' => true }
     end
     assert boomer.closed, "Expected to close the response body"
   end
 
   test 'displays routes in a table when a RoutingError occurs' do
     @app = DevelopmentApp
-    get "/pass", headers: {'action_dispatch.show_exceptions' => true}
+    get "/pass", headers: { 'action_dispatch.show_exceptions' => true }
     routing_table = body[/route_table.*<.table>/m]
     assert_match '/:controller(/:action)(.:format)', routing_table
     assert_match ':controller#:action', routing_table
@@ -125,7 +125,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   test 'displays request and response info when a RoutingError occurs' do
     @app = DevelopmentApp
 
-    get "/pass", headers: {'action_dispatch.show_exceptions' => true}
+    get "/pass", headers: { 'action_dispatch.show_exceptions' => true }
 
     assert_select 'h2', /Request/
     assert_select 'h2', /Response/
@@ -134,27 +134,27 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   test "rescue with diagnostics message" do
     @app = DevelopmentApp
 
-    get "/", headers: {'action_dispatch.show_exceptions' => true}
+    get "/", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 500
     assert_match(/puke/, body)
 
-    get "/not_found", headers: {'action_dispatch.show_exceptions' => true}
+    get "/not_found", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 404
     assert_match(/#{AbstractController::ActionNotFound.name}/, body)
 
-    get "/method_not_allowed", headers: {'action_dispatch.show_exceptions' => true}
+    get "/method_not_allowed", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 405
     assert_match(/ActionController::MethodNotAllowed/, body)
 
-    get "/unknown_http_method", headers: {'action_dispatch.show_exceptions' => true}
+    get "/unknown_http_method", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 405
     assert_match(/ActionController::UnknownHttpMethod/, body)
 
-    get "/bad_request", headers: {'action_dispatch.show_exceptions' => true}
+    get "/bad_request", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 400
     assert_match(/ActionController::BadRequest/, body)
 
-    get "/parameter_missing", headers: {'action_dispatch.show_exceptions' => true}
+    get "/parameter_missing", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 400
     assert_match(/ActionController::ParameterMissing/, body)
   end
@@ -204,8 +204,8 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   test "does not show filtered parameters" do
     @app = DevelopmentApp
 
-    get "/", params: {"foo"=>"bar"}, headers: {'action_dispatch.show_exceptions' => true,
-      'action_dispatch.parameter_filter' => [:foo]}
+    get "/", params: { "foo"=>"bar" }, headers: { 'action_dispatch.show_exceptions' => true,
+      'action_dispatch.parameter_filter' => [:foo] }
     assert_response 500
     assert_match("&quot;foo&quot;=&gt;&quot;[FILTERED]&quot;", body)
   end
@@ -213,7 +213,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   test "show registered original exception for wrapped exceptions" do
     @app = DevelopmentApp
 
-    get "/not_found_original_exception", headers: {'action_dispatch.show_exceptions' => true}
+    get "/not_found_original_exception", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 404
     assert_match(/AbstractController::ActionNotFound/, body)
   end
@@ -221,7 +221,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   test "named urls missing keys raise 500 level error" do
     @app = DevelopmentApp
 
-    get "/missing_keys", headers: {'action_dispatch.show_exceptions' => true}
+    get "/missing_keys", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 500
 
     assert_match(/ActionController::UrlGenerationError/, body)
@@ -267,21 +267,21 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   test "sets the HTTP charset parameter" do
     @app = DevelopmentApp
 
-    get "/", headers: {'action_dispatch.show_exceptions' => true}
+    get "/", headers: { 'action_dispatch.show_exceptions' => true }
     assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
   end
 
   test 'uses logger from env' do
     @app = DevelopmentApp
     output = StringIO.new
-    get "/", headers: {'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
+    get "/", headers: { 'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output) }
     assert_match(/puke/, output.rewind && output.read)
   end
 
   test 'uses backtrace cleaner from env' do
     @app = DevelopmentApp
     cleaner = stub(:clean => ['passed backtrace cleaner'])
-    get "/", headers: {'action_dispatch.show_exceptions' => true, 'action_dispatch.backtrace_cleaner' => cleaner}
+    get "/", headers: { 'action_dispatch.show_exceptions' => true, 'action_dispatch.backtrace_cleaner' => cleaner }
     assert_match(/passed backtrace cleaner/, body)
   end
 
@@ -301,7 +301,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   test 'display backtrace when error type is SyntaxError' do
     @app = DevelopmentApp
 
-    get '/original_syntax_error', headers: {'action_dispatch.backtrace_cleaner' => ActiveSupport::BacktraceCleaner.new}
+    get '/original_syntax_error', headers: { 'action_dispatch.backtrace_cleaner' => ActiveSupport::BacktraceCleaner.new }
 
     assert_response 500
     assert_select '#Application-Trace' do
@@ -328,7 +328,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   test 'display backtrace when error type is SyntaxError wrapped by ActionView::Template::Error' do
     @app = DevelopmentApp
 
-    get '/syntax_error_into_view', headers: {'action_dispatch.backtrace_cleaner' => ActiveSupport::BacktraceCleaner.new}
+    get '/syntax_error_into_view', headers: { 'action_dispatch.backtrace_cleaner' => ActiveSupport::BacktraceCleaner.new }
 
     assert_response 500
     assert_select '#Application-Trace' do
@@ -344,7 +344,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
       bc.add_silencer { |line| line !~ %r{test/dispatch/debug_exceptions_test.rb} }
     end
 
-    get '/framework_raises', headers: {'action_dispatch.backtrace_cleaner' => cleaner}
+    get '/framework_raises', headers: { 'action_dispatch.backtrace_cleaner' => cleaner }
 
     # Assert correct error
     assert_response 500
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
index 781e0e0397..6a439be2b5 100644
--- a/actionpack/test/dispatch/mount_test.rb
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -64,7 +64,7 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
   end
 
   def test_mounting_works_with_nested_script_name
-    get "/foo/sprockets/omg", headers: {'SCRIPT_NAME' => '/foo', 'PATH_INFO' => '/sprockets/omg'}
+    get "/foo/sprockets/omg", headers: { 'SCRIPT_NAME' => '/foo', 'PATH_INFO' => '/sprockets/omg' }
     assert_equal "/foo/sprockets -- /omg", response.body
   end
 
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index c7925fe0fa..d77341bc64 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -56,7 +56,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/
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index d483ae1cc1..6d1b267ad2 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -140,7 +140,7 @@ class MultipartParamsParsingTest < ActionDispatch::IntegrationTest
 
   test "uploads and reads file" do
     with_test_routing do
-      post '/read', params: { uploaded_data: fixture_file_upload(FIXTURE_PATH + "/hello.txt", "text/plain")}
+      post '/read', params: { uploaded_data: fixture_file_upload(FIXTURE_PATH + "/hello.txt", "text/plain") }
       assert_equal "File: Hello", response.body
     end
   end
diff --git a/actionpack/test/dispatch/request/query_string_parsing_test.rb b/actionpack/test/dispatch/request/query_string_parsing_test.rb
index 4175945f30..bc6716525e 100644
--- a/actionpack/test/dispatch/request/query_string_parsing_test.rb
+++ b/actionpack/test/dispatch/request/query_string_parsing_test.rb
@@ -147,7 +147,7 @@ class QueryStringParsingTest < ActionDispatch::IntegrationTest
         get ':action', :to => ::QueryStringParsingTest::TestController
       end
 
-      get "/parse", headers: {"QUERY_STRING" => "foo[]=bar&foo[4]=bar"}
+      get "/parse", headers: { "QUERY_STRING" => "foo[]=bar&foo[4]=bar" }
       assert_response :bad_request
     end
   end
diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
index 7417c738ea..a307483509 100644
--- a/actionpack/test/dispatch/request_id_test.rb
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -41,7 +41,7 @@ class RequestIdResponseTest < ActionDispatch::IntegrationTest
 
   test "request id given on request is passed all the way to the response" do
     with_test_route_set do
-      get '/', headers: {'HTTP_X_REQUEST_ID' => 'X' * 500}
+      get '/', headers: { 'HTTP_X_REQUEST_ID' => 'X' * 500 }
       assert_equal "X" * 255, @response.headers["X-Request-Id"]
     end
   end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 3537495516..3a95a9025f 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -362,22 +362,22 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       get 'admin/passwords' => "queenbee#passwords", :constraints => ::TestRoutingMapper::IpRestrictor
     end
 
-    get '/admin', headers: {'REMOTE_ADDR' => '192.168.1.100'}
+    get '/admin', headers: { 'REMOTE_ADDR' => '192.168.1.100' }
     assert_equal 'queenbee#index', @response.body
 
-    get '/admin', headers: {'REMOTE_ADDR' => '10.0.0.100'}
+    get '/admin', headers: { 'REMOTE_ADDR' => '10.0.0.100' }
     assert_equal 'pass', @response.headers['X-Cascade']
 
-    get '/admin/accounts', headers: {'REMOTE_ADDR' => '192.168.1.100'}
+    get '/admin/accounts', headers: { 'REMOTE_ADDR' => '192.168.1.100' }
     assert_equal 'queenbee#accounts', @response.body
 
-    get '/admin/accounts', headers: {'REMOTE_ADDR' => '10.0.0.100'}
+    get '/admin/accounts', headers: { 'REMOTE_ADDR' => '10.0.0.100' }
     assert_equal 'pass', @response.headers['X-Cascade']
 
-    get '/admin/passwords', headers: {'REMOTE_ADDR' => '192.168.1.100'}
+    get '/admin/passwords', headers: { 'REMOTE_ADDR' => '192.168.1.100' }
     assert_equal 'queenbee#passwords', @response.body
 
-    get '/admin/passwords', headers: {'REMOTE_ADDR' => '10.0.0.100'}
+    get '/admin/passwords', headers: { 'REMOTE_ADDR' => '10.0.0.100' }
     assert_equal 'pass', @response.headers['X-Cascade']
   end
 
@@ -1683,9 +1683,9 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     get '/products/0001/images/0001'
     assert_equal 'images#show', @response.body
 
-    get '/dashboard', headers: {'REMOTE_ADDR' => '10.0.0.100'}
+    get '/dashboard', headers: { 'REMOTE_ADDR' => '10.0.0.100' }
     assert_equal 'pass', @response.headers['X-Cascade']
-    get '/dashboard', headers: {'REMOTE_ADDR' => '192.168.1.100'}
+    get '/dashboard', headers: { 'REMOTE_ADDR' => '192.168.1.100' }
     assert_equal 'dashboards#show', @response.body
   end
 
@@ -3573,12 +3573,12 @@ class TestAltApp < ActionDispatch::IntegrationTest
   end
 
   def test_alt_request_with_matched_header
-    get "/", headers: {"HTTP_X_HEADER" => "HEADER"}
+    get "/", headers: { "HTTP_X_HEADER" => "HEADER" }
     assert_equal "XHeader", @response.body
   end
 
   def test_alt_request_with_unmatched_header
-    get "/", headers: {"HTTP_X_HEADER" => "NON_MATCH"}
+    get "/", headers: { "HTTP_X_HEADER" => "NON_MATCH" }
     assert_equal "Alternative App", @response.body
   end
 end
@@ -3773,7 +3773,7 @@ class TestHttpMethods < ActionDispatch::IntegrationTest
 
   (RFC2616 + RFC2518 + RFC3253 + RFC3648 + RFC3744 + RFC5323 + RFC4791 + RFC5789).each do |method|
     test "request method #{method.underscore} can be matched" do
-      get '/', headers: {'REQUEST_METHOD' => method}
+      get '/', headers: { 'REQUEST_METHOD' => method }
       assert_equal method, @response.body
     end
   end
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 3cdd72f4f4..2194efa503 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -125,7 +125,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
 
   def test_does_set_secure_cookies_over_https
     with_test_route_set(:secure => true) do
-      get '/set_session_value', headers: {'HTTPS' => 'on'}
+      get '/set_session_value', headers: { 'HTTPS' => 'on' }
       assert_response :success
       assert_equal "_myapp_session=#{response.body}; path=/; secure; HttpOnly",
         headers['Set-Cookie']
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index d925452c5f..72eaa916bc 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -27,30 +27,30 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
   test "skip exceptions app if not showing exceptions" do
     @app = ProductionApp
     assert_raise RuntimeError do
-      get "/", headers: {'action_dispatch.show_exceptions' => false}
+      get "/", headers: { 'action_dispatch.show_exceptions' => false }
     end
   end
 
   test "rescue with error page" do
     @app = ProductionApp
 
-    get "/", headers: {'action_dispatch.show_exceptions' => true}
+    get "/", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 500
     assert_equal "500 error fixture\n", body
 
-    get "/bad_params", headers: {'action_dispatch.show_exceptions' => true}
+    get "/bad_params", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 400
     assert_equal "400 error fixture\n", body
 
-    get "/not_found", headers: {'action_dispatch.show_exceptions' => true}
+    get "/not_found", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 404
     assert_equal "404 error fixture\n", body
 
-    get "/method_not_allowed", headers: {'action_dispatch.show_exceptions' => true}
+    get "/method_not_allowed", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 405
     assert_equal "", body
 
-    get "/unknown_http_method", headers: {'action_dispatch.show_exceptions' => true}
+    get "/unknown_http_method", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 405
     assert_equal "", body
   end
@@ -61,11 +61,11 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     begin
       @app = ProductionApp
 
-      get "/", headers: {'action_dispatch.show_exceptions' => true}
+      get "/", headers: { 'action_dispatch.show_exceptions' => true }
       assert_response 500
       assert_equal "500 localized error fixture\n", body
 
-      get "/not_found", headers: {'action_dispatch.show_exceptions' => true}
+      get "/not_found", headers: { 'action_dispatch.show_exceptions' => true }
       assert_response 404
       assert_equal "404 error fixture\n", body
     ensure
@@ -76,14 +76,14 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
   test "sets the HTTP charset parameter" do
     @app = ProductionApp
 
-    get "/", headers: {'action_dispatch.show_exceptions' => true}
+    get "/", headers: { 'action_dispatch.show_exceptions' => true }
     assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
   end
 
   test "show registered original exception for wrapped exceptions" do
     @app = ProductionApp
 
-    get "/not_found_original_exception", headers: {'action_dispatch.show_exceptions' => true}
+    get "/not_found_original_exception", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 404
     assert_match(/404 error/, body)
   end
@@ -97,7 +97,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
 
     @app = ActionDispatch::ShowExceptions.new(Boomer.new, exceptions_app)
-    get "/not_found_original_exception", headers: {'action_dispatch.show_exceptions' => true}
+    get "/not_found_original_exception", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 404
     assert_equal "YOU FAILED BRO", body
   end
@@ -108,7 +108,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
 
     @app = ActionDispatch::ShowExceptions.new(Boomer.new, exceptions_app)
-    get "/method_not_allowed", headers: {'action_dispatch.show_exceptions' => true}
+    get "/method_not_allowed", headers: { 'action_dispatch.show_exceptions' => true }
     assert_response 405
     assert_equal "", body
   end
diff --git a/actionpack/test/dispatch/ssl_test.rb b/actionpack/test/dispatch/ssl_test.rb
index 5dbad21713..7ced41bc2e 100644
--- a/actionpack/test/dispatch/ssl_test.rb
+++ b/actionpack/test/dispatch/ssl_test.rb
@@ -20,7 +20,7 @@ class SSLTest < ActionDispatch::IntegrationTest
   end
 
   def test_allows_https_proxy_header_url
-    get "http://example.org/", headers: {'HTTP_X_FORWARDED_PROTO' => "https"}
+    get "http://example.org/", headers: { 'HTTP_X_FORWARDED_PROTO' => "https" }
     assert_response :success
   end
 
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index 3d7b6086ee..ce1e1d0a6a 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -39,7 +39,7 @@ module TestUrlGeneration
     end
 
     test "the request's SCRIPT_NAME takes precedence over the route" do
-      get "/foo", headers: {'SCRIPT_NAME' => "/new", 'action_dispatch.routes' => Routes}
+      get "/foo", headers: { 'SCRIPT_NAME' => "/new", 'action_dispatch.routes' => Routes }
       assert_equal "/new/foo", response.body
     end