From fe1f4b2ad56f010a4e9b93d547d63a15953d9dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sat, 29 Oct 2016 01:05:58 -0200
Subject: Add more rubocop rules about whitespaces

---
 actionpack/test/controller/caching_test.rb         |   2 +-
 actionpack/test/controller/filters_test.rb         |  46 ++---
 actionpack/test/controller/flash_hash_test.rb      |   4 +-
 .../controller/http_digest_authentication_test.rb  |   4 +-
 actionpack/test/controller/integration_test.rb     |  12 +-
 .../controller/new_base/render_streaming_test.rb   |   2 +-
 .../test/controller/parameters/mutators_test.rb    |   4 +-
 .../parameters/parameters_permit_test.rb           |  10 +-
 actionpack/test/controller/render_json_test.rb     |   2 +-
 actionpack/test/controller/render_test.rb          |   2 +-
 actionpack/test/controller/renderers_test.rb       |   2 +-
 actionpack/test/controller/resources_test.rb       |   6 +-
 actionpack/test/controller/routing_test.rb         |  12 +-
 actionpack/test/controller/send_file_test.rb       |   2 +-
 actionpack/test/controller/test_case_test.rb       |   8 +-
 .../test/controller/url_for_integration_test.rb    | 188 ++++++++++-----------
 actionpack/test/controller/url_for_test.rb         |  10 +-
 17 files changed, 158 insertions(+), 158 deletions(-)

(limited to 'actionpack/test/controller')

diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 18490c7d73..fa8d9dc09a 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -58,7 +58,7 @@ class FragmentCachingTest < ActionController::TestCase
   def test_fragment_cache_key
     assert_equal "views/what a key", @controller.fragment_cache_key("what a key")
     assert_equal "views/test.host/fragment_caching_test/some_action",
-                  @controller.fragment_cache_key(controller: "fragment_caching_test",action: "some_action")
+                  @controller.fragment_cache_key(controller: "fragment_caching_test", action: "some_action")
   end
 
   def test_read_fragment_with_caching_enabled
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index a34878cee8..e0fa1fbab8 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -506,20 +506,20 @@ class FilterTest < ActionController::TestCase
     private
 
       def filter_one
-        @filters  ||= []
-        @filters  << "filter_one"
+        @filters ||= []
+        @filters << "filter_one"
       end
 
       def action_two
-        @filters  << "action_two"
+        @filters << "action_two"
       end
 
       def non_yielding_action
-        @filters  << "it didn't yield"
+        @filters << "it didn't yield"
       end
 
       def action_three
-        @filters  << "action_three"
+        @filters << "action_three"
       end
   end
 
@@ -911,7 +911,7 @@ class ControllerWithFilterInstance < PostsController
 end
 
 class ControllerWithProcFilter < PostsController
-  around_action(only: :no_raise) do |c,b|
+  around_action(only: :no_raise) do |c, b|
     c.instance_variable_set(:"@before", true)
     b.call
     c.instance_variable_set(:"@after", true)
@@ -961,34 +961,34 @@ class YieldingAroundFiltersTest < ActionController::TestCase
 
   def test_base
     controller = PostsController
-    assert_nothing_raised { test_process(controller,"no_raise") }
-    assert_nothing_raised { test_process(controller,"raises_before") }
-    assert_nothing_raised { test_process(controller,"raises_after") }
-    assert_nothing_raised { test_process(controller,"no_action") }
+    assert_nothing_raised { test_process(controller, "no_raise") }
+    assert_nothing_raised { test_process(controller, "raises_before") }
+    assert_nothing_raised { test_process(controller, "raises_after") }
+    assert_nothing_raised { test_process(controller, "no_action") }
   end
 
   def test_with_symbol
     controller = ControllerWithSymbolAsFilter
-    assert_nothing_raised { test_process(controller,"no_raise") }
-    assert_raise(Before) { test_process(controller,"raises_before") }
-    assert_raise(After) { test_process(controller,"raises_after") }
-    assert_nothing_raised { test_process(controller,"no_raise") }
+    assert_nothing_raised { test_process(controller, "no_raise") }
+    assert_raise(Before) { test_process(controller, "raises_before") }
+    assert_raise(After) { test_process(controller, "raises_after") }
+    assert_nothing_raised { test_process(controller, "no_raise") }
   end
 
   def test_with_class
     controller = ControllerWithFilterClass
-    assert_nothing_raised { test_process(controller,"no_raise") }
-    assert_raise(After) { test_process(controller,"raises_after") }
+    assert_nothing_raised { test_process(controller, "no_raise") }
+    assert_raise(After) { test_process(controller, "raises_after") }
   end
 
   def test_with_instance
     controller = ControllerWithFilterInstance
-    assert_nothing_raised { test_process(controller,"no_raise") }
-    assert_raise(After) { test_process(controller,"raises_after") }
+    assert_nothing_raised { test_process(controller, "no_raise") }
+    assert_raise(After) { test_process(controller, "raises_after") }
   end
 
   def test_with_proc
