github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure option for select helper responds to #first before comparison.

Browse Source
This commit is contained in:
Brian Rose
2011-12-20 13:19:55 -07:00
parent cf2d31ab0b
commit bd89946dd3
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_view/helpers/form_options_helper.rb
View File

@@ -584,7 +584,7 @@ module ActionView
# [nil, []]
# { nil => [] }
#
if !choices.empty? && Array === choices.first.last
if !choices.empty? && choices.first.respond_to?(:first) && Array === choices.first.last
option_tags = grouped_options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
else
option_tags = options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])

18
actionpack/test/template/form_options_helper_test.rb
View File

@@ -596,6 +596,24 @@ class FormOptionsHelperTest < ActionView::TestCase
)
end
def test_select_with_nil
@post = Post.new
@post.category = "othervalue"
assert_dom_equal(
"<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"othervalue\" selected=\"selected\">othervalue</option></select>",
select("post", "category", [nil, "othervalue"])
)
end
def test_select_with_fixnum
@post = Post.new
@post.category = ""
assert_dom_equal(
"<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"1\">1</option></select>",
select("post", "category", [1], :prompt => true, :include_blank => true)
)
end
def test_list_of_lists
@post = Post.new
@post.category = ""