Changeset 8577

Timestamp:

01/06/08 20:52:57 (4 months ago)

Author:

bitsweat

Message:

Support render :text => nil. Closes #6684.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/test/controller/render_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Support render :text => nil.  #6684 [tjennings, PotatoSalad, Cheah Chu Yeow]
-
-* assert_response failures include the exception message.  #10688 [Seth Rasmussen]

trunk/actionpack/lib/action_controller/base.rb

@@ -851 +851 @@
-        end
-
-text = options[:text]
-text
+options.has_key?(:text)
+options[:text]
-
-        else

trunk/actionpack/test/controller/render_test.rb

@@ -56 +56 @@
-  def render_custom_code
-    render :text => "hello world", :status => 404
+  end
+
+  def render_text_with_nil
+    render :text => nil
+  end
+
+  def render_text_with_false
+    render :text => false
-  end
-
@@ -264 +272 @@
-  end
-
+  def test_render_text_with_nil
+    get :render_text_with_nil
+    assert_response 200
+    assert_equal '', @response.body
+  end
+
+  def test_render_text_with_false
+    get :render_text_with_false
+    assert_equal 'false', @response.body
+  end
+
-  def test_render_nothing_with_appendix
-    get :render_nothing_with_appendix