-    test_process(ControllerWithProcFilter,"no_raise")
+    test_process(ControllerWithProcFilter, "no_raise")
     assert @controller.instance_variable_get(:@before)
     assert @controller.instance_variable_get(:@after)
   end
@@ -997,25 +997,25 @@ class YieldingAroundFiltersTest < ActionController::TestCase
     controller = ControllerWithNestedFilters
     assert_nothing_raised do
       begin
-        test_process(controller,"raises_both")
+        test_process(controller, "raises_both")
       rescue Before, After
       end
     end
     assert_raise Before do
       begin
-        test_process(controller,"raises_both")
+        test_process(controller, "raises_both")
       rescue After
       end
     end
   end
 
   def test_action_order_with_all_action_types
-    test_process(ControllerWithAllTypesOfFilters,"no_raise")
+    test_process(ControllerWithAllTypesOfFilters, "no_raise")
     assert_equal "before around (before yield) around_again (before yield) around_again (after yield) after around (after yield)", @controller.instance_variable_get(:@ran_filter).join(" ")
   end
 
   def test_action_order_with_skip_action_method
-    test_process(ControllerWithTwoLessFilters,"no_raise")
+    test_process(ControllerWithTwoLessFilters, "no_raise")
     assert_equal "before around (before yield) around (after yield)", @controller.instance_variable_get(:@ran_filter).join(" ")
   end
 
diff --git a/actionpack/test/controller/flash_hash_test.rb b/actionpack/test/controller/flash_hash_test.rb
index 32f0db71f5..6b3abdd5be 100644
--- a/actionpack/test/controller/flash_hash_test.rb
+++ b/actionpack/test/controller/flash_hash_test.rb
@@ -102,8 +102,8 @@ module ActionDispatch
       @hash["foo"] = "bar"
 
       things = []
-      @hash.each do |k,v|
-        things << [k,v]
+      @hash.each do |k, v|
+        things << [k, v]
       end
 
       assert_equal([%w{ hello world }, %w{ foo bar }].sort, things.sort)
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index 343b7b643d..0b59e123d7 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -7,7 +7,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
     before_action :authenticate_with_request, only: :display
 
     USERS = { "lifo" => "world", "pretty" => "please",
-              "dhh" => ::Digest::MD5::hexdigest(["dhh","SuperSecret","secret"].join(":")) }
+              "dhh" => ::Digest::MD5::hexdigest(["dhh", "SuperSecret", "secret"].join(":")) }
 
     def index
       render plain: "Hello Secret"
@@ -180,7 +180,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   test "authentication request with password stored as ha1 digest hash" do
     @request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "dhh",
-                                           password: ::Digest::MD5::hexdigest(["dhh","SuperSecret","secret"].join(":")),
+                                           password: ::Digest::MD5::hexdigest(["dhh", "SuperSecret", "secret"].join(":")),
                                            password_is_ha1: true)
     get :display
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 67a42989c2..8f8fc64dbd 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -273,7 +273,7 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
       self.cookies["cookie_2"] = "oatmeal"
       get "/cookie_monster"
       assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"]
-      assert_equal({ "cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate" }, cookies.to_hash)
+      assert_equal({ "cookie_1" => "", "cookie_2" => "oatmeal", "cookie_3" => "chocolate" }, cookies.to_hash)
     end
   end
 
@@ -283,14 +283,14 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
       assert_response :success
 
       assert_equal "foo=bar; path=/", headers["Set-Cookie"]
-      assert_equal({ "foo"=>"bar" }, cookies.to_hash)
+      assert_equal({ "foo" => "bar" }, cookies.to_hash)
 
       get "/get_cookie"
       assert_response :success
       assert_equal "bar", body
 
       assert_equal nil, headers["Set-Cookie"]
-      assert_equal({ "foo"=>"bar" }, cookies.to_hash)
+      assert_equal({ "foo" => "bar" }, cookies.to_hash)
     end
   end
 
@@ -302,14 +302,14 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
       assert_response :success
 
       assert_equal "foo=bar; path=/", headers["Set-Cookie"]
-      assert_equal({ "foo"=>"bar" }, cookies.to_hash)
+      assert_equal({ "foo" => "bar" }, cookies.to_hash)
 
       get "/get_cookie"
       assert_response :success
       assert_equal "bar", body
 
       assert_equal nil, headers["Set-Cookie"]
-      assert_equal({ "foo"=>"bar" }, cookies.to_hash)
+      assert_equal({ "foo" => "bar" }, cookies.to_hash)
     end
   end
 
@@ -916,7 +916,7 @@ class IntegrationRequestsWithSessionSetup < ActionDispatch::IntegrationTest
 
   def test_cookies_set_in_setup_are_persisted_through_the_session
     get "/foo"
