simple_form 1.5.2 → 2.0.0

data/test/action_view_extensions/builder_test.rb

@@ -8,48 +8,48 @@ class BuilderTest < ActionView::TestCase
     end
   end
 
-  def with_collection_radio(object, attribute, collection, value_method, text_method, options={}, html_options={})
+  def with_collection_radio_buttons(object, attribute, collection, value_method, text_method, options={}, html_options={}, &block)
     with_concat_form_for(object) do |f|
-      f.collection_radio attribute, collection, value_method, text_method, options, html_options
+      f.collection_radio_buttons attribute, collection, value_method, text_method, options, html_options, &block
     end
   end
 
-  def with_collection_check_boxes(object, attribute, collection, value_method, text_method, options={}, html_options={})
+  def with_collection_check_boxes(object, attribute, collection, value_method, text_method, options={}, html_options={}, &block)
     with_concat_form_for(object) do |f|
-      f.collection_check_boxes attribute, collection, value_method, text_method, options, html_options
+      f.collection_check_boxes attribute, collection, value_method, text_method, options, html_options, &block
     end
   end
 
   # COLLECTION RADIO
   test 'collection radio accepts a collection and generate inputs from value method' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
     assert_select 'form input[type=radio][value=true]#user_active_true'
     assert_select 'form input[type=radio][value=false]#user_active_false'
   end
 
   test 'collection radio accepts a collection and generate inputs from label method' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form label.collection_radio[for=user_active_true]', 'true'
-    assert_select 'form label.collection_radio[for=user_active_false]', 'false'
+    assert_select 'form label.collection_radio_buttons[for=user_active_true]', 'true'
+    assert_select 'form label.collection_radio_buttons[for=user_active_false]', 'false'
   end
 
   test 'collection radio handles camelized collection values for labels correctly' do
-    with_collection_radio @user, :active, ['Yes', 'No'], :to_s, :to_s
+    with_collection_radio_buttons @user, :active, ['Yes', 'No'], :to_s, :to_s
 
-    assert_select 'form label.collection_radio[for=user_active_yes]', 'Yes'
-    assert_select 'form label.collection_radio[for=user_active_no]', 'No'
+    assert_select 'form label.collection_radio_buttons[for=user_active_yes]', 'Yes'
+    assert_select 'form label.collection_radio_buttons[for=user_active_no]', 'No'
   end
 
-  test 'colection radio should sanitize collection values for labels correctly' do
-    with_collection_radio @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
-    assert_select 'label.collection_radio[for=user_name_099]', '$0.99'
-    assert_select 'label.collection_radio[for=user_name_199]', '$1.99'
+  test 'collection radio should sanitize collection values for labels correctly' do
+    with_collection_radio_buttons @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
+    assert_select 'label.collection_radio_buttons[for=user_name_099]', '$0.99'
+    assert_select 'label.collection_radio_buttons[for=user_name_199]', '$1.99'
   end
 
   test 'collection radio accepts checked item' do
-    with_collection_radio @user, :active, [[1, true], [0, false]], :last, :first, :checked => true
+    with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, :checked => true
 
     assert_select 'form input[type=radio][value=true][checked=checked]'
     assert_no_select 'form input[type=radio][value=false][checked=checked]'
@@ -57,7 +57,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts multiple disabled items' do
     collection = [[1, true], [0, false], [2, 'other']]
-    with_collection_radio @user, :active, collection, :last, :first, :disabled => [true, false]
+    with_collection_radio_buttons @user, :active, collection, :last, :first, :disabled => [true, false]
 
     assert_select 'form input[type=radio][value=true][disabled=disabled]'
     assert_select 'form input[type=radio][value=false][disabled=disabled]'
@@ -66,7 +66,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts single disable item' do
     collection = [[1, true], [0, false]]
-    with_collection_radio @user, :active, collection, :last, :first, :disabled => true
+    with_collection_radio_buttons @user, :active, collection, :last, :first, :disabled => true
 
     assert_select 'form input[type=radio][value=true][disabled=disabled]'
     assert_no_select 'form input[type=radio][value=false][disabled=disabled]'
