Changeset 8634

Timestamp:

01/12/08 03:10:38 (4 months ago)

Author:

nzkoz

Message:

Merge the fix for redirecting to nil. References #10272 [farleyknight]

Files:

• branches/2-0-stable/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• branches/2-0-stable/actionpack/test/controller/redirect_test.rb (modified) (2 diffs)

branches/2-0-stable/actionpack/lib/action_controller/base.rb

@@ -1030 +1030 @@
-      # 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) 

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

@@ -76 +76 @@
-  def redirect_to_new_record
-    redirect_to Workshop.new(5, true)
+  end
+
+  def redirect_to_nil
+    redirect_to nil
-  end
-
@@ -216 +220 @@
-    assert_equal "http://test.host/workshops", redirect_to_url
-  end
+
+  def test_redirect_to_nil
+    assert_raises(ActionController::ActionControllerError) do
+      get :redirect_to_nil
+    end
+  end
+
-end
-