-    assert_equal({ "user_name"=>"david" }, cookies.to_hash)
+    assert_equal({ "user_name" => "david" }, cookies.to_hash)
   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 5cd8f82323..64b799f826 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -104,7 +104,7 @@ module RenderStreaming
       assert_equal nil, headers["Transfer-Encoding"]
     end
 
-    def assert_streaming!(cache="no-cache")
+    def assert_streaming!(cache = "no-cache")
       assert_status 200
       assert_equal nil, headers["Content-Length"]
       assert_equal "chunked", headers["Transfer-Encoding"]
diff --git a/actionpack/test/controller/parameters/mutators_test.rb b/actionpack/test/controller/parameters/mutators_test.rb
index e060e5180f..e61bbdbe13 100644
--- a/actionpack/test/controller/parameters/mutators_test.rb
+++ b/actionpack/test/controller/parameters/mutators_test.rb
@@ -45,11 +45,11 @@ class ParametersMutatorsTest < ActiveSupport::TestCase
 
   test "keep_if retains permitted status" do
     @params.permit!
-    assert @params.keep_if { |k,v| k == "person" }.permitted?
+    assert @params.keep_if { |k, v| k == "person" }.permitted?
   end
 
   test "keep_if retains unpermitted status" do
-    assert_not @params.keep_if { |k,v| k == "person" }.permitted?
+    assert_not @params.keep_if { |k, v| k == "person" }.permitted?
   end
 
   test "reject! retains permitted status" do
diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb
index 728d8e1279..1cb7173aa0 100644
--- a/actionpack/test/controller/parameters/parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -28,7 +28,7 @@ class ParametersPermitTest < ActiveSupport::TestCase
   end
 
   def walk_permitted(params)
-    params.each do |k,v|
+    params.each do |k, v|
       case v
       when ActionController::Parameters
         walk_permitted v
@@ -39,13 +39,13 @@ class ParametersPermitTest < ActiveSupport::TestCase
   end
 
   test "iteration should not impact permit" do
-    hash = { "foo"=>{ "bar"=>{ "0"=>{ "baz"=>"hello", "zot"=>"1" } } } }
+    hash = { "foo" => { "bar" => { "0" => { "baz" => "hello", "zot" => "1" } } } }
     params = ActionController::Parameters.new(hash)
 
     walk_permitted params
 
     sanitized = params[:foo].permit(bar: [:baz])
-    assert_equal({ "0"=>{ "baz"=>"hello" } }, sanitized[:bar].to_unsafe_h)
+    assert_equal({ "0" => { "baz" => "hello" } }, sanitized[:bar].to_unsafe_h)
   end
 
   test "if nothing is permitted, the hash becomes empty" do
@@ -322,8 +322,8 @@ class ParametersPermitTest < ActiveSupport::TestCase
   end
 
   test "to_unsafe_h returns unfiltered params even after accessing few keys" do
-    params = ActionController::Parameters.new("f"=>{ "language_facet"=>["Tibetan"] })
-    expected = { "f"=>{ "language_facet"=>["Tibetan"] } }
+    params = ActionController::Parameters.new("f" => { "language_facet" => ["Tibetan"] })
+    expected = { "f" => { "language_facet" => ["Tibetan"] } }
 
     assert params["f"].is_a? ActionController::Parameters
     assert_equal expected, params.to_unsafe_h
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index 213829bd9e..79552ec8f1 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -5,7 +5,7 @@ require "pathname"
 
 class RenderJsonTest < ActionController::TestCase
   class JsonRenderable
-    def as_json(options={})
+    def as_json(options = {})
       hash = { a: :b, c: :d, e: :f }
       hash.except!(*options[:except]) if options[:except]
       hash
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 76139d59e2..0c0f18f200 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -368,7 +368,7 @@ class ExpiresInRenderTest < ActionController::TestCase
   end
 
   def test_date_header_when_expires_in
-    time = Time.mktime(2011,10,30)
+    time = Time.mktime(2011, 10, 30)
     Time.stub :now, time do
       get :conditional_hello_with_expires_in
       assert_equal Time.now.httpdate, @response.headers["Date"]
diff --git a/actionpack/test/controller/renderers_test.rb b/actionpack/test/controller/renderers_test.rb
index 122f5be549..ccc700d79c 100644
--- a/actionpack/test/controller/renderers_test.rb
+++ b/actionpack/test/controller/renderers_test.rb
@@ -10,7 +10,7 @@ class RenderersTest < ActionController::TestCase
     end
   end
   class JsonRenderable
-    def as_json(options={})
+    def as_json(options = {})
       hash = { a: :b, c: :d, e: :f }
       hash.except!(*options[:except]) if options[:except]
       hash
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index b572e7e8d5..0b3dc6c41f 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -27,7 +27,7 @@ class ResourcesTest < ActionController::TestCase
 
   def test_override_paths_for_member_and_collection_methods
     collection_methods = { rss: :get, reorder: :post, csv: :post }
