2 files changed, 12 insertions, 9 deletions
diff --git a/actionpack/test/journey/route_test.rb b/actionpack/test/journey/route_test.rb
index 78608a5c6b..cbe6284714 100644
--- a/actionpack/test/journey/route_test.rb
+++ b/actionpack/test/journey/route_test.rb
@@ -6,18 +6,18 @@ module ActionDispatch
       def test_initialize
         app      = Object.new
         path     = Path::Pattern.new '/:controller(/:action(/:id(.:format)))'
-        defaults = Object.new
+        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
+        defaults = {}
         route    = Route.new("name", app, path, {}, defaults)
 
         route.ast.grep(Nodes::Terminal).each do |node|
@@ -82,11 +82,14 @@ module ActionDispatch
       end
 
       def test_score
+        constraints = {:required_defaults => [:controller, :action]}
+        defaults = {:controller=>"pages", :action=>"show"}
+
         path = Path::Pattern.new "/page/:id(/:action)(.:format)"
-        specific = Route.new "name", nil, path, {}, {:controller=>"pages", :action=>"show"}
+        specific = Route.new "name", nil, path, constraints, defaults
 
         path = Path::Pattern.new "/:controller(/:action(/:id))(.:format)"
-        generic = Route.new "name", nil, path, {}
+        generic = Route.new "name", nil, path, constraints
 
         knowledge = {:id=>20, :controller=>"pages", :action=>"show"}
 
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 27bdb0108a..3d52b2e9ee 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -155,7 +155,7 @@ module ActionDispatch
           Router::Strexp.new("/foo/:id", { :id => /\d/ }, ['/', '.', '?'], false)
         ]
 
-        assert_raises(Router::RoutingError) do
+        assert_raises(ActionController::UrlGenerationError) do
           @formatter.generate(:path_info, nil, { :id => '10' }, { })
         end
       end
@@ -168,7 +168,7 @@ module ActionDispatch
         path, _ = @formatter.generate(:path_info, nil, { :id => '10' }, { })
         assert_equal '/foo/10', path
 
-        assert_raises(Router::RoutingError) do
+        assert_raises(ActionController::UrlGenerationError) do
           @formatter.generate(:path_info, nil, { :id => 'aa' }, { })
         end
       end
@@ -194,11 +194,11 @@ module ActionDispatch
         path = Path::Pattern.new pattern
         @router.routes.add_route nil, path, {}, {}, route_name
 
-        error = assert_raises(Router::RoutingError) do
+        error = assert_raises(ActionController::UrlGenerationError) do
           @formatter.generate(:path_info, route_name, { }, { })
         end
 
-        assert_match(/required keys: \[:id\]/, error.message)
+        assert_match(/missing required keys: \[:id\]/, error.message)
       end
 
       def test_X_Cascade