|
68 | 68 |
|
69 | 69 | promise_test(async t => {
|
70 | 70 | addCloseCleanup(t);
|
71 |
| - // TODO(http://crbug.com/1350299): When focus for custom buttons is fixed, |
72 |
| - // then we shouldn't need to explicitly focus the custom button like this |
73 |
| - // anymore. |
74 |
| - const customButton = select.querySelector('button'); |
75 |
| - if (customButton) { |
76 |
| - customButton.focus(); |
77 |
| - } else { |
78 |
| - select.focus(); |
79 |
| - } |
| 71 | + select.focus(); |
80 | 72 | assert_false(select.matches(':open'),
|
81 | 73 | 'The select should initially be closed.');
|
82 | 74 | await test_driver.send_keys(document.activeElement, Space);
|
|
85 | 77 | 'The select should be open after pressing space.');
|
86 | 78 |
|
87 | 79 | await test_driver.send_keys(document.activeElement, Escape);
|
88 |
| - assert_equals(document.activeElement, customButton ? customButton : select, |
| 80 | + assert_equals(document.activeElement, select, |
89 | 81 | 'After dismissing the popover, the invoker button should be focused again.');
|
90 | 82 | }, `${id}: When the listbox is closed, spacebar should open the listbox.`);
|
91 | 83 |
|
|
131 | 123 | promise_test(async t => {
|
132 | 124 | addCloseCleanup(t);
|
133 | 125 |
|
134 |
| - // TODO(http://crbug.com/1350299): When focus for custom buttons is fixed, |
135 |
| - // then we shouldn't need to explicitly use the custom button like this |
136 |
| - // anymore. |
137 |
| - const customButton = select.querySelector('button'); |
138 |
| - if (customButton) { |
139 |
| - await test_driver.send_keys(customButton, Enter); |
140 |
| - } else { |
141 |
| - await test_driver.send_keys(select, Enter); |
142 |
| - } |
| 126 | + await test_driver.send_keys(select, Enter); |
143 | 127 | await new Promise(requestAnimationFrame);
|
144 | 128 | assert_false(select.matches(':open'),
|
145 | 129 | 'Enter should not open the listbox when outside a form.');
|
|
150 | 134 | event.preventDefault();
|
151 | 135 | formWasSubmitted = true;
|
152 | 136 | }, {once: true});
|
153 |
| - if (customButton) { |
154 |
| - await test_driver.send_keys(customButton, Enter); |
155 |
| - } else { |
156 |
| - await test_driver.send_keys(select, Enter); |
157 |
| - } |
| 137 | + await test_driver.send_keys(select, Enter); |
158 | 138 | await new Promise(requestAnimationFrame);
|
159 | 139 | assert_true(formWasSubmitted,
|
160 | 140 | 'Enter should submit the form when the listbox is closed.');
|
|
214 | 194 | promise_test(async t => {
|
215 | 195 | addCloseCleanup(t);
|
216 | 196 |
|
217 |
| - const customButton = select.querySelector('button'); |
218 |
| - if (customButton) { |
219 |
| - customButton.focus(); |
220 |
| - await test_driver.send_keys(customButton, Space); |
221 |
| - } else { |
222 |
| - select.focus(); |
223 |
| - await test_driver.send_keys(select, Space); |
224 |
| - } |
| 197 | + select.focus(); |
| 198 | + await test_driver.send_keys(select, Space); |
225 | 199 | assert_true(select.matches(':open'),
|
226 | 200 | 'Space should open the listbox.');
|
227 | 201 | assert_equals(document.activeElement, select.querySelector('.one'),
|
|
234 | 208 | // TODO(crbug.com/40263709): Remove this blur when focus on close is improved.
|
235 | 209 | document.activeElement.blur();
|
236 | 210 |
|
237 |
| - if (customButton) { |
238 |
| - customButton.focus(); |
239 |
| - await test_driver.send_keys(customButton, Space); |
240 |
| - } else { |
241 |
| - await test_driver.send_keys(select, Space); |
242 |
| - } |
| 211 | + await test_driver.send_keys(select, Space); |
243 | 212 | assert_true(select.matches(':open'),
|
244 | 213 | 'Second space should open the listbox.');
|
245 | 214 | assert_equals(document.activeElement, select.querySelector('.one'),
|
|
0 commit comments