Skip to content

Commit 43cc67e

Browse files
lcreidlcreid
committed
Test for aria-labelledby
1 parent aae5040 commit 43cc67e

7 files changed

+61
-61
lines changed

‎test/bootstrap_checkbox_test.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -543,13 +543,13 @@ class BootstrapCheckboxTest < ActionView::TestCase
543543
<div class="mb-3">
544544
<label class="form-label" for="user_misc">Misc</label>
545545
<div class="form-check">
546-
<input class="form-check-input is-invalid" id="user_misc_1" name="user[misc][]" type="checkbox" value="1" />
546+
<input class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
547547
<label class="form-check-label" for="user_misc_1">Foo</label>
548548
</div>
549549
<div class="form-check">
550-
<input class="form-check-input is-invalid" id="user_misc_2" name="user[misc][]" type="checkbox" value="2" />
550+
<input class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
551551
<label class="form-check-label" for="user_misc_2">Bar</label>
552-
<div class="invalid-feedback">a box must be checked</div>
552+
<div class="invalid-feedback" id="user_misc_feedback">a box must be checked</div>
553553
</div>
554554
</div>
555555
</form>
@@ -593,13 +593,13 @@ 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_1" name="user[misc][]" type="checkbox" value="1" />
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" />
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_2" name="user[misc][]" type="checkbox" value="2" />
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" />
601601
<label class="form-check-label" for="user_misc_2"> Bar</label>
602-
<div class="invalid-feedback">error for test</div>
602+
<div class="invalid-feedback" id="user_misc_feedback">error for test</div>
603603
</div>
604604
</div>
605605
</form>
@@ -617,11 +617,11 @@ class BootstrapCheckboxTest < ActionView::TestCase
617617
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
618618
<div class="form-check mb-3">
619619
<input #{autocomplete_attr} name="user[terms]" type="hidden" value="0" />
620-
<input class="form-check-input is-invalid" id="user_terms" name="user[terms]" type="checkbox" value="1" />
620+
<input class="form-check-input is-invalid" id="user_terms" aria-labelledby="user_terms_feedback" name="user[terms]" type="checkbox" value="1" />
621621
<label class="form-check-label" for="user_terms">
622622
I agree to the terms
623623
</label>
624-
<div class="invalid-feedback">You must accept the terms.</div>
624+
<div class="invalid-feedback" id="user_terms_feedback">You must accept the terms.</div>
625625
</div>
626626
</form>
627627
HTML

‎test/bootstrap_fields_test.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ class BootstrapFieldsTest < ActionView::TestCase
9393
<form accept-charset="UTF-8" action="/users" class="new_user" enctype="multipart/form-data" id="new_user" method="post">
9494
<div class="mb-3">
9595
<label class="form-label" for="user_misc">Misc</label>
96-
<input class="form-control is-invalid" id="user_misc" name="user[misc]" type="file"/>
97-
<div class="invalid-feedback">error for test</div>
96+
<input class="form-control is-invalid" id="user_misc" aria-labelledby="user_misc_feedback" name="user[misc]" type="file"/>
97+
<div class="invalid-feedback" id="user_misc_feedback">error for test</div>
9898
</div>
9999
</form>
100100
HTML
@@ -108,8 +108,8 @@ class BootstrapFieldsTest < ActionView::TestCase
108108
<form accept-charset="UTF-8" action="/users" class="new_address" id="new_address" method="post">
109109
<div class="mb-3">
110110
<label class="form-label required" for="address_user_id">User</label>
111-
<input class="form-control is-invalid" id="address_user_id" name="address[user_id]" required="required" type="text"/>
112-
<div class="invalid-feedback">must exist</div>
111+
<input class="form-control is-invalid" id="address_user_id" aria-labelledby="address_user_id_feedback" name="address[user_id]" required="required" type="text"/>
112+
<div class="invalid-feedback" id="address_user_id_feedback">must exist</div>
113113
</div>
114114
</form>
115115
HTML

