Ticket #6684: fix_actioncontroller_base_render_text_handles_false_object-v2.diff

actionpack/test/controller/render_test.rb

@@ -37 +37 @@
-    render :text => "hello world"
-  end
-
+  def render_text_false
+    # Simulating a model returning a boolean attribute
+    render :text => "foo".blank?
+  end
+
-  def render_json_hello_world
-    render :json => {:hello => 'world'}.to_json
-  end
@@ -233 +238 @@
-    assert_equal "hello world", @response.body
-  end
-
+  def test_render_text_false
+    get :render_text_false
+    assert_equal false, @response.body
+  end
+
-  def test_render_json
-    get :render_json_hello_world
-    assert_equal '{"hello": "world"}', @response.body

actionpack/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]