simple_form 1.2.0 → 1.4.0

data/test/action_view_extensions/builder_test.rb

@@ -1,29 +1,55 @@
 require 'test_helper'
 
 class BuilderTest < ActionView::TestCase
+  def with_custom_form_for(object, *args, &block)
+    with_concat_custom_form_for(object) do |f|
+      assert f.instance_of?(CustomFormBuilder)
+      yield f
+    end
+  end
+
+  def with_collection_radio(object, attribute, collection, value_method, text_method, options={}, html_options={})
+    with_concat_form_for(object) do |f|
+      f.collection_radio attribute, collection, value_method, text_method, options, html_options
+    end
+  end
+
+  def with_collection_check_boxes(object, attribute, collection, value_method, text_method, options={}, html_options={})
+    with_concat_form_for(object) do |f|
+      f.collection_check_boxes attribute, collection, value_method, text_method, options, html_options
+    end
+  end
+
   # COLLECTION RADIO
   test 'collection radio accepts a collection and generate inputs from value method' do
-    concat(form_for @user do |f|
-      concat f.collection_radio :active, [true, false], :to_s, :to_s
-    end)
+    with_collection_radio @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
-    concat(form_for @user do |f|
-      concat f.collection_radio :active, [true, false], :to_s, :to_s
-    end)
+    with_collection_radio @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'
   end
 
+  test 'collection radio handles camelized collection values for labels correctly' do
+    with_collection_radio @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'
+  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'
+  end
+
   test 'collection radio accepts checked item' do
-    concat(form_for @user do |f|
-      concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, :checked => true
-    end)
+    with_collection_radio @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]'
@@ -31,9 +57,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts multiple disabled items' do
     collection = [[1, true], [0, false], [2, 'other']]
-    concat(form_for @user do |f|
-      concat f.collection_radio :active, collection, :last, :first, :disabled => [true, false]
-    end)
+    with_collection_radio @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]'
@@ -42,29 +66,75 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts single disable item' do
     collection = [[1, true], [0, false]]
-    concat(form_for @user do |f|
-      concat f.collection_radio :active, collection, :last, :first, :disabled => true
-    end)
+    with_collection_radio @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]'
   end
 
   test 'collection radio accepts html options as input' do
-    concat(form_for @user do |f|
-      concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, {}, :class => 'radio'
-    end)
+    collection = [[1, true], [0, false]]
+    with_collection_radio @user, :active, collection, :last, :first, {}, :class => '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'
   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
+
+      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
+  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
+
+    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
+
+  test 'collection radio does not wrap the collection by default' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+
+    assert_no_select 'form ul'
+  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
+
+      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
+  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
+
+    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
+
+  test 'collection radio wrap items in a span tag by default' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+
+    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 input inside the label' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+
+    assert_no_select 'form label input'
+  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')]
-    concat(form_for @user do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :id, :name
-    end)
+    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]'
@@ -73,19 +143,28 @@ class BuilderTest < ActionView::TestCase
 
   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')]
-    concat(form_for @user do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :id, :name
-    end)
+    with_collection_check_boxes @user, :tag_ids, collection, :id, :name
 
     assert_select 'form label.collection_check_boxes[for=user_tag_ids_1]', 'Tag 1'
     assert_select 'form label.collection_check_boxes[for=user_tag_ids_2]', 'Tag 2'
   end
 
+  test 'collection check box handles camelized collection values for labels correctly' do
+    with_collection_check_boxes @user, :active, ['Yes', 'No'], :to_s, :to_s
+
+    assert_select 'form label.collection_check_boxes[for=user_active_yes]', 'Yes'
+    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
+    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'
+  end
+
   test 'collection check box accepts selected values as :checked option' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => [1, 3]
-    end)
+    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]'
@@ -94,9 +173,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a single checked value' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => 3
-    end)
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => 3
 
     assert_select 'form input[type=checkbox][value=3][checked=checked]'
     assert_no_select 'form input[type=checkbox][value=1][checked=checked]'