@@ -74,105 +74,187 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts html options as input' do
     collection = [[1, true], [0, false]]
-    with_collection_radio @user, :active, collection, :last, :first, {}, :class => 'radio'
+    with_collection_radio_buttons @user, :active, collection, :last, :first, {}, :class => 'special-radio'
 
-    assert_select 'form input[type=radio][value=true].radio#user_active_true'
-    assert_select 'form input[type=radio][value=false].radio#user_active_false'
+    assert_select 'form input[type=radio][value=true].special-radio#user_active_true'
+    assert_select 'form input[type=radio][value=false].special-radio#user_active_false'
   end
 
-  test 'collection radio wraps the collection in the configured collection wrapper tag' do
-    swap SimpleForm, :collection_wrapper_tag => :ul do
-      with_collection_radio @user, :active, [true, false], :to_s, :to_s
+  test 'collection radio wraps the collection in the given collection wrapper tag' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
 
-      assert_select 'form ul input[type=radio][value=true]#user_active_true'
-      assert_select 'form ul input[type=radio][value=false]#user_active_false'
-    end
+    assert_select 'form ul input[type=radio]', :count => 2
   end
 
-  test 'collection radio wraps the collection in the given collection wrapper tag' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+  test 'collection radio does not render any wrapper tag by default' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form ul input[type=radio][value=true]#user_active_true'
-    assert_select 'form ul input[type=radio][value=false]#user_active_false'
+    assert_select 'form input[type=radio]', :count => 2
+    assert_no_select 'form ul'
   end
 
-  test 'collection radio does not wrap the collection in the explicitly false collection wrapper tag' do
-    swap SimpleForm, :collection_wrapper_tag => :ul do
-      with_collection_radio @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false
+  test 'collection radio does not wrap the collection when given falsy values' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false
 
-      assert_no_select 'form ul'
-      assert_no_select 'form ul'
-    end
+    assert_select 'form input[type=radio]', :count => 2
+    assert_no_select 'form ul'
   end
 
-  test 'collection radio does not wrap the collection in the explicitly nil collection wrapper tag' do
-    swap SimpleForm, :collection_wrapper_tag => :ul do
-      with_collection_radio @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => nil
+  test 'collection radio uses the given class for collection wrapper tag' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :collection_wrapper_tag => :ul, :collection_wrapper_class => "items-list"
 
-      assert_no_select 'form ul'
-      assert_no_select 'form ul'
-    end
+    assert_select 'form ul.items-list input[type=radio]', :count => 2
   end
 
-  test 'collection radio does not wrap the collection by default' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+  test 'collection radio uses no class for collection wrapper tag when no wrapper tag is given' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :collection_wrapper_class => "items-list"
 
+    assert_select 'form input[type=radio]', :count => 2
     assert_no_select 'form ul'
+    assert_no_select '.items-list'
   end
 
-  test 'collection radio wraps each label/radio in the configured item wrapper tag' do
-    swap SimpleForm, :item_wrapper_tag => :li do
-      with_collection_radio @user, :active, [true, false], :to_s, :to_s
+  test 'collection radio uses no class for collection wrapper tag by default' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
 
-      assert_select 'form li input[type=radio][value=true]#user_active_true'
-      assert_select 'form li input[type=radio][value=false]#user_active_false'
-    end
+    assert_select 'form ul'
+    assert_no_select 'form ul[class]'
   end
 
-  test 'collection radio wraps each label/radio in the given item wrapper tag' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
+  test 'collection radio wrap items in a span tag by default' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form li input[type=radio][value=true]#user_active_true'
-    assert_select 'form li input[type=radio][value=false]#user_active_false'
+    assert_select 'form span input[type=radio][value=true]#user_active_true + label'
+    assert_select 'form span input[type=radio][value=false]#user_active_false + label'
   end
 
-  test 'collection radio does not wrap each label/radio in the explicitly false item wrapper tag' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
+  test 'collection radio wraps each item in the given item wrapper tag' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
 
