1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
index e81ebfb893..443449345b 100644
--- a/actionpack/lib/action_controller/assertions.rb
+++ b/actionpack/lib/action_controller/assertions.rb
@@ -108,13 +108,14 @@ module Test #:nodoc:
               end
 
               if value.respond_to?(:[]) && value['controller']
-                if key == :actual && value['controller'].first != '/'
+                if key == :actual && value['controller'].first != '/' && !value['controller'].include?('/')
                   value['controller'] = ActionController::Routing.controller_relative_to(value['controller'], @controller.class.controller_path) 
                 end
                 value['controller'] = value['controller'][1..-1] if value['controller'].first == '/' # strip leading hash
               end
               url[key] = value
             end
+            
 
             @response_diff = url[:expected].diff(url[:actual]) if url[:actual]
             msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>), difference: <?>",