@@ -105,9 +182,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts multiple disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => [1, 3]
-    end)
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => [1, 3]
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -116,9 +191,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts single disable item' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => 1
-    end)
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => 1
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -127,9 +200,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a proc to disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for @user do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => proc { |i| i.first == 1 }
-    end)
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => proc { |i| i.first == 1 }
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -138,9 +209,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts html options' do
     collection = [[1, 'Tag 1'], [2, 'Tag 2']]
-    concat(form_for @user do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, {}, :class => 'check'
-    end)
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, {}, :class => 'check'
 
     assert_select 'form input.check[type=checkbox][value=1]'
     assert_select 'form input.check[type=checkbox][value=2]'
@@ -148,11 +217,11 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box with fields for' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    concat(form_for @user do |f|
-      concat(f.fields_for :post do |p|
-        concat p.collection_check_boxes :tag_ids, collection, :id, :name
-      end)
-    end)
+    with_concat_form_for(@user) do |f|
+      f.fields_for(:post) do |p|
+        p.collection_check_boxes :tag_ids, collection, :id, :name
+      end
+    end
 
     assert_select 'form input#user_post_tag_ids_1[type=checkbox][value=1]'
     assert_select 'form input#user_post_tag_ids_2[type=checkbox][value=2]'
@@ -161,12 +230,79 @@ 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
+
+      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
+  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
+
+    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
+
+  test 'collection check box does not wrap the collection by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+
+    assert_no_select 'form ul'
+  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
+
+      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
+  end
+
+  test 'collection check box wraps each label/radio 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'
+  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
+
+    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'
+  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_no_select 'form label input'
+  end
+
   # SIMPLE FIELDS
   test 'simple fields for is available and yields an instance of FormBuilder' do
-    concat(form_for @user do |f|
-      concat(f.simple_fields_for :posts do |posts_form|
+    with_concat_form_for(@user) do |f|
+      f.simple_fields_for(:posts) do |posts_form|
         assert posts_form.instance_of?(SimpleForm::FormBuilder)
-      end)
-    end)
+      end
+    end
+  end
+
+  test 'fields for yields an instance of CustomBuilder if main builder is a CustomBuilder' do
+    with_custom_form_for(:user) do |f|
+      f.simple_fields_for(:company) do |company|
+        assert company.instance_of?(CustomFormBuilder)
+      end
+    end
+  end
+
+  test 'fields for yields an instance of FormBuilder if it was set in options' do
+    with_custom_form_for(:user) do |f|
+      f.simple_fields_for(:company, :builder => SimpleForm::FormBuilder) do |company|
+        assert company.instance_of?(SimpleForm::FormBuilder)
+      end
+    end
   end
 end

data/test/action_view_extensions/form_helper_test.rb

@@ -9,28 +9,40 @@ class FormHelperTest < ActionView::TestCase
   end
 
   test 'simple form should add default class to form' do
-    concat(simple_form_for :user do |f| end)
+    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
+    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
+    swap SimpleForm, :browser_validations => false do
+      concat(simple_form_for(:user) do |f| end)
+      assert_select 'form[novalidate="novalidate"]'
+    end
+  end
+
   test 'simple form should add object name as css class to form when object is not present' do
-    concat(simple_form_for :user do |f| end)
+    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
-    concat(simple_form_for @user do |f| end)
+    concat(simple_form_for(@user) do |f| end)
     assert_select 'form.simple_form.user'
   end
 
   test 'pass options to simple form' do
-    concat(simple_form_for :user, :url => '/account', :html => { :id => 'my_form' } do |f| end)
+    concat(simple_form_for(:user, :url => '/account', :html => { :id => 'my_form' }) do |f| end)
     assert_select 'form#my_form'
     assert_select 'form[action=/account]'
   end
 
   test 'fields for yields an instance of FormBuilder' do