-    assert_no_select 'form span input[type=radio][value=true]#user_active_true'
-    assert_no_select 'form span input[type=radio][value=false]#user_active_false'
+    assert_select 'form li input[type=radio]', :count => 2
   end
 
-  test 'collection radio does not wrap each label/radio in the explicitly nil item wrapper tag' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => nil
+  test 'collection radio does not wrap each item when given explicitly falsy value' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
 
-    assert_no_select 'form span input[type=radio][value=true]#user_active_true'
-    assert_no_select 'form span input[type=radio][value=false]#user_active_false'
+    assert_select 'form input[type=radio]'
+    assert_no_select 'form span input[type=radio]'
   end
 
-  test 'collection radio wrap items in a span tag by default' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+  test 'collection radio uses the given class for item wrapper tag' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => :li, :item_wrapper_class => "inline"
 
-    assert_select 'form span input[type=radio][value=true]#user_active_true + label'
-    assert_select 'form span input[type=radio][value=false]#user_active_false + label'
+    assert_select "form li.inline input[type=radio]", :count => 2
+  end
+
+  test 'collection radio uses no class for item wrapper tag when no wrapper tag is given' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => nil, :item_wrapper_class => "inline"
+
+    assert_select 'form input[type=radio]', :count => 2
+    assert_no_select 'form li'
+    assert_no_select '.inline'
+  end
+
+  test 'collection radio uses no class for item wrapper tag by default' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => :li
+
+    assert_select "form li", :count => 2
+    assert_no_select "form li[class]"
   end
 
   test 'collection radio does not wrap input inside the label' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
+    assert_select 'form input[type=radio] + label'
     assert_no_select 'form label input'
   end
 
+  test 'collection radio accepts a block to render the label as radio button wrapper' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label { b.radio_button }
+    end
+
+    assert_select 'label[for=user_active_true] > input#user_active_true[type=radio]'
+    assert_select 'label[for=user_active_false] > input#user_active_false[type=radio]'
+  end
+
+  test 'collection radio accepts a block to change the order of label and radio button' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label + b.radio_button
+    end
+
+    assert_select 'label[for=user_active_true] + input#user_active_true[type=radio]'
+    assert_select 'label[for=user_active_false] + input#user_active_false[type=radio]'
+  end
+
+  test 'collection radio with block helpers accept extra html options' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => "radio_button") + b.radio_button(:class => "radio_button")
+    end
+
+    assert_select 'label.radio_button[for=user_active_true] + input#user_active_true.radio_button[type=radio]'
+    assert_select 'label.radio_button[for=user_active_false] + input#user_active_false.radio_button[type=radio]'
+  end
+
+  test 'collection radio with block helpers allows access to current text and value' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:"data-value" => b.value) { b.radio_button + b.text }
+    end
+
+    assert_select 'label[for=user_active_true][data-value=true]', 'true' do
+      assert_select 'input#user_active_true[type=radio]'
+    end
+    assert_select 'label[for=user_active_false][data-value=false]', 'false' do
+      assert_select 'input#user_active_false[type=radio]'
+    end
+  end
+
+  test 'collection radio with block helpers allows access to the current object item in the collection to access extra properties' do
+    with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => b.object) { b.radio_button + b.text }
+    end
+
+    assert_select 'label.true[for=user_active_true]', 'true' do
+      assert_select 'input#user_active_true[type=radio]'
+    end
+    assert_select 'label.false[for=user_active_false]', 'false' do
+      assert_select 'input#user_active_false[type=radio]'
+    end
+  end
+
+  test 'collection_radio helper is deprecated in favor of collection_radio_buttons' do
+    assert_deprecated "[SIMPLE_FORM] The `collection_radio` helper is deprecated, " \
+      "please use `collection_radio_buttons` instead" do
+      with_concat_form_for(@user) do |f|
+        f.collection_radio :active, [true, false], :to_s, :to_s
+      end
+    end
+
+    assert_select 'input[type=radio][value=true]'
+    assert_select 'input[type=radio][value=false]'
+  end
+
   # COLLECTION CHECK BOX
   test 'collection check box accepts a collection and generate a serie of checkboxes for value method' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
     with_collection_check_boxes @user, :tag_ids, collection, :id, :name
 