-    member_methods    = { rss: :get, atom: :get, upload: :post, fix: :post }
+    member_methods = { rss: :get, atom: :get, upload: :post, fix: :post }
     path_names = { new: "nuevo", rss: "canal", fix: "corrigir" }
 
     with_restful_routing :messages,
@@ -792,7 +792,7 @@ class ResourcesTest < ActionController::TestCase
       end
 
       assert_simply_restful_for :product_reviews, controller: "messages", as: "reviews", name_prefix: "product_", path_prefix: "products/1/", options: { product_id: "1" }
-      assert_simply_restful_for :tutor_reviews,controller: "comments", as: "reviews", name_prefix: "tutor_", path_prefix: "tutors/1/", options: { tutor_id: "1" }
+      assert_simply_restful_for :tutor_reviews, controller: "comments", as: "reviews", name_prefix: "tutor_", path_prefix: "tutors/1/", options: { tutor_id: "1" }
     end
   end
 
@@ -1306,7 +1306,7 @@ class ResourcesTest < ActionController::TestCase
     end
 
     def assert_named_route(expected, route, options)
-      actual =  @controller.send(route, options) rescue $!.class.name
+      actual = @controller.send(route, options) rescue $!.class.name
       assert_equal expected, actual, "Error on route: #{route}(#{options.inspect})"
     end
 
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 7be2ad2b28..56b39510bb 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -91,7 +91,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     end
 
     hash = ActiveSupport::JSON.decode get(URI("http://example.org/journey/faithfully-omg"))
-    assert_equal({ "artist"=>"journey", "song"=>"faithfully" }, hash)
+    assert_equal({ "artist" => "journey", "song" => "faithfully" }, hash)
   end
 
   def test_id_with_dash
@@ -103,7 +103,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     end
 
     hash = ActiveSupport::JSON.decode get(URI("http://example.org/journey/faithfully-omg"))
-    assert_equal({ "id"=>"faithfully-omg" }, hash)
+    assert_equal({ "id" => "faithfully-omg" }, hash)
   end
 
   def test_dash_with_custom_regexp
@@ -115,7 +115,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     end
 
     hash = ActiveSupport::JSON.decode get(URI("http://example.org/journey/123-omg"))
-    assert_equal({ "artist"=>"journey", "song"=>"123" }, hash)
+    assert_equal({ "artist" => "journey", "song" => "123" }, hash)
     assert_equal "Not Found", get(URI("http://example.org/journey/faithfully-omg"))
   end
 
@@ -128,7 +128,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     end
 
     hash = ActiveSupport::JSON.decode get(URI("http://example.org/journey/omg-faithfully"))
-    assert_equal({ "artist"=>"journey", "song"=>"faithfully" }, hash)
+    assert_equal({ "artist" => "journey", "song" => "faithfully" }, hash)
   end
 
   def test_pre_dash_with_custom_regexp
@@ -140,7 +140,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     end
 
     hash = ActiveSupport::JSON.decode get(URI("http://example.org/journey/omg-123"))
-    assert_equal({ "artist"=>"journey", "song"=>"123" }, hash)
+    assert_equal({ "artist" => "journey", "song" => "123" }, hash)
     assert_equal "Not Found", get(URI("http://example.org/journey/omg-faithfully"))
   end
 
@@ -1931,7 +1931,7 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     get "clients" => "projects#index"
 
     get "ignorecase/geocode/:postalcode" => "geocode#show", :postalcode => /hx\d\d-\d[a-z]{2}/i
-    get "extended/geocode/:postalcode" => "geocode#show",:constraints => {
+    get "extended/geocode/:postalcode" => "geocode#show", :constraints => {
                   postalcode: /# Postcode format
                                   \d{5} #Prefix
                                   (-\d{4})? #Suffix
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 8dc565ac8d..a28283f4d6 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -180,7 +180,7 @@ class SendFileTest < ActionController::TestCase
       "file.zip" => "application/zip",
       "file.unk" => "application/octet-stream",
       "zip" => "application/octet-stream"
-    }.each do |filename,expected_type|
+    }.each do |filename, expected_type|
       get __method__, params: { filename: filename }
       assert_equal expected_type, response.content_type
     end
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 33f11e67ef..55ceced30c 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -231,7 +231,7 @@ XML
 
   def test_document_body_and_params_with_post
     post :test_params, params: { id: 1 }
-    assert_equal({ "id"=>"1", "controller"=>"test_case_test/test", "action"=>"test_params" }, ::JSON.parse(@response.body))
+    assert_equal({ "id" => "1", "controller" => "test_case_test/test", "action" => "test_params" }, ::JSON.parse(@response.body))
   end
 
   def test_document_body_with_post
@@ -651,7 +651,7 @@ XML
   def test_xhr_with_params
     get :test_params, params: { id: 1 }, xhr: true
 
