More and fixed tests

Author: lcreid

test/bootstrap_checkbox_test.rb

@@ -593,11 +593,11 @@ class BootstrapCheckboxTest < ActionView::TestCase
         <div class="mb-3">
           <label class="form-label" for="user_misc">Misc</label>
           <div class="form-check">
-            <input checked="checked" class="form-check-input is-invalid" id="user_misc" aria-labelledby="user_misc_1_feedback" name="user[misc][]" type="checkbox" value="1" />
+            <input checked="checked" class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
             <label class="form-check-label" for="user_misc_1"> Foo</label>
           </div>
           <div class="form-check">
-            <input checked="checked" class="form-check-input is-invalid" id="user_misc" aria-labelledby="user_misc_2_feedback" name="user[misc][]" type="checkbox" value="2" />
+            <input checked="checked" class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
             <label class="form-check-label" for="user_misc_2"> Bar</label>
             <div class="invalid-feedback" id="user_misc_feedback">error for test</div>
           </div>

test/bootstrap_fields_for_test.rb

@@ -41,7 +41,7 @@ class BootstrapFieldsForTest < ActionView::TestCase
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
         <div class="mb-3">
           <label class="form-label required" for="address_city">City</label>
-          <input class="form-control is-invalid" id="address_city" name="address[city]" type="text" required="required" />
+          <input class="form-control is-invalid" id="address_city" aria-labelledby="address_city_feedback" name="address[city]" type="text" required="required" />
           <!-- No `<div class="invalid-feedback">can't be blank</div>` -->
         </div>
       </form>

test/bootstrap_form_group_test.rb

@@ -434,28 +434,6 @@ class BootstrapFormGroupTest < ActionView::TestCase
     assert_equivalent_html expected, output
   end
 
-  test 'upgrade doc for form_group renders the "error" class and message correctly when object is invalid' do
-    @user.email = nil
-    assert @user.invalid?
-
-    output = @builder.form_group :email do
-      html = '<p class="form-control-plaintext">Bar</p>'.html_safe
-      unless @user.errors[:email].empty?
-        html << tag.div(@user.errors[:email].join(", "), class: "invalid-feedback",
-                                                         style: "display: block;")
-      end
-      html
-    end
-
-    expected = <<~HTML
-      <div class="mb-3">
-        <p class="form-control-plaintext">Bar</p>
-        <div class="invalid-feedback" id="user_email_feedback" style="display: block;">can't be blank, is too short (minimum is 5 characters)</div>
-      </div>
-    HTML
-    assert_equivalent_html expected, output
-  end
-
   test "upgrade doc for form_group renders check box correctly when object is invalid" do
     @user.errors.add(:misc, "Must select one.")
 

test/bootstrap_form_test.rb

@@ -451,7 +451,7 @@ def warn(message, ...)
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
         <div class="mb-3">
-          <label class="form-label required text-danger" for="user_email">Email can't be blank, is too short (minimum is 5 characters)</label>
+          <label class="form-label required text-danger" for="user_email" id="user_email_feedback">Email can't be blank, is too short (minimum is 5 characters)</label>
           <input required="required" class="form-control is-invalid" id="user_email"  aria-labelledby="user_email_feedback" name="user[email]" type="text" />
         </div>
       </form>
@@ -466,7 +466,7 @@ def warn(message, ...)
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
         <div class="mb-3">
-          <label class="form-label required text-danger" for="user_email">Email can't be blank, is too short (minimum is 5 characters)</label>
+          <label class="form-label required text-danger" for="user_email" id="user_email_feedback">Email can't be blank, is too short (minimum is 5 characters)</label>
           <input required="required" class="form-control is-invalid" id="user_email"  aria-labelledby="user_email_feedback" name="user[email]" type="text" />
           <div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</span>
         </div>
@@ -484,7 +484,7 @@ def warn(message, ...)
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
         <div class="mb-3">
-          <label class="form-label required text-danger" for="user_email">Your e-mail address can't be blank, is too short (minimum is 5 characters)</label>
+          <label class="form-label required text-danger" for="user_email"id="user_email_feedback">Your e-mail address can't be blank, is too short (minimum is 5 characters)</label>
           <input required="required" class="form-control is-invalid" id="user_email"  aria-labelledby="user_email_feedback" name="user[email]" type="text" />
           <div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</div>
         </div>
@@ -809,7 +809,7 @@ def warn(message, ...)
     @user.email = nil
     assert @user.invalid?
 
-    expected = '<div class="custom-error-class">Email can\'t be blank, Email is too short (minimum is 5 characters)</div>'
+    expected = '<div class="custom-error-class" id="user_email_feedback">Email can\'t be blank, Email is too short (minimum is 5 characters)</div>'
 
     assert_equivalent_html expected, @builder.errors_on(:email, custom_class: "custom-error-class")
   end