Merge pull request #10964 from nashby/collection-html-options

collection tags accept html attributes as the last element of collection

1 files changed, 16 insertions, 0 deletions

diff --git a/actionpack/test/template/form_collections_helper_test.rb b/actionpack/test/template/form_collections_helper_test.rb
index 2131f81396..bc9c21dfd3 100644
--- a/actionpack/test/template/form_collections_helper_test.rb
+++ b/actionpack/test/template/form_collections_helper_test.rb
@@ -76,6 +76,14 @@ class FormCollectionsHelperTest < ActionView::TestCase
     assert_select 'input[type=radio][value=false].special-radio#user_active_false'
   end
 
+  test 'collection radio accepts html options as the last element of array' do
+    collection = [[1, true, {class: 'foo'}], [0, false, {class: 'bar'}]]
+    with_collection_radio_buttons :user, :active, collection, :second, :first
+
+    assert_select 'input[type=radio][value=true].foo#user_active_true'
+    assert_select 'input[type=radio][value=false].bar#user_active_false'
+  end
+
   test 'collection radio does not wrap input inside the label' do
     with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s
 
@@ -192,6 +200,14 @@ class FormCollectionsHelperTest < ActionView::TestCase
     assert_select 'label[for=user_name_199]', '$1.99'
   end
 
+  test 'collection check boxes accepts html options as the last element of array' do
+    collection = [[1, 'Category 1', {class: 'foo'}], [2, 'Category 2', {class: 'bar'}]]
+    with_collection_check_boxes :user, :active, collection, :first, :second
+
+    assert_select 'input[type=checkbox][value=1].foo'
+    assert_select 'input[type=checkbox][value=2].bar'
+  end
+
   test 'collection check boxes accepts selected values as :checked option' do
     collection = (1..3).map{|i| [i, "Category #{i}"] }
     with_collection_check_boxes :user, :category_ids, collection, :first, :last, :checked => [1, 3]