Changeset 4757

Timestamp:

08/13/06 18:31:58 (2 years ago)

Author:

rick

Message:

Fix assert_redirected_to issue with named routes for module controllers. [Rick Olson]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix assert_redirected_to issue with named routes for module controllers.  [Rick Olson]
-
-* Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson]

trunk/actionpack/lib/action_controller/assertions.rb

@@ -109 +109 @@
-
-              if value.respond_to?(:[]) && value['controller']
-
+ && !value['controller'].include?('/')
-                  value['controller'] = ActionController::Routing.controller_relative_to(value['controller'], @controller.class.controller_path) 
-                end
@@ -116 +116 @@
-              url[key] = value
-            end
+            
-
-            @response_diff = url[:expected].diff(url[:actual]) if url[:actual]

trunk/actionpack/test/controller/action_pack_assertions_test.rb

@@ -125 +125 @@
-module Admin
-  class InnerModuleController < ActionController::Base
+    def index
+      render :nothing => true
+    end
+
+    def redirect_to_index
+      redirect_to admin_inner_module_path
+    end
+
-    def redirect_to_absolute_controller
-      redirect_to :controller => '/content'
-    end
+
-    def redirect_to_fellow_controller
-      redirect_to :controller => 'user'
@@ -268 +277 @@
-  end
-
+  def test_assert_redirect_to_nested_named_route
+    with_routing do |set|
+      set.draw do |map|
+        map.admin_inner_module 'admin/inner_module', :controller => 'admin/inner_module', :action => 'index'
+        map.connect            ':controller/:action/:id'
+      end
+      @controller = Admin::InnerModuleController.new
+      process :redirect_to_index
+      # redirection is <{"action"=>"index", "controller"=>"admin/admin/inner_module"}>
+      assert_redirected_to admin_inner_module_path
+    end
+  end
+
-  # test the flash-based assertions with something is in the flash
-  def test_flash_assertions_full

trunk/actionpack/test/controller/routing_test.rb

@@ -133 +133 @@
-                 x.send(:page_url, :title => "AboutRails"))
-
+  end
+
+  def test_named_route_with_nested_controller
+    rs.add_named_route :users, 'admin/user', :controller => '/admin/user', :action => 'index'
+    x = setup_for_named_route.new
+    assert_equal({:controller => '/admin/user', :action => 'index', :use_route => :users},
+                 x.send(:users_url))
-  end
-
@@ -1178 +1185 @@
-      map.index '/people', :controller => 'people', :action => 'index'
-      map.multi '/people/go/:foo/:bar/joe/:id', :controller => 'people', :action => 'multi'
+      map.users '/admin/users', :controller => 'admin/users', :action => 'index'
-    end
-
@@ -1210 +1218 @@
-    assert_equal "http://named.route.test/people", controller.send(:index_url)
-    assert_equal "/people", controller.send(:index_path)
+
+    assert_equal "http://named.route.test/admin/users", controller.send(:users_url)
+    assert_equal '/admin/users', controller.send(:users_path)
+    assert_equal '/admin/users', set.generate(controller.send(:hash_for_users_url), {:controller => 'users', :action => 'index'})
-  end
-