Changeset 5785

Timestamp:

12/25/06 09:34:01 (2 years ago)

Author:

rick

Message:

Fix assert_redirected_to bug where redirecting from a nested to to a top-level controller incorrectly added the current controller's nesting. Closes #6128. [Rick Olson]

Files:

• trunk/actionpack/lib/action_controller/assertions/response_assertions.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/action_pack_assertions_test.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/test_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/assertions/response_assertions.rb

@@ -71 +71 @@
-              if value.respond_to?(:[]) && value['controller']
-                if key == :actual && value['controller'].first != '/' && !value['controller'].include?('/')
-
+
+
-                end
-                value['controller'] = value['controller'][1..-1] if value['controller'].first == '/' # strip leading hash
@@ -77 +78 @@
-              url[key] = value
-            end
-
-
-            @response_diff = url[:expected].diff(url[:actual]) if url[:actual]

trunk/actionpack/test/controller/action_pack_assertions_test.rb

@@ -140 +140 @@
-      redirect_to :controller => 'user'
-    end
+    
+    def redirect_to_top_level_named_route
+      redirect_to top_level_url(:id => "foo")
+    end
-  end
-end
@@ -151 +155 @@
-ActionPackAssertionsController.template_root = File.dirname(__FILE__) + "/../fixtures/"
-
-
-# a test case to exercise the new capabilities TestRequest & TestResponse
-class ActionPackAssertionsControllerTest < Test::Unit::TestCase
-  # let's get this party started
-  def setup
+    ActionController::Routing::Routes.reload
+    ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module content admin/user))
-    @controller = ActionPackAssertionsController.new
-    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
+  end
+
+  def teardown
+    ActionController::Routing::Routes.reload
-  end
-
@@ -295 +304 @@
-    end
-  end
+  
+  def test_assert_redirected_to_top_level_named_route_from_nested_controller
+    with_routing do |set|
+      set.draw do |map|
+        map.top_level '/action_pack_assertions/:id', :controller => 'action_pack_assertions', :action => 'index'
+        map.connect   ':controller/:action/:id'
+      end
+      @controller = Admin::InnerModuleController.new
+      process :redirect_to_top_level_named_route
+      # passes -> assert_redirected_to "http://test.host/action_pack_assertions/foo"
+      assert_redirected_to "/action_pack_assertions/foo"
+    end
+  end
-
-  # test the flash-based assertions with something is in the flash

trunk/actionpack/test/controller/test_test.rb

@@ -87 +87 @@
-    @response   = ActionController::TestResponse.new
-    ActionController::Routing::Routes.reload
-
+ test_test/test
-  end
-