‎test/bootstrap_form_group_test.rb‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ class BootstrapFormGroupTest < ActionView::TestCase
187187
<label class="form-label required" for="user_email">Email</label>
188188
<div class="input-group">
189189
<span class="input-group-text">$</span>
190-
<input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
190+
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
191191
<span class="input-group-text">.00</span>
192-
<div class="invalid-feedback">can't be blank, is too short (minimum is 5 characters)</span>
192+
<div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</span>
193193
</div>
194194
</div>
195195
</form>
@@ -450,7 +450,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
450450
expected = <<~HTML
451451
<div class="mb-3">
452452
<p class="form-control-plaintext">Bar</p>
453-
<div class="invalid-feedback" style="display: block;">can't be blank, is too short (minimum is 5 characters)</div>
453+
<div class="invalid-feedback" id="user_email_feedback" style="display: block;">can't be blank, is too short (minimum is 5 characters)</div>
454454
</div>
455455
HTML
456456
assert_equivalent_html expected, output
@@ -471,17 +471,17 @@ class BootstrapFormGroupTest < ActionView::TestCase
471471
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
472472
<div class="mb-3">
473473
<div class="form-check">
474-
<input class="form-check-input is-invalid" id="user_misc_primary_school" name="user[misc]" type="radio" value="primary school"/>
474+
<input class="form-check-input is-invalid" id="user_misc_primary_school" aria-labelledby="user_misc_feedback" name="user[misc]" type="radio" value="primary school"/>
475475
<label class="form-check-label" for="user_misc_primary_school">Primary school</label>
476476
</div>
477477
<div class="form-check">
478-
<input class="form-check-input is-invalid" id="user_misc_high_school" name="user[misc]" type="radio" value="high school"/>
478+
<input class="form-check-input is-invalid" id="user_misc_high_school" aria-labelledby="user_misc_feedback" name="user[misc]" type="radio" value="high school"/>
479479
<label class="form-check-label" for="user_misc_high_school">High school</label>
480480
</div>
481481
<div class="form-check">
482-
<input class="form-check-input is-invalid" id="user_misc_university" name="user[misc]" type="radio" value="university"/>
482+
<input class="form-check-input is-invalid" id="user_misc_university" aria-labelledby="user_misc_feedback" name="user[misc]" type="radio" value="university"/>
483483
<label class="form-check-label" for="user_misc_university">University</label>
484-
<div class="invalid-feedback">Must select one.</div>
484+
<div class="invalid-feedback" id="user_misc_feedback">Must select one.</div>
485485
</div>
486486
</div>
487487
</form>
@@ -509,9 +509,9 @@ class BootstrapFormGroupTest < ActionView::TestCase
509509
<label class="form-label required" for="user_email">Email</label>
510510
</div>
511511
<div class="field_with_errors">
512-
<input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="email" />
512+
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="email" />
513513
</div>
514-
<div class="invalid-feedback">can't be blank, is too short (minimum is 5 characters)</div>
514+
<div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</div>
515515
</div>
516516
HTML
517517
output = @builder.email_field(:email, wrapper_class: "none-margin")
@@ -530,8 +530,8 @@ class BootstrapFormGroupTest < ActionView::TestCase
530530
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
531531
<div class="none-margin">
532532
<label class="form-label required" for="user_email">Email</label>
533-
<input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
534-
<div class="invalid-feedback">can't be blank, is too short (minimum is 5 characters)</div>
533+
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
534+
<div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</div>
535535
<small class="form-text text-muted">This is required</small>
536536
</div>
537537
</form>

‎test/bootstrap_form_test.rb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ def warn(message, ...)
452452
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
453453
<div class="mb-3">
454454
<label class="form-label required text-danger" for="user_email">Email can't be blank, is too short (minimum is 5 characters)</label>
455-
<input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
455+
<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>
458458
HTML
@@ -467,8 +467,8 @@ def warn(message, ...)
467467
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
468468
<div class="mb-3">
469469
<label class="form-label required text-danger" for="user_email">Email can't be blank, is too short (minimum is 5 characters)</label>
470-
<input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
471-
<div class="invalid-feedback">can't be blank, is too short (minimum is 5 characters)</span>
470+
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
471+
<div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</span>
472472
</div>
473473
</form>
474474
HTML
@@ -485,8 +485,8 @@ def warn(message, ...)
485485
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
486486
<div class="mb-3">
487487
<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>
488-
<input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
489-
<div class="invalid-feedback">can't be blank, is too short (minimum is 5 characters)</div>
488+
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
489+
<div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</div>
490490
</div>
491491
</form>
492492
HTML
@@ -617,7 +617,7 @@ def warn(message, ...)
617617
assert @user.invalid?
618618

