Skip to content

Commit 4a4d1c6

Browse files
committed
More and fixed tests
1 parent 43cc67e commit 4a4d1c6

File tree

4 files changed

+7
-29
lines changed

4 files changed

+7
-29
lines changed

test/bootstrap_checkbox_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,11 @@ class BootstrapCheckboxTest < ActionView::TestCase
593593
<div class="mb-3">
594594
<label class="form-label" for="user_misc">Misc</label>
595595
<div class="form-check">
596-
<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" />
596+
<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" />
597597
<label class="form-check-label" for="user_misc_1"> Foo</label>
598598
</div>
599599
<div class="form-check">
600-
<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" />
600+
<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" />
601601
<label class="form-check-label" for="user_misc_2"> Bar</label>
602602
<div class="invalid-feedback" id="user_misc_feedback">error for test</div>
603603
</div>

test/bootstrap_fields_for_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class BootstrapFieldsForTest < ActionView::TestCase
4141
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
4242
<div class="mb-3">
4343
<label class="form-label required" for="address_city">City</label>
44-
<input class="form-control is-invalid" id="address_city" name="address[city]" type="text" required="required" />
44+
<input class="form-control is-invalid" id="address_city" aria-labelledby="address_city_feedback" name="address[city]" type="text" required="required" />
4545
<!-- No `<div class="invalid-feedback">can't be blank</div>` -->
4646
</div>
4747
</form>

test/bootstrap_form_group_test.rb

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -434,28 +434,6 @@ class BootstrapFormGroupTest < ActionView::TestCase
434434
assert_equivalent_html expected, output
435435
end
436436

437-
test 'upgrade doc for form_group renders the "error" class and message correctly when object is invalid' do
438-
@user.email = nil
439-
assert @user.invalid?
440-
441-
output = @builder.form_group :email do
442-
html = '<p class="form-control-plaintext">Bar</p>'.html_safe
443-
unless @user.errors[:email].empty?
444-
html << tag.div(@user.errors[:email].join(", "), class: "invalid-feedback",
445-
style: "display: block;")
446-
end
447-
html
448-
end
449-
450-
expected = <<~HTML
451-
<div class="mb-3">
452-
<p class="form-control-plaintext">Bar</p>
453-
<div class="invalid-feedback" id="user_email_feedback" style="display: block;">can't be blank, is too short (minimum is 5 characters)</div>
454-
</div>
455-
HTML
456-
assert_equivalent_html expected, output
457-
end
458-
459437
test "upgrade doc for form_group renders check box correctly when object is invalid" do
460438
@user.errors.add(:misc, "Must select one.")
461439

test/bootstrap_form_test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ def warn(message, ...)
451451
expected = <<~HTML
452452
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
453453
<div class="mb-3">
454-
<label class="form-label required text-danger" for="user_email">Email can't be blank, is too short (minimum is 5 characters)</label>
454+
<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>
455455
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
456456
</div>
457457
</form>
@@ -466,7 +466,7 @@ def warn(message, ...)
466466
expected = <<~HTML
467467
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
468468
<div class="mb-3">
469-
<label class="form-label required text-danger" for="user_email">Email can't be blank, is too short (minimum is 5 characters)</label>
469+
<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>
470470
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
471471
<div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</span>
472472
</div>
@@ -484,7 +484,7 @@ def warn(message, ...)
484484
expected = <<~HTML
485485
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
486486
<div class="mb-3">
487-
<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>
487+
<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>
488488
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
489489
<div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</div>
490490
</div>
@@ -809,7 +809,7 @@ def warn(message, ...)
809809
@user.email = nil
810810
assert @user.invalid?
811811

812-
expected = '<div class="custom-error-class">Email can\'t be blank, Email is too short (minimum is 5 characters)</div>'
812+
expected = '<div class="custom-error-class" id="user_email_feedback">Email can\'t be blank, Email is too short (minimum is 5 characters)</div>'
813813

814814
assert_equivalent_html expected, @builder.errors_on(:email, custom_class: "custom-error-class")
815815
end

0 commit comments

Comments
 (0)