Ticket #6684: fix_actioncontroller_base_render_text_handles_false_object.better_tests.diff

test/controller/render_test.rb

@@ -57 +57 @@
-    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
+
-  def render_nothing_with_appendix
-    render :text => "appended"
-  end
@@ -263 +271 @@
-    assert_equal 'hello world', @response.body
-  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
-    assert_response 200

lib/action_controller/base.rb

@@ -850 +850 @@
-          response.headers["Location"] = url_for(location)
-        end
-
-text = options[:text]
-text
+options.has_key?(:text)
+options[:text]
-
-        else
-          if file = options[:file]