619619
expected = <<~HTML
620-
<div class="invalid-feedback">Email can't be blank, Email is too short (minimum is 5 characters)</div>
620+
<div class="invalid-feedback" id="user_email_feedback">Email can't be blank, Email is too short (minimum is 5 characters)</div>
621621
HTML
622622
assert_equivalent_html expected, @builder.errors_on(:email)
623623
end
@@ -710,8 +710,8 @@ def warn(message, ...)
710710
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
711711
<div class="mb-3">
712712
<label class="form-label required" for="user_email">Email</label>
713-
<input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
714-
<div class="invalid-feedback">can't be blank, is too short (minimum is 5 characters)</div>
713+
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
714+
<div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</div>
715715
<small class="form-text text-muted">This is required</small>
716716
</div>
717717
</form>
@@ -734,9 +734,9 @@ def warn(message, ...)
734734
<label class="form-label required" for="user_email">Email</label>
735735
</div>
736736
<div class="field_with_errors">
737-
<input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
737+
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
738738
</div>
739-
<div class="invalid-feedback">can't be blank, is too short (minimum is 5 characters)</div>
739+
<div class="invalid-feedback" id="user_email_feedback">can't be blank, is too short (minimum is 5 characters)</div>
740740
<small class="form-text text-muted">This is required</small>
741741
</div>
742742
</form>
@@ -756,7 +756,7 @@ def warn(message, ...)
756756
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
757757
<div class="mb-3">
758758
<label class="form-label required" for="user_email">Email</label>
759-
<input required="required" class="form-control is-invalid" id="user_email" name="user[email]" type="text" />
759+
<input required="required" class="form-control is-invalid" id="user_email" aria-labelledby="user_email_feedback" name="user[email]" type="text" />
760760
<small class="form-text text-muted">This is required</small>
761761
</div>
762762
</form>
@@ -800,7 +800,7 @@ def warn(message, ...)
800800
@user.email = nil
801801
assert @user.invalid?
802802

803-
expected = '<div class="invalid-feedback">can\'t be blank, is too short (minimum is 5 characters)</div>'
803+
expected = '<div class="invalid-feedback" id="user_email_feedback">can\'t be blank, is too short (minimum is 5 characters)</div>'
804804

805805
assert_equivalent_html expected, @builder.errors_on(:email, hide_attribute_name: true)
806806
end

‎test/bootstrap_radio_button_test.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ class BootstrapRadioButtonTest < ActionView::TestCase
3535
expected = <<~HTML
3636
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
3737
<div class="form-check">
38-
<input class="form-check-input is-invalid" id="user_misc_1" name="user[misc]" type="radio" value="1" />
38+
<input class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc]" type="radio" value="1" />
3939
<label class="form-check-label" for="user_misc_1">
4040
This is a radio button
4141
</label>
42-
<div class="invalid-feedback">error for test</div>
42+
<div class="invalid-feedback" id="user_misc_feedback">error for test</div>
4343
</div>
4444
</form>
4545
HTML
@@ -187,13 +187,13 @@ class BootstrapRadioButtonTest < ActionView::TestCase
187187
<div class="mb-3">
188188
<label class="form-label" for="user_misc">Misc</label>
189189
<div class="form-check">
190-
<input class="form-check-input is-invalid" id="user_misc_1" name="user[misc]" type="radio" value="1" />
190+
<input class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc]" type="radio" value="1" />
191191
<label class="form-check-label" for="user_misc_1"> Foo</label>
192192
</div>
193193
<div class="form-check">
194-
<input class="form-check-input is-invalid" id="user_misc_2" name="user[misc]" type="radio" value="2" />
194+
<input class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc]" type="radio" value="2" />
195195
<label class="form-check-label" for="user_misc_2"> Bar</label>
196-
<div class="invalid-feedback">error for test</div>
196+
<div class="invalid-feedback" id="user_misc_feedback">error for test</div>
197197
</div>
198198
</div>
199199
</form>

0 commit comments

Comments
 (0)