-    assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]"
     assert_select 'form input#user_tag_ids_1[type=checkbox][value=1]'
     assert_select 'form input#user_tag_ids_2[type=checkbox][value=2]'
   end
 
+  test 'collection check box generates only one hidden field for the entire collection, to ensure something will be sent back to the server when posting an empty collection' do
+    collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
+    with_collection_check_boxes @user, :tag_ids, collection, :id, :name
+
+    assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]", :count => 1
+  end
+
   test 'collection check box accepts a collection and generate a serie of checkboxes with labels for label method' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
     with_collection_check_boxes @user, :tag_ids, collection, :id, :name
@@ -188,7 +270,7 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form label.collection_check_boxes[for=user_active_no]', 'No'
   end
 
-  test 'colection check box should sanitize collection values for labels correctly' do
+  test 'collection check box should sanitize collection values for labels correctly' do
     with_collection_check_boxes @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
     assert_select 'label.collection_check_boxes[for=user_name_099]', '$0.99'
     assert_select 'label.collection_check_boxes[for=user_name_199]', '$1.99'
@@ -212,6 +294,16 @@ class BuilderTest < ActionView::TestCase
     assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
   end
 
+  test 'collection check box accepts selected values as :checked option and override the model values' do
+    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    @user.tag_ids = [2]
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => [1, 3]
+
+    assert_select 'form input[type=checkbox][value=1][checked=checked]'
+    assert_select 'form input[type=checkbox][value=3][checked=checked]'
+    assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
+  end
+
   test 'collection check box accepts multiple disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => [1, 3]
@@ -262,71 +354,152 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form label.collection_check_boxes[for=user_post_tag_ids_2]', 'Tag 2'
   end
 
-  test 'collection check box wraps the collection in the configured collection wrapper tag' do
-    swap SimpleForm, :collection_wrapper_tag => :ul do
-      with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+  test 'collection check boxes wraps the collection in the given collection wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
 
-      assert_select 'form ul input[type=checkbox][value=true]#user_active_true'
-      assert_select 'form ul input[type=checkbox][value=false]#user_active_false'
-    end
+    assert_select 'form ul input[type=checkbox]', :count => 2
   end
 
-  test 'collection check box wraps the collection in the given collection wrapper tag' do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+  test 'collection check boxes does not render any wrapper tag by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form ul input[type=checkbox][value=true]#user_active_true'
-    assert_select 'form ul input[type=checkbox][value=false]#user_active_false'
+    assert_select 'form input[type=checkbox]', :count => 2
+    assert_no_select 'form ul'
   end
 
-  test 'collection check box does not wrap the collection in the explicitly false collection wrapper tag' do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false, :item_wrapper_tag => false
+  test 'collection check boxes does not wrap the collection when given falsy values' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false
 
-    assert_select 'form > input[type=checkbox][value=true]#user_active_true'
-    assert_select 'form > input[type=checkbox][value=false]#user_active_false'
+    assert_select 'form input[type=checkbox]', :count => 2
+    assert_no_select 'form ul'
   end
 
-  test 'collection check box does not wrap the collection by default' do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+  test 'collection check boxes uses the given class for collection wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :collection_wrapper_tag => :ul, :collection_wrapper_class => "items-list"
+
+    assert_select 'form ul.items-list input[type=checkbox]', :count => 2
+  end
 
+  test 'collection check boxes uses no class for collection wrapper tag when no wrapper tag is given' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :collection_wrapper_class => "items-list"
+
+    assert_select 'form input[type=checkbox]', :count => 2
     assert_no_select 'form ul'
+    assert_no_select '.items-list'
   end
 
-  test 'collection check box wraps each label/radio in the configured item wrapper tag' do
-    swap SimpleForm, :item_wrapper_tag => :li do
-      with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+  test 'collection check boxes uses no class for collection wrapper tag by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
 
