Merge pull request bootstrap-ruby#80 from rzane/dont-reset-form-group-class

Dont reset additional classes on the form-group

Author: potenza

lib/bootstrap_form/form_builder.rb

@@ -121,7 +121,7 @@ def radio_buttons_collection(*args)
     end
 
     def form_group(name = nil, options = {}, &block)
-      options[:class] = "form-group"
+      options[:class] = ["form-group", options[:class]].compact.join(' ')
       options[:class] << " #{error_class}" if has_error?(name)
 
       content_tag(:div, options.except(:label, :help, :label_col, :control_col, :layout)) do

test/bootstrap_form_test.rb

@@ -419,6 +419,15 @@ def setup
     assert_equal expected, output
   end
 
+  test "form_group accepts class thorugh options hash" do
+    output = @horizontal_builder.form_group :email, class: "foo" do
+      %{<p class="form-control-static">Bar</p>}.html_safe
+    end
+
+    expected = %{<div class="form-group foo"><label class="control-label col-sm-2"></label><div class="col-sm-10"><p class="form-control-static">Bar</p></div></div>}
+    assert_equal expected, output
+  end
+
   test "static control" do
     output = @horizontal_builder.static_control :email