-    assert_equal({ "id"=>"1", "controller"=>"test_case_test/test", "action"=>"test_params" }, ::JSON.parse(@response.body))
+    assert_equal({ "id" => "1", "controller" => "test_case_test/test", "action" => "test_params" }, ::JSON.parse(@response.body))
   end
 
   def test_xhr_with_session
@@ -753,10 +753,10 @@ XML
 
   def test_multiple_mixed_method_process_should_scrub_rack_input
     post :test_params, params: { id: 1, foo: "an foo" }
-    assert_equal({ "id"=>"1", "foo" => "an foo", "controller"=>"test_case_test/test", "action"=>"test_params" }, ::JSON.parse(@response.body))
+    assert_equal({ "id" => "1", "foo" => "an foo", "controller" => "test_case_test/test", "action" => "test_params" }, ::JSON.parse(@response.body))
 
     get :test_params, params: { bar: "an bar" }
-    assert_equal({ "bar"=>"an bar", "controller"=>"test_case_test/test", "action"=>"test_params" }, ::JSON.parse(@response.body))
+    assert_equal({ "bar" => "an bar", "controller" => "test_case_test/test", "action" => "test_params" }, ::JSON.parse(@response.body))
   end
 
   %w(controller response request).each do |variable|
diff --git a/actionpack/test/controller/url_for_integration_test.rb b/actionpack/test/controller/url_for_integration_test.rb
index c7ea6c5ef6..f640e77b99 100644
--- a/actionpack/test/controller/url_for_integration_test.rb
+++ b/actionpack/test/controller/url_for_integration_test.rb
@@ -43,7 +43,7 @@ module ActionPack
       get "clients" => "projects#index"
 
       get "ignorecase/geocode/:postalcode" => "geocode#show", :postalcode => /hx\d\d-\d[a-z]{2}/i
