wrapper: { class: false } fix and tests

Author: lcreid

lib/bootstrap_form/inputs/check_box.rb

@@ -86,7 +86,10 @@ def check_box_label_class(options)
       def check_box_wrapper_class(options)
         classes = ["form-check"]
         classes << "form-check-inline" if layout_inline?(options[:inline])
-        classes << "mb-3" unless options[:multiple] || %i[horizontal inline].include?(layout)
+        classes << "mb-3" unless options[:multiple] ||
+                                 %i[horizontal inline].include?(layout) ||
+                                 options[:wrapper_class] == false ||
+                                 options.dig(:wrapper, :class) == false
         classes << "form-switch" if options[:switch]
         classes << options.dig(:wrapper, :class).presence
         classes << options[:wrapper_class].presence

test/bootstrap_checkbox_test.rb

@@ -643,6 +643,20 @@ class BootstrapCheckboxTest < ActionView::TestCase
     assert_equivalent_html expected, @builder.check_box(:terms, label: "I agree to the terms", wrapper_class: "custom-class")
   end
 
+  test "check box with custom wrapper class false" do
+    expected = <<~HTML
+      <div class="form-check">
+        <input #{autocomplete_attr} name="user[terms]" type="hidden" value="0" />
+        <input class="form-check-input" id="user_terms" name="user[terms]" type="checkbox" value="1" />
+        <label class="form-check-label" for="user_terms">
+          I agree to the terms
+        </label>
+      </div>
+    HTML
+    assert_equivalent_html expected, @builder.check_box(:terms, label: "I agree to the terms", wrapper_class: false)
+    assert_equivalent_html expected, @builder.check_box(:terms, label: "I agree to the terms", wrapper: { class: false })
+  end
+
   test "inline check box with custom wrapper class" do
     expected = <<~HTML
       <div class="form-check form-check-inline mb-3 custom-class">

test/bootstrap_fields_test.rb

@@ -245,6 +245,28 @@ class BootstrapFieldsTest < ActionView::TestCase
     assert_equivalent_html expected, @builder.text_field(:email)
   end
 
+  test "text fields are wrapped correctly with wrapper_class and wrapper: { class: 'custom-class' }" do
+    expected = <<~HTML
+      <div class="custom-class">
+        <label class="form-label required" for="user_email">Email</label>
+        <input required="required" class="form-control" id="user_email" name="user[email]" type="text" value="[email protected]" />
+      </div>
+    HTML
+    assert_equivalent_html expected, @builder.text_field(:email, wrapper_class: "custom-class")
+    assert_equivalent_html expected, @builder.text_field(:email, wrapper: { class: "custom-class" })
+  end
+
+  test "text fields are wrapped correctly with wrapper_class false" do
+    expected = <<~HTML
+      <div>
+        <label class="form-label required" for="user_email">Email</label>
+        <input required="required" class="form-control" id="user_email" name="user[email]" type="text" value="[email protected]" />
+      </div>
+    HTML
+    assert_equivalent_html expected, @builder.text_field(:email, wrapper_class: false)
+    assert_equivalent_html expected, @builder.text_field(:email, wrapper: { class: false })
+  end
+
   test "text fields are wrapped correctly when horizontal and gutter classes are given" do
     expected = <<~HTML
       <div class="mb-3 g-3">

test/bootstrap_radio_button_test.rb

@@ -423,6 +423,21 @@ class BootstrapRadioButtonTest < ActionView::TestCase
                            @builder.radio_button(:misc, "1", label: "This is a radio button", wrapper_class: "custom-class")
   end
 
+  test "radio button with wrapper class false" do
+    expected = <<~HTML
+      <div class="form-check">
+        <input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
+        <label class="form-check-label" for="user_misc_1">
+          This is a radio button
+        </label>
+      </div>
+    HTML
+    assert_equivalent_html expected,
+                           @builder.radio_button(:misc, "1", label: "This is a radio button", wrapper_class: false)
+    assert_equivalent_html expected,
+                           @builder.radio_button(:misc, "1", label: "This is a radio button", wrapper: { class: false })
+  end
+
   test "inline radio button with custom wrapper class" do
     expected = <<~HTML
       <div class="form-check form-check-inline custom-class">