except :as from label_html options

carlosramireziii · Feb 25, 2012 · 61b47ed · 61b47ed
1 parent 208cf2a
commit 61b47ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/simple_form/form_builder.rb b/lib/simple_form/form_builder.rb
@@ -303,7 +303,7 @@ def label(attribute_name, *args)
       return super if args.first.is_a?(String) || block_given?
 
       options = args.extract_options!.dup
-      options[:label_html] = options.except(:label, :required)
+      options[:label_html] = options.except(:label, :required, :as)
 
       column      = find_attribute_column(attribute_name)
       input_type  = default_input_type(attribute_name, column, options)

diff --git a/test/form_builder/label_test.rb b/test/form_builder/label_test.rb
@@ -13,6 +13,12 @@ def with_label_for(object, *args, &block)
     assert_select 'label.string[for=user_name]', /Name/
   end
 
+  test 'builder should generate a label for the boolean attrbiute' do
+    with_label_for @user, :name, :as => :boolean
+    assert_select 'label.boolean[for=user_name]', /Name/
+    assert_no_select 'label[as=boolean]'
+  end
+
   test 'builder should generate a label componet tag with a clean HTML' do
     with_label_for @user, :name
     assert_no_select 'label.string[label_html]'