Skip to content

Commit 6b46beb

Browse files
lcreidlcreid
committed
Fix edge tests
1 parent 2e73894 commit 6b46beb

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

‎test/bootstrap_selects_test.rb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -490,9 +490,9 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
490490
<div class="mb-3">
491491
<label class="form-label" for="user_misc">Misc</label>
492492
<div class="rails-bootstrap-forms-time-select">
493-
<input #{autocomplete_attr_55336} id="user_misc_1i" name="user[misc(1i)]" type="hidden" value="2012" />
494-
<input #{autocomplete_attr_55336} id="user_misc_2i" name="user[misc(2i)]" type="hidden" value="2" />
495-
<input #{autocomplete_attr_55336} id="user_misc_3i" name="user[misc(3i)]" type="hidden" value="3" />
493+
<input #{autocomplete_attr_time_selects} id="user_misc_1i" name="user[misc(1i)]" type="hidden" value="2012" />
494+
<input #{autocomplete_attr_time_selects} id="user_misc_2i" name="user[misc(2i)]" type="hidden" value="2" />
495+
<input #{autocomplete_attr_time_selects} id="user_misc_3i" name="user[misc(3i)]" type="hidden" value="3" />
496496
<select class="form-select" id="user_misc_4i" name="user[misc(4i)]">
497497
#{options_range(start: '00', stop: '23', selected: '12')}
498498
</select>
@@ -515,9 +515,9 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
515515
<div class="mb-3">
516516
<label class="form-label" for="user_misc">Misc</label>
517517
<div class="rails-bootstrap-forms-time-select">
518-
<input #{autocomplete_attr_55336} id="user_misc_1i" name="user[misc(1i)]" type="hidden" value="2012" />
519-
<input #{autocomplete_attr_55336} id="user_misc_2i" name="user[misc(2i)]" type="hidden" value="2" />
520-
<input #{autocomplete_attr_55336} id="user_misc_3i" name="user[misc(3i)]" type="hidden" value="3" />
518+
<input #{autocomplete_attr_time_selects} id="user_misc_1i" name="user[misc(1i)]" type="hidden" value="2012" />
519+
<input #{autocomplete_attr_time_selects} id="user_misc_2i" name="user[misc(2i)]" type="hidden" value="2" />
520+
<input #{autocomplete_attr_time_selects} id="user_misc_3i" name="user[misc(3i)]" type="hidden" value="3" />
521521
<select class="form-select is-invalid" id="user_misc_4i" name="user[misc(4i)]">
522522
#{options_range(start: '00', stop: '23', selected: '12')}
523523
</select>
@@ -540,9 +540,9 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
540540
<div class="mb-3">
541541
<label class="form-label" for="user_misc">Misc</label>
542542
<div class="rails-bootstrap-forms-time-select">
543-
<input #{autocomplete_attr_55336} id="user_misc_1i" name="user[misc(1i)]" type="hidden" value="1" />
544-
<input #{autocomplete_attr_55336} id="user_misc_2i" name="user[misc(2i)]" type="hidden" value="1" />
545-
<input #{autocomplete_attr_55336} id="user_misc_3i" name="user[misc(3i)]" type="hidden" value="1" />
543+
<input #{autocomplete_attr_time_selects} id="user_misc_1i" name="user[misc(1i)]" type="hidden" value="1" />
544+
<input #{autocomplete_attr_time_selects} id="user_misc_2i" name="user[misc(2i)]" type="hidden" value="1" />
545+
<input #{autocomplete_attr_time_selects} id="user_misc_3i" name="user[misc(3i)]" type="hidden" value="1" />
546546
<select class="form-select" id="user_misc_4i" name="user[misc(4i)]">
547547
#{blank_option}
548548
#{options_range(start: '00', stop: '23')}
@@ -565,9 +565,9 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
565565
<div class="mb-3">
566566
<label class="form-label" for="user_misc">Misc</label>
567567
<div class="rails-bootstrap-forms-time-select">
568-
<input #{autocomplete_attr_55336} id="user_misc_1i" name="user[misc(1i)]" type="hidden" value="1" />
569-
<input #{autocomplete_attr_55336} id="user_misc_2i" name="user[misc(2i)]" type="hidden" value="1" />
570-
<input #{autocomplete_attr_55336} id="user_misc_3i" name="user[misc(3i)]" type="hidden" value="1" />
568+
<input #{autocomplete_attr_time_selects} id="user_misc_1i" name="user[misc(1i)]" type="hidden" value="1" />
569+
<input #{autocomplete_attr_time_selects} id="user_misc_2i" name="user[misc(2i)]" type="hidden" value="1" />
570+
<input #{autocomplete_attr_time_selects} id="user_misc_3i" name="user[misc(3i)]" type="hidden" value="1" />
571571
<select class="form-select my-time-select" id="user_misc_4i" name="user[misc(4i)]">
572572
#{blank_option}
573573
#{options_range(start: '00', stop: '23')}

‎test/test_helper.rb‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,16 @@ def autocomplete_attr
9494
Rails::VERSION::STRING >= "8.1" ? "" : 'autocomplete="off"'
9595
end
9696

97-
# Once https://github.com/rails/rails/pull/55336 is merged this can be removed.
97+
# Once https://github.com/rails/rails/pull/55336 is in a released version this can be removed.
9898
def autocomplete_attr_55336
99+
return "" if Rails::VERSION::STRING > "8.1.0"
100+
101+
'autocomplete="off"'
102+
end
103+
104+
# `time_select` doesn't seem to have changed. Some evidence that it's an oversight can be found,
105+
# but not for sure.
106+
def autocomplete_attr_time_selects
99107
'autocomplete="off"'
100108
end
101109
end

0 commit comments

Comments
 (0)