Ticket #1581: 1608_redirect_assertions.diff

actionpack/test/controller/redirect_test.rb

@@ -13 +13 @@
-    redirect_to :action => "other_host", :only_path => false, :host => 'other.test.host'
-  end
-
+  def module_redirect
+    redirect_to :controller => 'module_test/module_redirect', :action => "hello_world"
+  end
+
-  def rescue_errors(e) raise e end
-  
-  protected
@@ -42 +46 @@
-    get :host_redirect
-    assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
-  end
+
+  def test_module_redirect
+    get :module_redirect
+    assert_redirect_url "http://test.host/module_test/module_redirect/hello_world"
+  end
+
+  def test_module_redirect_using_options
+    get :module_redirect
+    assert_redirected_to :controller => 'module_test/module_redirect', :action => 'hello_world'
+  end
-end
+
+module ModuleTest
+  class ModuleRedirectController < ::RedirectController
+    def module_redirect
+      redirect_to :controller => '/redirect', :action => "hello_world"
+    end
+  end
+
+  class ModuleRedirectTest < Test::Unit::TestCase
+    def setup
+      @controller = ModuleRedirectController.new
+      @request    = ActionController::TestRequest.new
+      @response   = ActionController::TestResponse.new
+    end
+  
+    def test_simple_redirect
+      get :simple_redirect
+      assert_redirect_url "http://test.host/module_test/module_redirect/hello_world"
+    end
+  
+    def test_redirect_with_method_reference_and_parameters
+      get :method_redirect
+      assert_redirect_url "http://test.host/module_test/module_redirect/dashboard/1?message=hello"
+    end
+    
+    def test_simple_redirect_using_options
+      get :host_redirect
+      assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
+    end
+
+    def test_module_redirect
+      get :module_redirect
+      assert_redirect_url "http://test.host/redirect/hello_world"
+    end
+
+    def test_module_redirect_using_options
+      get :module_redirect
+      assert_redirected_to :controller => 'redirect', :action => "hello_world"
+    end
+  end
+end

actionpack/lib/action_controller/assertions.rb

@@ -56 +56 @@
-      # such at assert_redirected_to(:controller => "weblog") will also match the redirection of 
-      # redirect_to(:controller => "weblog", :action => "show") and so on.
-      def assert_redirected_to(options = {}, message=nil)
-direct(
+sponse(:redirect, 
-
-        if options.is_a?(String)
-          msg = build_message(message, "expected a redirect to <?>, found one to <?>", options, @response.redirect_url)
-          
-          url_regexp = %r{^(\w+://.*?(/|$|\?))(.*)$}
-          eurl, epath, url, path = [options, @response.redirect_url].collect do |url|
-            u, p = (url_regexp =~ url) ? [$1, $3] : [nil, url]