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

rails · Dec 20, 2011 · bd89946 · bd89946
1 parent cf2d31a
commit bd89946
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -584,7 +584,7 @@ def to_select_tag(choices, options, html_options)
         #   [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])

diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
@@ -596,6 +596,24 @@ def test_empty
     )
   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 = ""