-      assert_select 'form li input[type=checkbox][value=true]#user_active_true'
-      assert_select 'form li input[type=checkbox][value=false]#user_active_false'
-    end
+    assert_select 'form ul'
+    assert_no_select 'form ul[class]'
+  end
+
+  test 'collection check boxes wrap items in a span tag by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+
+    assert_select 'form span input[type=checkbox]', :count => 2
   end
 
-  test 'collection check box wraps each label/radio in the given item wrapper tag' do
+  test 'collection check boxes wraps each item in the given item wrapper tag' do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
 
-    assert_select 'form li input[type=checkbox][value=true]#user_active_true'
-    assert_select 'form li input[type=checkbox][value=false]#user_active_false'
+    assert_select 'form li input[type=checkbox]', :count => 2
   end
 
-  test 'collection check box does not wrapp each label/radio in the explicitly false item wrapper tag' do
+  test 'collection check boxes does not wrap each item when given explicitly falsy value' do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
 
-    assert_select 'form > input[type=checkbox][value=true]#user_active_true'
-    assert_select 'form > input[type=checkbox][value=false]#user_active_false'
+    assert_select 'form input[type=checkbox]'
+    assert_no_select 'form span input[type=checkbox]'
   end
 
-  test 'collection check box wrap items in a span tag by default' do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+  test 'collection check boxes uses the given class for item wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => :li, :item_wrapper_class => "inline"
+
+    assert_select "form li.inline input[type=checkbox]", :count => 2
+  end
+
+  test 'collection check boxes uses no class for item wrapper tag when no wrapper tag is given' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => nil, :item_wrapper_class => "inline"
+
+    assert_select 'form input[type=checkbox]', :count => 2
+    assert_no_select 'form li'
+    assert_no_select '.inline'
+  end
+
+  test 'collection check boxes uses no class for item wrapper tag by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => :li
 
-    assert_select 'form span input[type=checkbox][value=true]#user_active_true + label'
-    assert_select 'form span input[type=checkbox][value=false]#user_active_false + label'
+    assert_select "form li", :count => 2
+    assert_no_select "form li[class]"
   end
 
   test 'collection check box does not wrap input inside the label' do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
 
+    assert_select 'form input[type=checkbox] + label'
     assert_no_select 'form label input'
   end
 
+  test 'collection check boxes accepts a block to render the label as check box wrapper' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label { b.check_box }
+    end
+
+    assert_select 'label[for=user_active_true] > input#user_active_true[type=checkbox]'
+    assert_select 'label[for=user_active_false] > input#user_active_false[type=checkbox]'
+  end
+
+  test 'collection check boxes accepts a block to change the order of label and check box' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label + b.check_box
+    end
+
+    assert_select 'label[for=user_active_true] + input#user_active_true[type=checkbox]'
+    assert_select 'label[for=user_active_false] + input#user_active_false[type=checkbox]'
+  end
+
+  test 'collection check boxes with block helpers accept extra html options' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => "check_box") + b.check_box(:class => "check_box")
+    end
+
+    assert_select 'label.check_box[for=user_active_true] + input#user_active_true.check_box[type=checkbox]'
+    assert_select 'label.check_box[for=user_active_false] + input#user_active_false.check_box[type=checkbox]'
+  end
+
+  test 'collection check boxes with block helpers allows access to current text and value' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:"data-value" => b.value) { b.check_box + b.text }
+    end
+
+    assert_select 'label[for=user_active_true][data-value=true]', 'true' do
+      assert_select 'input#user_active_true[type=checkbox]'
+    end
+    assert_select 'label[for=user_active_false][data-value=false]', 'false' do
+      assert_select 'input#user_active_false[type=checkbox]'
+    end
+  end
+
+  test 'collection check boxes with block helpers allows access to the current object item in the collection to access extra properties' do
+    with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
+      b.label(:class => b.object) { b.check_box + b.text }
+    end
+
+    assert_select 'label.true[for=user_active_true]', 'true' do
+      assert_select 'input#user_active_true[type=checkbox]'
+    end
+    assert_select 'label.false[for=user_active_false]', 'false' do
+      assert_select 'input#user_active_false[type=checkbox]'
+    end
+  end
+
   # SIMPLE FIELDS
   test 'simple fields for is available and yields an instance of FormBuilder' do
     with_concat_form_for(@user) do |f|
