From 30818561158dce27f3b0ae3f659a7bfdc867b834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Sun, 13 May 2012 00:42:19 -0300 Subject: Only set `:include_blank` if the value of this options is not present --- actionpack/lib/action_view/helpers/tags/base.rb | 2 +- actionpack/test/template/form_options_helper_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_view/helpers/tags/base.rb b/actionpack/lib/action_view/helpers/tags/base.rb index 74a9e043c0..607954e762 100644 --- a/actionpack/lib/action_view/helpers/tags/base.rb +++ b/actionpack/lib/action_view/helpers/tags/base.rb @@ -121,7 +121,7 @@ module ActionView def select_content_tag(option_tags, options, html_options) html_options = html_options.stringify_keys add_default_name_and_id(html_options) - options[:include_blank] = true if option_required?(html_options) + options[:include_blank] ||= true if option_required?(html_options) select = content_tag("select", add_options(option_tags, options, value(object)), html_options) if html_options["multiple"] && options.fetch(:include_hidden, true) diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb index 52b4939670..fee63b76c7 100644 --- a/actionpack/test/template/form_options_helper_test.rb +++ b/actionpack/test/template/form_options_helper_test.rb @@ -640,6 +640,12 @@ class FormOptionsHelperTest < ActionView::TestCase select("post", "category", %w(abe mus hest), {}, required: true) ) end + + def test_required_select_with_include_blank_prompt + assert_dom_equal( + %(), + select("post", "category", %w(abe mus hest), { include_blank: "Select one" }, required: true) + ) end def test_required_select_display_size_equals_to_one -- cgit v1.2.3