Changeset 8801

Timestamp:

02/04/08 23:26:25 (5 months ago)

Author:

nzkoz

Message:

Ensure that assert_redirected_to to top-level named route from namespaced controller work. Closes #10812 [dasil003]

Files:

• branches/2-0-stable/actionpack/lib/action_controller/assertions/response_assertions.rb (modified) (1 diff)
• branches/2-0-stable/actionpack/test/controller/action_pack_assertions_test.rb (modified) (4 diffs)

branches/2-0-stable/actionpack/lib/action_controller/assertions/response_assertions.rb

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

branches/2-0-stable/actionpack/test/controller/action_pack_assertions_test.rb

@@ -134 +134 @@
-end
-
+class UserController < ActionController::Base
+end
+
-module Admin
-  class InnerModuleController < ActionController::Base
@@ -171 +174 @@
-  def setup
-    ActionController::Routing::Routes.reload
-
+user 
-    @controller = ActionPackAssertionsController.new
-    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
@@ -265 +268 @@
-    end
-  end
-
+
-  def test_assert_redirected_to_top_level_named_route_from_nested_controller
-    with_routing do |set|
@@ -276 +279 @@
-      # passes -> assert_redirected_to "http://test.host/action_pack_assertions/foo"
-      assert_redirected_to "/action_pack_assertions/foo"
+    end
+  end
+
+
+  def test_assert_redirected_to_top_level_named_route_with_same_controller_name_in_both_namespaces
+    with_routing do |set|
+      set.draw do |map|
+        # this controller exists in the admin namespace as well which is the only difference from previous test
+        map.top_level '/user/:id', :controller => 'user', :action => 'index'
+        map.connect   ':controller/:action/:id'
+      end
+      @controller = Admin::InnerModuleController.new
+      process :redirect_to_top_level_named_route
+      assert_redirected_to "/user/foo"
-    end
-  end