Tweaks to integration tests and url rewriter for further compatibility with new routes

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4397 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index afceffce89..1a0fa8b7b6 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -73,11 +73,11 @@ module ActionController
         unless @named_routes_configured
           # install the named routes in this session instance.
           klass = class<<self; self; end
-          Routing::NamedRoutes.install(klass)
+          Routing::Routes.named_routes.install(klass)
 
           # the helpers are made protected by default--we make them public for
           # easier access during testing and troubleshooting.
-          klass.send(:public, *Routing::NamedRoutes::Helpers)
+          klass.send(:public, *Routing::Routes.named_routes.helpers)
           @named_routes_configured = true
         end
       end
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb
index 872bfcc122..4aa0576976 100644
--- a/actionpack/lib/action_controller/url_rewriter.rb
+++ b/actionpack/lib/action_controller/url_rewriter.rb
@@ -43,7 +43,7 @@ module ActionController
         RESERVED_OPTIONS.each {|k| options.delete k}
 
         # Generates the query string, too
-        Routing::Routes.generate(options, @request.parameters)
+        Routing::Routes.generate(options, @request.symbolized_path_parameters)
       end
   end
 end