diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2010-09-25 08:35:15 +0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-26 02:13:46 +0800 |
| commit | db57e92784f83d62a067282a131d7b09b44c3032 (patch) | |
| tree | 187937bfd93596984e6239c470769bda90a27936 /actionpack | |
| parent | eb8a24a375a25d43b10459af2fef7641d0746738 (diff) | |
| download | rails-db57e92784f83d62a067282a131d7b09b44c3032.tar.gz rails-db57e92784f83d62a067282a131d7b09b44c3032.tar.bz2 rails-db57e92784f83d62a067282a131d7b09b44c3032.zip | |
Select tags with array options are deprecated, removing
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_tag_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/template/form_tag_helper_test.rb | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb index 43ffadc004..298db46177 100644 --- a/actionpack/lib/action_view/helpers/form_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb @@ -93,10 +93,6 @@ 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 = {}) - if Array === option_tags - ActiveSupport::Deprecation.warn 'Passing an array of option_tags to select_tag implicitly joins them without marking them as HTML-safe. Pass option_tags.join.html_safe instead.', caller - end - html_name = (options[:multiple] == true && !name.to_s.ends_with?("[]")) ? "#{name}[]" : name if blank = options.delete(:include_blank) if blank.kind_of?(String) diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb index 532f086d21..8c8e87ae9f 100644 --- a/actionpack/test/template/form_tag_helper_test.rb +++ b/actionpack/test/template/form_tag_helper_test.rb @@ -201,12 +201,6 @@ class FormTagHelperTest < ActionView::TestCase assert_dom_equal expected, actual end - def test_select_tag_with_array_options - assert_deprecated /array/ do - select_tag "people", ["<option>david</option>"] - end - 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">hello world</textarea>) |