remove redundant curlies from hash arguments

2 files changed, 21 insertions, 25 deletions

diff --git a/actionpack/test/journey/route_test.rb b/actionpack/test/journey/route_test.rb
index 5364f9de81..cce5c2ae37 100644
--- a/actionpack/test/journey/route_test.rb
+++ b/actionpack/test/journey/route_test.rb
@@ -35,57 +35,53 @@ module ActionDispatch
       def test_ip_address
         path  = Path::Pattern.from_string "/messages/:id(.:format)"
         route = Route.build("name", nil, path, {ip: "192.168.1.1"}, [],
-                          { controller: "foo", action: "bar" })
+                          controller: "foo", action: "bar")
         assert_equal "192.168.1.1", route.ip
       end
 
       def test_default_ip
         path  = Path::Pattern.from_string "/messages/:id(.:format)"
         route = Route.build("name", nil, path, {}, [],
-                          { controller: "foo", action: "bar" })
+                          controller: "foo", action: "bar")
         assert_equal(//, route.ip)
       end
 
       def test_format_with_star
         path  = Path::Pattern.from_string "/:controller/*extra"
         route = Route.build("name", nil, path, {}, [],
-                          { controller: "foo", action: "bar" })
-        assert_equal "/foo/himom", route.format({
-          controller: "foo",
-          extra: "himom",
-        })
+                          controller: "foo", action: "bar")
+        assert_equal "/foo/himom", route.format(          controller: "foo",
+          extra: "himom")
       end
 
       def test_connects_all_match
         path  = Path::Pattern.from_string "/:controller(/:action(/:id(.:format)))"
-        route = Route.build("name", nil, path, {action: "bar"}, [], { controller: "foo" })
+        route = Route.build("name", nil, path, {action: "bar"}, [], controller: "foo")
 
-        assert_equal "/foo/bar/10", route.format({
-          controller: "foo",
+        assert_equal "/foo/bar/10", route.format(          controller: "foo",
           action: "bar",
-          id: 10
-        })
+          id: 10)
       end
 
       def test_extras_are_not_included_if_optional
         path  = Path::Pattern.from_string "/page/:id(/:action)"
-        route = Route.build("name", nil, path, { }, [], { action: "show" })
+        route = Route.build("name", nil, path, { }, [], action: "show")
 
-        assert_equal "/page/10", route.format({ id: 10 })
+        assert_equal "/page/10", route.format(id: 10)
       end
 
       def test_extras_are_not_included_if_optional_with_parameter
         path  = Path::Pattern.from_string "(/sections/:section)/pages/:id"
-        route = Route.build("name", nil, path, { }, [], { action: "show" })
+        route = Route.build("name", nil, path, { }, [], action: "show")
 
-        assert_equal "/pages/10", route.format({id: 10})
+        assert_equal "/pages/10", route.format(id: 10)
       end
 
       def test_extras_are_not_included_if_optional_parameter_is_nil
         path  = Path::Pattern.from_string "(/sections/:section)/pages/:id"
-        route = Route.build("name", nil, path, { }, [], { action: "show" })
+        route = Route.build("name", nil, path, { }, [], action: "show")
 
-        assert_equal "/pages/10", route.format({id: 10, section: nil})
+        assert_equal "/pages/10", route.format(id: 10, section: nil)
       end
 
       def test_score
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 97d3bc9845..83cd999352 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -109,7 +109,7 @@ module ActionDispatch
 
       def test_X_Cascade
         get "/messages(.:format)", to: "foo#bar"
-        resp = router.serve(rails_env({ "REQUEST_METHOD" => "GET", "PATH_INFO" => "/lol" }))
+        resp = router.serve(rails_env("REQUEST_METHOD" => "GET", "PATH_INFO" => "/lol"))
         assert_equal ["Not Found"], resp.last
         assert_equal "pass", resp[1]["X-Cascade"]
         assert_equal 404, resp.first
@@ -184,14 +184,14 @@ module ActionDispatch
       def test_required_part_in_recall
         get "/messages/:a/:b", to: "foo#bar"
 
-        path, _ = @formatter.generate(nil, { controller: "foo", action: "bar", a: "a" }, { b: "b" })
+        path, _ = @formatter.generate(nil, { controller: "foo", action: "bar", a: "a" }, b: "b")
         assert_equal "/messages/a/b", path
       end
 
       def test_splat_in_recall
         get "/*path", to: "foo#bar"
 
-        path, _ = @formatter.generate(nil, { controller: "foo", action: "bar" }, { path: "b" })
+        path, _ = @formatter.generate(nil, { controller: "foo", action: "bar" }, path: "b")
         assert_equal "/b", path
       end
 
@@ -199,7 +199,7 @@ module ActionDispatch
         get "/messages/:action(/:id(.:format))", to: "foo#bar"
         get "/messages/:id(.:format)", to: "bar#baz"
 
-        path, _ = @formatter.generate(nil, { controller: "foo", id: 10 }, { action: "index" })
+        path, _ = @formatter.generate(nil, { controller: "foo", id: 10 }, action: "index")
         assert_equal "/messages/index/10", path
       end
 
@@ -312,7 +312,7 @@ module ActionDispatch
         path, params = @formatter.generate(
           nil,
           {controller: "tasks", id: 10},
-          {action: "index"})
+          action: "index")
         assert_equal "/tasks/index/10", path
         assert_equal({}, params)
       end
@@ -323,7 +323,7 @@ module ActionDispatch
         path, params = @formatter.generate(
           "tasks",
           {controller: "tasks"},
-          {controller: "tasks", action: "index"})
+          controller: "tasks", action: "index")
         assert_equal "/tasks", path
         assert_equal({}, params)
       end
@@ -372,7 +372,7 @@ module ActionDispatch
       end
 
       def test_namespaced_controller
-        get "/:controller(/:action(/:id))", { controller: /.+?/ }
+        get "/:controller(/:action(/:id))", controller: /.+?/
         route = @routes.first
 
         env = rails_env "PATH_INFO" => "/admin/users/show/10"