-      get "extended/geocode/:postalcode" => "geocode#show",:constraints => {
+      get "extended/geocode/:postalcode" => "geocode#show", :constraints => {
         postalcode: /# Postcode format
         \d{5} #Prefix
         (-\d{4})? #Suffix
@@ -73,99 +73,99 @@ module ActionPack
     end
 
     [
-      ["/admin/users",[ { use_route: "admin_users" }]],
-      ["/admin/users",[ { controller: "admin/users" }]],
-      ["/admin/users",[ { controller: "admin/users", action: "index" }]],
-      ["/admin/users",[ { action: "index" }, { controller: "admin/users", action: "index" }, "/admin/users"]],
-      ["/admin/users",[ { controller: "users", action: "index" }, { controller: "admin/accounts", action: "show", id: "1" }, "/admin/accounts/show/1"]],
-      ["/people",[      { controller: "/people", action: "index" }, { controller: "admin/accounts", action: "foo", id: "bar" }, "/admin/accounts/foo/bar"]],
-
-      ["/admin/posts",[     { controller: "admin/posts" }]],
-      ["/admin/posts/new",[ { controller: "admin/posts", action: "new" }]],
-
-      ["/blog/2009",[     { controller: "posts", action: "show_date", year: 2009 }]],
-      ["/blog/2009/1",[   { controller: "posts", action: "show_date", year: 2009, month: 1 }]],
-      ["/blog/2009/1/1",[ { controller: "posts", action: "show_date", year: 2009, month: 1, day: 1 }]],
-
-      ["/archive/2010",[ { controller: "archive", action: "index", year: "2010" }]],
-      ["/archive",[      { controller: "archive", action: "index" }]],
-      ["/archive?year=january",[ { controller: "archive", action: "index", year: "january" }]],
-
-      ["/people",[ { controller: "people", action: "index" }]],
-      ["/people",[ { action: "index" }, { controller: "people", action: "index" }, "/people"]],
-      ["/people",[ { action: "index" }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
-      ["/people",[ { controller: "people", action: "index" }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
-      ["/people",[ {}, { controller: "people", action: "index" }, "/people"]],
-      ["/people/1",[   { controller: "people", action: "show" }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
-      ["/people/new",[ { use_route: "new_person" }]],
-      ["/people/new",[ { controller: "people", action: "new" }]],
-      ["/people/1",[   { use_route: "person", id: "1" }]],
-      ["/people/1",[   { controller: "people", action: "show", id: "1" }]],
-      ["/people/1.xml",[ { controller: "people", action: "show", id: "1", format: "xml" }]],
-      ["/people/1",[ { controller: "people", action: "show", id: 1 }]],
-      ["/people/1",[ { controller: "people", action: "show", id: Model.new("1") }]],
-      ["/people/1",[ { action: "show", id: "1" }, { controller: "people", action: "index" }, "/people"]],
-      ["/people/1",[ { action: "show", id: 1 }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
-      ["/people",[   { controller: "people", action: "index" }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
-      ["/people/1",[ {}, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
-      ["/people/1",[ { controller: "people", action: "show" }, { controller: "people", action: "index", id: "1" }, "/people/index/1"]],
-      ["/people/1/edit",[     { controller: "people", action: "edit", id: "1" }]],
-      ["/people/1/edit.xml",[ { controller: "people", action: "edit", id: "1", format: "xml" }]],
-      ["/people/1/edit",[     { use_route: "edit_person", id: "1" }]],
-      ["/people/1?legacy=true",[ { controller: "people", action: "show", id: "1", legacy: "true" }]],
-      ["/people?legacy=true",[   { controller: "people", action: "index", legacy: "true" }]],
-
-      ["/id_default/2",[ { controller: "foo", action: "id_default", id: "2" }]],
-      ["/id_default",[   { controller: "foo", action: "id_default", id: "1" }]],
-      ["/id_default",[   { controller: "foo", action: "id_default", id: 1 }]],
-      ["/id_default",[   { controller: "foo", action: "id_default" }]],
-      ["/optional/bar",[ { controller: "posts", action: "index", optional: "bar" }]],
-      ["/posts",[ { controller: "posts", action: "index" }]],
-
-      ["/project",[    { controller: "project", action: "index" }]],
-      ["/projects/1",[ { controller: "project", action: "index", project_id: "1" }]],
-      ["/projects/1",[ { controller: "project", action: "index" }, { project_id: "1", controller: "project", action: "index" }, "/projects/1"]],
-      ["/projects/1",[ { use_route: "project", controller: "project", action: "index", project_id: "1" }]],
-      ["/projects/1",[ { use_route: "project", controller: "project", action: "index" }, { controller: "project", action: "index", project_id: "1" }, "/projects/1"]],
-
-      ["/clients",[ { controller: "projects", action: "index" }]],
-      ["/clients?project_id=1",[ { controller: "projects", action: "index", project_id: "1" }]],
-      ["/clients",[ { controller: "projects", action: "index" }, { project_id: "1", controller: "project", action: "index" }, "/projects/1"]],
-
-      ["/comment/20",[   { id: 20 }, { controller: "comments", action: "show" }, "/comments/show"]],
-      ["/comment/20",[   { controller: "comments", id: 20, action: "show" }]],
-      ["/comments/boo",[ { controller: "comments", action: "boo" }]],
-
-      ["/ws/posts/show/1",[ { controller: "posts", action: "show", id: "1", ws: true }]],
-      ["/ws/posts",[        { controller: "posts", action: "index", ws: true }]],
-
-      ["/account",[         { controller: "account", action: "subscription" }]],
-      ["/account/billing",[ { controller: "account", action: "billing" }]],
-
-      ["/pages/1/notes/show/1",[ { page_id: "1", controller: "notes", action: "show", id: "1" }]],
-      ["/pages/1/notes/list",[   { page_id: "1", controller: "notes", action: "list" }]],
-      ["/pages/1/notes",[ { page_id: "1", controller: "notes", action: "index" }]],
-      ["/pages/1/notes",[ { page_id: "1", controller: "notes" }]],
-      ["/notes",[         { page_id: nil, controller: "notes" }]],
-      ["/notes",[         { controller: "notes" }]],
-      ["/notes/print",[   { controller: "notes", action: "print" }]],
-      ["/notes/print",[   {}, { controller: "notes", action: "print" }, "/notes/print"]],
-
-      ["/notes/index/1",[ { controller: "notes" }, { controller: "notes", action: "index", id: "1" }, "/notes/index/1"]],
-      ["/notes/index/1",[ { controller: "notes" }, { controller: "notes", id: "1", action: "index" }, "/notes/index/1"]],
-      ["/notes/index/1",[ { action: "index" }, { controller: "notes", id: "1", action: "index" }, "/notes/index/1"]],
-      ["/notes/index/1",[ {}, { controller: "notes", id: "1", action: "index" }, "/notes/index/1"]],
-      ["/notes/show/1",[  {}, { controller: "notes", action: "show", id: "1" }, "/notes/show/1"]],
-      ["/posts",[      { controller: "posts" }, { controller: "notes", action: "show", id: "1" }, "/notes/show/1"]],
-      ["/notes/list",[ { action: "list" }, { controller: "notes", action: "show", id: "1" }, "/notes/show/1"]],
-
-      ["/posts/ping",[    { controller: "posts", action: "ping" }]],
-      ["/posts/show/1",[  { controller: "posts", action: "show", id: "1" }]],
-      ["/posts/show/1",[  { controller: "posts", action: "show", id: "1", format: "" }]],
-      ["/posts",[         { controller: "posts" }]],
-      ["/posts",[         { controller: "posts", action: "index" }]],
-      ["/posts/create",[  { action: "create" }, { day: nil, month: nil, controller: "posts", action: "show_date" }, "/blog"]],
-      ["/posts?foo=bar",[ { controller: "posts", foo: "bar" }]],
+      ["/admin/users", [ { use_route: "admin_users" }]],
+      ["/admin/users", [ { controller: "admin/users" }]],
+      ["/admin/users", [ { controller: "admin/users", action: "index" }]],
+      ["/admin/users", [ { action: "index" }, { controller: "admin/users", action: "index" }, "/admin/users"]],
+      ["/admin/users", [ { controller: "users", action: "index" }, { controller: "admin/accounts", action: "show", id: "1" }, "/admin/accounts/show/1"]],
+      ["/people", [      { controller: "/people", action: "index" }, { controller: "admin/accounts", action: "foo", id: "bar" }, "/admin/accounts/foo/bar"]],
+
+      ["/admin/posts", [     { controller: "admin/posts" }]],
+      ["/admin/posts/new", [ { controller: "admin/posts", action: "new" }]],
+
+      ["/blog/2009", [     { controller: "posts", action: "show_date", year: 2009 }]],
+      ["/blog/2009/1", [   { controller: "posts", action: "show_date", year: 2009, month: 1 }]],
+      ["/blog/2009/1/1", [ { controller: "posts", action: "show_date", year: 2009, month: 1, day: 1 }]],
+
+      ["/archive/2010", [ { controller: "archive", action: "index", year: "2010" }]],
+      ["/archive", [      { controller: "archive", action: "index" }]],
+      ["/archive?year=january", [ { controller: "archive", action: "index", year: "january" }]],
+
+      ["/people", [ { controller: "people", action: "index" }]],
+      ["/people", [ { action: "index" }, { controller: "people", action: "index" }, "/people"]],
+      ["/people", [ { action: "index" }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
+      ["/people", [ { controller: "people", action: "index" }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
+      ["/people", [ {}, { controller: "people", action: "index" }, "/people"]],
+      ["/people/1", [   { controller: "people", action: "show" }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
+      ["/people/new", [ { use_route: "new_person" }]],
+      ["/people/new", [ { controller: "people", action: "new" }]],
+      ["/people/1", [   { use_route: "person", id: "1" }]],
+      ["/people/1", [   { controller: "people", action: "show", id: "1" }]],
+      ["/people/1.xml", [ { controller: "people", action: "show", id: "1", format: "xml" }]],
+      ["/people/1", [ { controller: "people", action: "show", id: 1 }]],
+      ["/people/1", [ { controller: "people", action: "show", id: Model.new("1") }]],
+      ["/people/1", [ { action: "show", id: "1" }, { controller: "people", action: "index" }, "/people"]],
+      ["/people/1", [ { action: "show", id: 1 }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
+      ["/people", [   { controller: "people", action: "index" }, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
+      ["/people/1", [ {}, { controller: "people", action: "show", id: "1" }, "/people/show/1"]],
+      ["/people/1", [ { controller: "people", action: "show" }, { controller: "people", action: "index", id: "1" }, "/people/index/1"]],
+      ["/people/1/edit", [     { controller: "people", action: "edit", id: "1" }]],
+      ["/people/1/edit.xml", [ { controller: "people", action: "edit", id: "1", format: "xml" }]],
+      ["/people/1/edit", [     { use_route: "edit_person", id: "1" }]],
+      ["/people/1?legacy=true", [ { controller: "people", action: "show", id: "1", legacy: "true" }]],
+      ["/people?legacy=true", [   { controller: "people", action: "index", legacy: "true" }]],
+
+      ["/id_default/2", [ { controller: "foo", action: "id_default", id: "2" }]],
+      ["/id_default", [   { controller: "foo", action: "id_default", id: "1" }]],
+      ["/id_default", [   { controller: "foo", action: "id_default", id: 1 }]],
+      ["/id_default", [   { controller: "foo", action: "id_default" }]],
+      ["/optional/bar", [ { controller: "posts", action: "index", optional: "bar" }]],
+      ["/posts", [ { controller: "posts", action: "index" }]],
+
+      ["/project", [    { controller: "project", action: "index" }]],
+      ["/projects/1", [ { controller: "project", action: "index", project_id: "1" }]],
+      ["/projects/1", [ { controller: "project", action: "index" }, { project_id: "1", controller: "project", action: "index" }, "/projects/1"]],
+      ["/projects/1", [ { use_route: "project", controller: "project", action: "index", project_id: "1" }]],
+      ["/projects/1", [ { use_route: "project", controller: "project", action: "index" }, { controller: "project", action: "index", project_id: "1" }, "/projects/1"]],
+
+      ["/clients", [ { controller: "projects", action: "index" }]],
+      ["/clients?project_id=1", [ { controller: "projects", action: "index", project_id: "1" }]],
+      ["/clients", [ { controller: "projects", action: "index" }, { project_id: "1", controller: "project", action: "index" }, "/projects/1"]],
+
+      ["/comment/20", [   { id: 20 }, { controller: "comments", action: "show" }, "/comments/show"]],
+      ["/comment/20", [   { controller: "comments", id: 20, action: "show" }]],
+      ["/comments/boo", [ { controller: "comments", action: "boo" }]],
+
+      ["/ws/posts/show/1", [ { controller: "posts", action: "show", id: "1", ws: true }]],
+      ["/ws/posts", [        { controller: "posts", action: "index", ws: true }]],
+
+      ["/account", [         { controller: "account", action: "subscription" }]],
+      ["/account/billing", [ { controller: "account", action: "billing" }]],
+
+      ["/pages/1/notes/show/1", [ { page_id: "1", controller: "notes", action: "show", id: "1" }]],
+      ["/pages/1/notes/list", [   { page_id: "1", controller: "notes", action: "list" }]],
+      ["/pages/1/notes", [ { page_id: "1", controller: "notes", action: "index" }]],
+      ["/pages/1/notes", [ { page_id: "1", controller: "notes" }]],
+      ["/notes", [         { page_id: nil, controller: "notes" }]],
+      ["/notes", [         { controller: "notes" }]],
+      ["/notes/print", [   { controller: "notes", action: "print" }]],
+      ["/notes/print", [   {}, { controller: "notes", action: "print" }, "/notes/print"]],
+
+      ["/notes/index/1", [ { controller: "notes" }, { controller: "notes", action: "index", id: "1" }, "/notes/index/1"]],
+      ["/notes/index/1", [ { controller: "notes" }, { controller: "notes", id: "1", action: "index" }, "/notes/index/1"]],
+      ["/notes/index/1", [ { action: "index" }, { controller: "notes", id: "1", action: "index" }, "/notes/index/1"]],
+      ["/notes/index/1", [ {}, { controller: "notes", id: "1", action: "index" }, "/notes/index/1"]],
+      ["/notes/show/1", [  {}, { controller: "notes", action: "show", id: "1" }, "/notes/show/1"]],
+      ["/posts", [      { controller: "posts" }, { controller: "notes", action: "show", id: "1" }, "/notes/show/1"]],
+      ["/notes/list", [ { action: "list" }, { controller: "notes", action: "show", id: "1" }, "/notes/show/1"]],
+
+      ["/posts/ping", [    { controller: "posts", action: "ping" }]],
+      ["/posts/show/1", [  { controller: "posts", action: "show", id: "1" }]],
+      ["/posts/show/1", [  { controller: "posts", action: "show", id: "1", format: "" }]],
+      ["/posts", [         { controller: "posts" }]],
+      ["/posts", [         { controller: "posts", action: "index" }]],
+      ["/posts/create", [  { action: "create" }, { day: nil, month: nil, controller: "posts", action: "show_date" }, "/blog"]],
+      ["/posts?foo=bar", [ { controller: "posts", foo: "bar" }]],
       ["/posts?foo%5B%5D=bar&foo%5B%5D=baz", [{ controller: "posts", foo: ["bar", "baz"] }]],
       ["/posts?page=2",  [{ controller: "posts", page: 2 }]],
       ["/posts?q%5Bfoo%5D%5Ba%5D=b", [{ controller: "posts", q: { foo: { a: "b" } } }]],
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 8d7190365d..4b6f33c545 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -223,13 +223,13 @@ module AbstractController
       def test_trailing_slash
         add_host!
         options = { controller: "foo", trailing_slash: true, action: "bar", id: "33" }
-        assert_equal("http://www.basecamphq.com/foo/bar/33/", W.new.url_for(options) )
+        assert_equal("http://www.basecamphq.com/foo/bar/33/", W.new.url_for(options))
       end
 
       def test_trailing_slash_with_protocol
         add_host!
-        options = { trailing_slash: true,protocol: "https", controller: "foo", action: "bar", id: "33" }
-        assert_equal("https://www.basecamphq.com/foo/bar/33/", W.new.url_for(options) )
+        options = { trailing_slash: true, protocol: "https", controller: "foo", action: "bar", id: "33" }
+        assert_equal("https://www.basecamphq.com/foo/bar/33/", W.new.url_for(options))
         assert_equal "https://www.basecamphq.com/foo/bar/33/?query=string", W.new.url_for(options.merge(query: "string"))
       end
 
@@ -238,7 +238,7 @@ module AbstractController
         assert_equal "/foo/", W.new.url_for(options.merge(only_path: true))
         options.update(action: "bar", id: "33")
         assert_equal "/foo/bar/33/", W.new.url_for(options.merge(only_path: true))
-        assert_equal "/foo/bar/33/?query=string", W.new.url_for(options.merge(query: "string",only_path: true))
+        assert_equal "/foo/bar/33/?query=string", W.new.url_for(options.merge(query: "string", only_path: true))
       end
 
       def test_trailing_slash_with_anchor
@@ -423,7 +423,7 @@ module AbstractController
         first_class.default_url_options[:host] = first_host
         second_class.default_url_options[:host] = second_host
 
-        assert_equal  first_host, first_class.default_url_options[:host]
+        assert_equal first_host, first_class.default_url_options[:host]
         assert_equal second_host, second_class.default_url_options[:host]
       end
 
-- 
cgit v1.2.3