0
@@ -97,7 +97,7 @@ module ActionController
0
                 value['controller'] = value['controller'].to_s
0
                 if key == :actual && value['controller'].first != '/' && !value['controller'].include?('/')
0
                   new_controller_path = ActionController::Routing.controller_relative_to(value['controller'], @controller.class.controller_path)
0
-                  value['controller'] = new_controller_path if value['controller'] != new_controller_path && ActionController::Routing.possible_controllers.include?(new_controller_path)
0
+                  value['controller'] = new_controller_path if value['controller'] != new_controller_path && ActionController::Routing.possible_controllers.include?(new_controller_path) && @response.redirected_to.is_a?(Hash)
0
                 end
0
                 value['controller'] = value['controller'][1..-1] if value['controller'].first == '/' # strip leading hash
0
               end

0
@@ -137,6 +137,9 @@ class AssertResponseWithUnexpectedErrorController < ActionController::Base
0
   end
0
 end
0
 
0
+class UserController < ActionController::Base
0
+end
0
+
0
 module Admin
0
   class InnerModuleController < ActionController::Base
0
     def index
0
@@ -174,7 +177,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
0
   # let's get this party started
0
   def setup
0
     ActionController::Routing::Routes.reload
0
-    ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module content admin/user))
0
+    ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module user content admin/user))
0
     @controller = ActionPackAssertionsController.new
0
     @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
0
   end
0
@@ -268,7 +271,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
0
       assert_redirected_to admin_inner_module_path
0
     end
0
   end
0
-  
0
+
0
   def test_assert_redirected_to_top_level_named_route_from_nested_controller
0
     with_routing do |set|
0
       set.draw do |map|
0
@@ -277,11 +280,25 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
0
       end
0
       @controller = Admin::InnerModuleController.new
0
       process :redirect_to_top_level_named_route
0
-      # passes -> assert_redirected_to "http://test.host/action_pack_assertions/foo"
0
+      # assert_redirected_to "http://test.host/action_pack_assertions/foo" would pass because of exact match early return
0
       assert_redirected_to "/action_pack_assertions/foo"
0
     end
0
   end
0
 
0
+  def test_assert_redirected_to_top_level_named_route_with_same_controller_name_in_both_namespaces
0
+    with_routing do |set|
0
+      set.draw do |map|
0
+        # this controller exists in the admin namespace as well which is the only difference from previous test
0
+        map.top_level '/user/:id', :controller => 'user', :action => 'index'
0
+        map.connect   ':controller/:action/:id'
0
+      end
0
+      @controller = Admin::InnerModuleController.new
0
+      process :redirect_to_top_level_named_route
0
+      # assert_redirected_to top_level_url('foo') would pass because of exact match early return
0
+      assert_redirected_to top_level_path('foo')
0
+    end
0
+  end
0
+
0
   # -- standard request/response object testing --------------------------------
0
 
0
   # make sure that the template objects exist