-    concat(simple_fields_for :user do |f|
+    concat(simple_fields_for(:user) do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
     end)
   end

data/test/components/error_test.rb

@@ -3,14 +3,10 @@ require 'test_helper'
 class ErrorTest < ActionView::TestCase
 
   def with_error_for(object, attribute_name, type, options={}, &block)
-    concat(simple_form_for object do |f|
-      f.attribute_name = attribute_name
-      f.reflection     = Association.new(Company, :company, {}) if options.delete(:setup_association)
-      f.input_type     = type
-      f.options        = options
-
-      concat(SimpleForm::Inputs::Base.new(f).error.to_s)
-    end)
+    with_concat_form_for(object) do |f|
+      options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)
+      SimpleForm::Inputs::Base.new(f, attribute_name, nil, type, options).error.to_s
+    end
   end
 
   test 'error should not generate content for attribute without errors' do
@@ -23,14 +19,29 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'span.error'
   end
 
+  test "error should not generate messages when object doesn't respond to errors method" do
+    @user.instance_eval { undef errors }
+    with_error_for @user, :name, :string
+    assert_no_select 'span.error'
+  end
+
   test 'error should generate messages for attribute with single error' do
     with_error_for @user, :name, :string
     assert_select 'span.error', "can't be blank"
   end
 
-  test 'error should generate messages for attribute with several errors' do
-    with_error_for @user, :age, :numeric
-    assert_select 'span.error', 'is not a number and must be greater than 18'
+  test 'error should generate messages for attribute with one error when using first' do
+    swap SimpleForm, :error_method => :first do
+      with_error_for @user, :age, :numeric
+      assert_select 'span.error', 'is not a number'
+    end
+  end
+
+  test 'error should generate messages for attribute with several errors when using to_sentence' do
+    swap SimpleForm, :error_method => :to_sentence do
+      with_error_for @user, :age, :numeric
+      assert_select 'span.error', 'is not a number and must be greater than 18'
+    end
   end
 
   test 'error should be able to pass html options' do
@@ -39,7 +50,7 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'error should find errors on attribute and association' do
-    with_error_for @user, :company_id, :select, :setup_association => true
+    with_error_for @user, :company_id, :select, :setup_association => true, :error_method => :to_sentence
     assert_select 'span.error', 'must be valid and company must be present'
   end
 end

data/test/components/hint_test.rb

@@ -3,14 +3,10 @@ require 'test_helper'
 class HintTest < ActionView::TestCase
 
   def with_hint_for(object, attribute_name, type, options={}, &block)
-    concat(simple_form_for object do |f|
-      f.attribute_name = attribute_name
-      f.reflection     = Association.new(Company, :company, {}) if options.delete(:setup_association)
-      f.input_type     = type
-      f.options        = options
-
-      concat(SimpleForm::Inputs::Base.new(f).hint.to_s)
-    end)
+    with_concat_form_for(object) do |f|
+      options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)
+      SimpleForm::Inputs::Base.new(f, attribute_name, nil, type, options).hint.to_s
+    end
   end
 
   test 'hint should not be generated by default' do

data/test/components/label_test.rb

@@ -1,20 +1,16 @@
+# encoding: UTF-8
 require 'test_helper'
 
 class LabelTest < ActionView::TestCase
-
   setup do
     SimpleForm::Inputs::Base.reset_i18n_cache :translate_required_html
   end
 
   def with_label_for(object, attribute_name, type, options={})
-    concat(simple_form_for object do |f|
-      f.attribute_name = attribute_name
-      f.reflection     = Association.new(Company, :company, {}) if options.delete(:setup_association)
-      f.input_type     = type
-      f.options        = options
-
-      concat(SimpleForm::Inputs::Base.new(f).label)
-    end)
+    with_concat_form_for(object) do |f|
+      options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)
+      SimpleForm::Inputs::Base.new(f, attribute_name, nil, type, options).label
+    end
   end
 
   test 'label should generate a default humanized description' do
@@ -57,6 +53,15 @@ class LabelTest < ActionView::TestCase
     end
   end
 
