extract required_defaults from the conditions hash before constructing the route

this way we can remove the strange "respond_to?" conditional in the
`matches?` loop

1 files changed, 9 insertions, 9 deletions

diff --git a/actionpack/test/journey/routes_test.rb b/actionpack/test/journey/routes_test.rb
index 2a1c1c337e..b9dac8751c 100644
--- a/actionpack/test/journey/routes_test.rb
+++ b/actionpack/test/journey/routes_test.rb
@@ -13,7 +13,7 @@ module ActionDispatch
         path   = Path::Pattern.new exp
         requirements = { :hello => /world/ }
 
-        routes.add_route nil, path, requirements, {:id => nil}, {}
+        routes.add_route nil, path, requirements, [], {:id => nil}, {}
         assert_not routes.empty?
         assert_equal 1, routes.length
 
@@ -26,9 +26,9 @@ module ActionDispatch
         routes = Routes.new
         path   = Path::Pattern.from_string '/hello'
 
-        routes.add_route nil, path, {}, {}, {}
+        routes.add_route nil, path, {}, [], {}, {}
         ast = routes.ast
-        routes.add_route nil, path, {}, {}, {}
+        routes.add_route nil, path, {}, [], {}, {}
         assert_not_equal ast, routes.ast
       end
 
@@ -36,16 +36,16 @@ module ActionDispatch
         routes = Routes.new
         path   = Path::Pattern.from_string '/hello'
 
-        routes.add_route nil, path, {}, {}, {}
+        routes.add_route nil, path, {}, [], {}, {}
         sim = routes.simulator
-        routes.add_route nil, path, {}, {}, {}
+        routes.add_route nil, path, {}, [], {}, {}
         assert_not_equal sim, routes.simulator
       end
 
       def test_partition_route
         path   = Path::Pattern.from_string '/hello'
 
-        anchored_route = @routes.add_route nil, path, {}, {}, {}
+        anchored_route = @routes.add_route nil, path, {}, [], {}, {}
         assert_equal [anchored_route], @routes.anchored_routes
         assert_equal [], @routes.custom_routes
 
@@ -54,7 +54,7 @@ module ActionDispatch
         )
         path  = Path::Pattern.new strexp
 
-        custom_route = @routes.add_route nil, path, {}, {}, {}
+        custom_route = @routes.add_route nil, path, {}, [], {}, {}
         assert_equal [custom_route], @routes.custom_routes
         assert_equal [anchored_route], @routes.anchored_routes
       end
@@ -65,8 +65,8 @@ module ActionDispatch
         one   = Path::Pattern.from_string '/hello'
         two   = Path::Pattern.from_string '/aaron'
 
-        routes.add_route nil, one, {}, {}, 'aaron'
-        routes.add_route nil, two, {}, {}, 'aaron'
+        routes.add_route nil, one, {}, [], {}, 'aaron'
+        routes.add_route nil, two, {}, [], {}, 'aaron'
 
         assert_equal '/hello', routes.named_routes['aaron'].path.spec.to_s
       end