0
@@ -60,12 +60,10 @@ module ActionController
0
       # segments are passed alongside in order to distinguish between default values
0
       # and requirements.
0
       def divide_route_options(segments, options)
0
-        options = options.dup
0
+        options = options.except(:path_prefix, :name_prefix)
0
 
0
         if options[:namespace]
0
           options[:controller] = "#{options.delete(:namespace).sub(/\/$/, '')}/#{options[:controller]}"
0
-          options.delete(:path_prefix)
0
-          options.delete(:name_prefix)
0
         end
0
 
0
         requirements = (options.delete(:requirements) || {}).dup

0
@@ -924,6 +924,20 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
0
 
0
     end
0
 
0
+    def test_named_route_with_name_prefix
0
+      rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :name_prefix => 'my_'
0
+      x = setup_for_named_route
0
+      assert_equal("http://named.route.test/page",
0
+                   x.send(:my_page_url))
0
+    end
0
+
0
+    def test_named_route_with_path_prefix
0
+      rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :path_prefix => 'my'
0
+      x = setup_for_named_route
0
+      assert_equal("http://named.route.test/my/page",
0
+                   x.send(:page_url))
0
+    end
0
+
0
     def test_named_route_with_nested_controller
0
       rs.add_named_route :users, 'admin/user', :controller => 'admin/user', :action => 'index'
0
       x = setup_for_named_route
0
@@ -2147,6 +2161,13 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
0
       assert_equal [:x], set.extra_keys(args)
0
     end
0
 
0
+    def test_generate_with_path_prefix
0
+      set.draw { |map| map.connect ':controller/:action/:id', :path_prefix => 'my' }
0
+
0
+      args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
0
+      assert_equal "/my/foo/bar/7?x=y", set.generate(args)
0
+    end
0
+
0
     def test_named_routes_are_never_relative_to_modules
0
       set.draw do |map|
0
         map.connect "/connection/manage/:action", :controller => 'connection/manage'