@@ -364,4 +537,14 @@ class BuilderTest < ActionView::TestCase
       end
     end
   end
+
+  test 'fields inherites wrapper option from the parent form' do
+    swap_wrapper :another do
+      simple_form_for(:user, :wrapper => :another) do |f|
+        f.simple_fields_for(:company) do |company|
+          assert_equal :another, company.options[:wrapper]
+        end
+      end
+    end
+  end
 end

data/test/action_view_extensions/form_helper_test.rb

@@ -2,23 +2,23 @@ require 'test_helper'
 
 class FormHelperTest < ActionView::TestCase
 
-  test 'simple form for yields an instance of FormBuilder' do
+  test 'SimpleForm for yields an instance of FormBuilder' do
     simple_form_for :user do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
     end
   end
 
-  test 'simple form should add default class to form' do
+  test 'SimpleForm should add default class to form' do
     concat(simple_form_for(:user) do |f| end)
     assert_select 'form.simple_form'
   end
 
-  test 'simple form should use default browser validations by default' do
+  test 'SimpleForm should use default browser validations by default' do
     concat(simple_form_for(:user) do |f| end)
     assert_no_select 'form[novalidate]'
   end
 
-  test 'simple form should not use default browser validations if specified in the configuration options' do
+  test 'SimpleForm should not use default browser validations if specified in the configuration options' do
     swap SimpleForm, :browser_validations => false do
       concat(simple_form_for(:user) do |f| end)
       assert_select 'form[novalidate="novalidate"]'
@@ -37,27 +37,49 @@ class FormHelperTest < ActionView::TestCase
     end
   end
 
-  test 'simple form should add object name as css class to form when object is not present' do
+  test 'SimpleForm should add object name as css class to form when object is not present' do
     concat(simple_form_for(:user) do |f| end)
     assert_select 'form.simple_form.user'
   end
 
-  test 'simple form should add object class name as css class to form' do
+  test 'SimpleForm should add :as option as css class to form when object is not present' do
+    concat(simple_form_for(:user, :as => 'superuser') do |f| end)
+    assert_select 'form.simple_form.superuser'
+  end
+
+  test 'SimpleForm should add object class name with new prefix as css class to form if record is not persisted' do
+    @user.new_record!
     concat(simple_form_for(@user) do |f| end)
-    assert_select 'form.simple_form.user'
+    assert_select 'form.simple_form.new_user'
+  end
+
+  test 'SimpleForm should add :as option with new prefix as css class to form if record is not persisted' do
+    @user.new_record!
+    concat(simple_form_for(@user, :as => 'superuser') do |f| end)
+    assert_select 'form.simple_form.new_superuser'
+  end
+
+  test 'SimpleForm should add edit class prefix as css class to form if record is persisted' do
+    concat(simple_form_for(@user) do |f| end)
+    assert_select 'form.simple_form.edit_user'
+  end
+
+  test 'SimpleForm should add :as options with edit prefix as css class to form if record is persisted' do
+    concat(simple_form_for(@user, :as => 'superuser') do |f| end)
+    assert_select 'form.simple_form.edit_superuser'
   end
 
-  test 'simple form should not add object class to form if css_class is specified' do
+  test 'SimpleForm should not add object class to form if css_class is specified' do
     concat(simple_form_for(:user, :html => {:class => nil}) do |f| end)
     assert_no_select 'form.user'
   end
 
-  test 'simple form should add custom class to form if css_class is specified' do
+  test 'SimpleForm should add custom class to form if css_class is specified' do
     concat(simple_form_for(:user, :html => {:class => 'my_class'}) do |f| end)
     assert_select 'form.my_class'
   end
 
-  test 'pass options to simple form' do
+  test 'pass options to SimpleForm' do
     concat(simple_form_for(:user, :url => '/account', :html => { :id => 'my_form' }) do |f| end)
     assert_select 'form#my_form'
     assert_select 'form[action=/account]'