Ticket #10272: redirect_to_nil_raises_its_own_exception.diff

actionpack/test/controller/redirect_test.rb

@@ -77 +77 @@
-    redirect_to Workshop.new(5, true)
-  end
-
+  def redirect_to_nil
+    redirect_to nil
+  end
+
-  def rescue_errors(e) raise e end
-    
-  def rescue_action(e) raise end
@@ -215 +219 @@
-    get :redirect_to_new_record
-    assert_equal "http://test.host/workshops", redirect_to_url
-  end
+
+  def test_redirect_to_nil
+    assert_raises(ActionController::RedirectToNil) do
+      get :redirect_to_nil
+    end
+  end
+
-end
-
-module ModuleTest

actionpack/lib/action_controller/base.rb

@@ -21 +21 @@
-  class RenderError < ActionControllerError #:nodoc:
-  end
-
+  class RedirectToNil < ActionControllerError #:nodoc:
+  end
+
-  class RoutingError < ActionControllerError #:nodoc:
-    attr_reader :failures
-    def initialize(message, failures=[])
@@ -1029 +1032 @@
-      # RedirectBackError will be raised. You may specify some fallback
-      # behavior for this case by rescuing RedirectBackError.
-      def redirect_to(options = {}, response_status = {}) #:doc: 
-
+
+
-        if options.is_a?(Hash) && options[:status] 
-          status = options.delete(:status) 
-        elsif response_status[:status]