Merge pull request #6225 from acapilleri/select_with_required_true_include_first_option_blank

HTML5 validation error with options_from_collection_for_select

Fixes #5908

Conflicts:
	actionpack/CHANGELOG.md

1 files changed, 21 insertions, 0 deletions

diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 2c0da8473a..8b3a51bc6d 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -633,7 +633,28 @@ class FormOptionsHelperTest < ActionView::TestCase
       select("post", "category", [nil, "othervalue"])
     )
   end
+  
+  def test_select_with_included_and_display_size_equals_to_one
+    assert_dom_equal(
+    "<select id=\"post_category\" name=\"post[category]\" required=\"required\" size=\"1\"><option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"mus\">mus</option>\n<option value=\"hest\">hest</option></select>",
+    select("post", "category", %w( abe mus hest),{}, :required => true, :size => 1)
+    )
+  end
+  
+  def test_select_with_included_and_display_size_no_equals_to_one
+       assert_dom_equal(
+       "<select id=\"post_category\" name=\"post[category]\" required=\"required\" size=\"2\"><option value=\"abe\">abe</option>\n<option value=\"mus\">mus</option>\n<option value=\"hest\">hest</option></select>",
+       select("post", "category", %w( abe mus hest),{}, :required => true, :size => 2)
+       )
+  end
 
+  def test_select_with_included_and_multiple
+    assert_dom_equal(
+    "<input name=\"post[category][]\" type=\"hidden\" value=\"\"/><select id=\"post_category\" multiple=\"multiple\" name=\"post[category][]\" required=\"required\" size=\"1\"><option value=\"abe\">abe</option>\n<option value=\"mus\">mus</option>\n<option value=\"hest\">hest</option></select>",
+    select("post", "category", %w( abe mus hest), {}, :required => true, :size => 1, :multiple => true)
+    )
+  end
+ 
   def test_select_with_fixnum
     @post = Post.new
     @post.category = ""