diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-21 09:37:13 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-21 09:37:13 -0700 |
| commit | ce0dd56183d198739638c2cfa7c17f90513a7072 (patch) | |
| tree | 6d845b2ecad38e1fd597c382d76805d88c4719d6 | |
| parent | 5c4fe858d799afef1540b77a57df7a9867cf358a (diff) | |
| parent | 99322266b8e80118a3912083c9c53ec03ff73eb6 (diff) | |
| download | rails-ce0dd56183d198739638c2cfa7c17f90513a7072.tar.gz rails-ce0dd56183d198739638c2cfa7c17f90513a7072.tar.bz2 rails-ce0dd56183d198739638c2cfa7c17f90513a7072.zip | |
Merge pull request #7410 from sandeepravi/default_options_helper_value
option_tags coerced to "" instead of nil
Closes #7404
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_tag_helper.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/template/form_tag_helper_test.rb | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb index a9b91d1db3..ace457df2e 100644 --- a/actionpack/lib/action_view/helpers/form_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb @@ -118,6 +118,7 @@ module ActionView # # => <select disabled="disabled" id="destination" name="destination"><option>NYC</option> # # <option>Paris</option><option>Rome</option></select> def select_tag(name, option_tags = nil, options = {}) + option_tags ||= "" html_name = (options[:multiple] == true && !name.to_s.ends_with?("[]")) ? "#{name}[]" : name if options.delete(:include_blank) diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb index 81ba92f2e6..3c66a29754 100644 --- a/actionpack/test/template/form_tag_helper_test.rb +++ b/actionpack/test/template/form_tag_helper_test.rb @@ -225,6 +225,18 @@ class FormTagHelperTest < ActionView::TestCase assert_dom_equal expected, actual end + def test_select_tag_with_nil_option_tags_and_include_blank + actual = select_tag "places", nil, :include_blank => true + expected = %(<select id="places" name="places"><option value=""></option></select>) + assert_dom_equal expected, actual + end + + def test_select_tag_with_nil_option_tags_and_prompt + actual = select_tag "places", nil, :prompt => "string" + expected = %(<select id="places" name="places"><option value="">string</option></select>) + assert_dom_equal expected, actual + end + def test_text_area_tag_size_string actual = text_area_tag "body", "hello world", "size" => "20x40" expected = %(<textarea cols="20" id="body" name="body" rows="40">\nhello world</textarea>) |