+  test 'label should not explode while looking for i18n translation when action is not set' do
+    def @controller.action_name; nil; end
+
+    assert_nothing_raised do
+      with_label_for @user, :description, :text
+    end
+    assert_select 'label[for=user_description]'
+  end
+
   test 'label should use i18n based on model and attribute to lookup translation' do
     store_translations(:en, :simple_form => { :labels => { :user => {
       :description => 'Descrição'
@@ -73,6 +78,15 @@ class LabelTest < ActionView::TestCase
     end
   end
 
+  test 'input should not use i18n label if translate is false' do
+    swap SimpleForm, :translate => false do
+      store_translations(:en, :simple_form => { :labels => { :age => 'Idade' } } ) do
+        with_label_for @user, :age, :integer
+        assert_select 'label[for=user_age]', /Age/
+      end
+    end
+  end
+
   test 'label should use i18n with lookup for association name' do
     store_translations(:en, :simple_form => { :labels => {
       :user => { :company => 'My company!' }
@@ -82,6 +96,43 @@ class LabelTest < ActionView::TestCase
     end
   end
 
+  test 'label should do correct i18n lookup for nested models with nested translation' do
+    @user.company = Company.new(1, 'Empresa')
+
+    store_translations(:en, :simple_form => { :labels => {
+      :user => { :name => 'Usuario', :company => { :name => 'Nome da empresa' } }
+    } } ) do
+      with_concat_form_for @user do |f|
+        concat f.input :name
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.input :name)
+        end)
+      end
+
+      assert_select 'label[for=user_name]', /Usuario/
+      assert_select 'label[for=user_company_attributes_name]', /Nome da empresa/
+    end
+  end
+
+  test 'label should do correct i18n lookup for nested models with no nested translation' do
+    @user.company = Company.new(1, 'Empresa')
+
+    store_translations(:en, :simple_form => { :labels => {
+      :user    => { :name => 'Usuario' },
+      :company => { :name => 'Nome da empresa' }
+    } } ) do
+      with_concat_form_for @user do |f|
+        concat f.input :name
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.input :name)
+        end)
+      end
+
+      assert_select 'label[for=user_name]', /Usuario/
+      assert_select 'label[for=user_company_attributes_name]', /Nome da empresa/
+    end
+  end
+
   test 'label should have css class from type' do
     with_label_for @user, :name, :string
     assert_select 'label.string'
@@ -94,14 +145,14 @@ class LabelTest < ActionView::TestCase
     with_label_for @user, :created_at, :datetime
     assert_select 'label.datetime'
   end
-  
+
   test 'label should obtain required from ActiveModel::Validations when it is included' do
     with_label_for @validating_user, :name, :string
     assert_select 'label.required'
     with_label_for @validating_user, :status, :string
     assert_select 'label.optional'
   end
-  
+
   test 'label should allow overriding required when ActiveModel::Validations is included' do
     with_label_for @validating_user, :name, :string, :required => false
     assert_select 'label.optional'
@@ -156,6 +207,16 @@ class LabelTest < ActionView::TestCase
     assert_select 'label[for=my_new_id]'
   end
 
+  test 'label should allow overwriting of for attribute' do
+    with_label_for @user, :name, :string, :label_html => { :for => 'my_new_id' }
+    assert_select 'label[for=my_new_id]'
+  end
+
+  test 'label should allow overwriting of for attribute with input_html not containing id' do
+    with_label_for @user, :name, :string, :label_html => { :for => 'my_new_id' }, :input_html => {:class => 'foo'}
+    assert_select 'label[for=my_new_id]'
+  end
+
   test 'label should use default input id when it was not overridden' do
     with_label_for @user, :name, :string, :input_html => { :class => 'my_new_id' }
     assert_select 'label[for=user_name]'
@@ -181,4 +242,11 @@ class LabelTest < ActionView::TestCase
     with_label_for :project, :description, :string, :required => false
     assert_no_select 'label.required[for=project_description]'
   end
+
+  test 'label should add chosen label class' do
+    swap SimpleForm, :label_class => :my_custom_class do
+      with_label_for @user, :name, :string
+      assert_select 'label.my_custom_class'
+    end
+  end
 end