1 files changed, 19 insertions, 16 deletions
diff --git a/actionpack/test/journey/route_test.rb b/actionpack/test/journey/route_test.rb
index 78608a5c6b..21d867aca0 100644
--- a/actionpack/test/journey/route_test.rb
+++ b/actionpack/test/journey/route_test.rb
@@ -5,19 +5,19 @@ module ActionDispatch
     class TestRoute < ActiveSupport::TestCase
       def test_initialize
         app      = Object.new
-        path     = Path::Pattern.new '/:controller(/:action(/:id(.:format)))'
-        defaults = Object.new
+        path     = Path::Pattern.from_string '/:controller(/:action(/:id(.:format)))'
+        defaults = {}
         route    = Route.new("name", app, path, {}, defaults)
 
         assert_equal app, route.app
         assert_equal path, route.path
-        assert_equal defaults, route.defaults
+        assert_same  defaults, route.defaults
       end
 
       def test_route_adds_itself_as_memo
         app      = Object.new
-        path     = Path::Pattern.new '/:controller(/:action(/:id(.:format)))'
-        defaults = Object.new
+        path     = Path::Pattern.from_string '/:controller(/:action(/:id(.:format)))'
+        defaults = {}
         route    = Route.new("name", app, path, {}, defaults)
 
         route.ast.grep(Nodes::Terminal).each do |node|
@@ -26,21 +26,21 @@ module ActionDispatch
       end
 
       def test_ip_address
-        path  = Path::Pattern.new '/messages/:id(.:format)'
+        path  = Path::Pattern.from_string '/messages/:id(.:format)'
         route = Route.new("name", nil, path, {:ip => '192.168.1.1'},
                           { :controller => 'foo', :action => 'bar' })
         assert_equal '192.168.1.1', route.ip
       end
 
       def test_default_ip
-        path  = Path::Pattern.new '/messages/:id(.:format)'
+        path  = Path::Pattern.from_string '/messages/:id(.:format)'
         route = Route.new("name", nil, path, {},
                           { :controller => 'foo', :action => 'bar' })
         assert_equal(//, route.ip)
       end
 
       def test_format_with_star
-        path  = Path::Pattern.new '/:controller/*extra'
+        path  = Path::Pattern.from_string '/:controller/*extra'
         route = Route.new("name", nil, path, {},
                           { :controller => 'foo', :action => 'bar' })
         assert_equal '/foo/himom', route.format({
@@ -50,7 +50,7 @@ module ActionDispatch
       end
 
       def test_connects_all_match
-        path  = Path::Pattern.new '/:controller(/:action(/:id(.:format)))'
+        path  = Path::Pattern.from_string '/:controller(/:action(/:id(.:format)))'
         route = Route.new("name", nil, path, {:action => 'bar'}, { :controller => 'foo' })
 
         assert_equal '/foo/bar/10', route.format({
@@ -61,32 +61,35 @@ module ActionDispatch
       end
 
       def test_extras_are_not_included_if_optional
-        path  = Path::Pattern.new '/page/:id(/:action)'
+        path  = Path::Pattern.from_string '/page/:id(/:action)'
         route = Route.new("name", nil, path, { }, { :action => 'show' })
 
         assert_equal '/page/10', route.format({ :id => 10 })
       end
 
       def test_extras_are_not_included_if_optional_with_parameter
-        path  = Path::Pattern.new '(/sections/:section)/pages/:id'
+        path  = Path::Pattern.from_string '(/sections/:section)/pages/:id'
         route = Route.new("name", nil, path, { }, { :action => 'show' })
 
         assert_equal '/pages/10', route.format({:id => 10})
       end
 
       def test_extras_are_not_included_if_optional_parameter_is_nil
-        path  = Path::Pattern.new '(/sections/:section)/pages/:id'
+        path  = Path::Pattern.from_string '(/sections/:section)/pages/:id'
         route = Route.new("name", nil, path, { }, { :action => 'show' })
 
         assert_equal '/pages/10', route.format({:id => 10, :section => nil})
       end
 
       def test_score
-        path = Path::Pattern.new "/page/:id(/:action)(.:format)"
-        specific = Route.new "name", nil, path, {}, {:controller=>"pages", :action=>"show"}
+        constraints = {:required_defaults => [:controller, :action]}
+        defaults = {:controller=>"pages", :action=>"show"}
 
-        path = Path::Pattern.new "/:controller(/:action(/:id))(.:format)"
-        generic = Route.new "name", nil, path, {}
+        path = Path::Pattern.from_string "/page/:id(/:action)(.:format)"
+        specific = Route.new "name", nil, path, constraints, defaults
+
+        path = Path::Pattern.from_string "/:controller(/:action(/:id))(.:format)"
+        generic = Route.new "name", nil, path, constraints
 
         knowledge = {:id=>20, :controller=>"pages", :action=>"show"}