aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/template
diff options
context:
space:
mode:
authoryui-knk <spiketeika@gmail.com>2015-11-13 11:41:24 +0900
committeryui-knk <spiketeika@gmail.com>2015-11-13 12:26:15 +0900
commit429bd260c1cca8af1aac0ec31b85e487dc14b123 (patch)
tree8791424d41845e5e0a2391a23414bac23da41896 /actionview/test/template
parent0db310586ac3e15be95d2ef27ff40cfa24c05c10 (diff)
downloadrails-429bd260c1cca8af1aac0ec31b85e487dc14b123.tar.gz
rails-429bd260c1cca8af1aac0ec31b85e487dc14b123.tar.bz2
rails-429bd260c1cca8af1aac0ec31b85e487dc14b123.zip
Respect value of `:object` if `:object` is false when rendering
This commit fixes the bug convering `false` to `locals[as]` when `options[:object]` is `false` (close #22260).
Diffstat (limited to 'actionview/test/template')
-rw-r--r--actionview/test/template/render_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index 51bc59edae..84aca222b2 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -247,6 +247,8 @@ module RenderTestCases
def test_render_object
assert_equal "Hello: david", @view.render(:partial => "test/customer", :object => Customer.new("david"))
+ assert_equal "FalseClass", @view.render(:partial => "test/klass", :object => false)
+ assert_equal "NilClass", @view.render(:partial => "test/klass", :object => nil)
end
def test_render_object_with_array