@@ -288,40 +288,34 @@ test.describe('Keyboard Behavior', () => {
288
288
test ( `GIVEN an open hero select
289
289
WHEN pressing the end key
290
290
THEN the last option should have data-highlighted` , async ( { page } ) => {
291
- const {
292
- getTrigger,
293
- getItemAt : getOptionAt ,
294
- openListbox,
295
- } = await setup ( page , 'hero' ) ;
291
+ const { driver : d } = await setup ( page , 'hero' ) ;
296
292
297
- await openListbox ( 'click' ) ;
293
+ await d . openListbox ( 'click' ) ;
298
294
299
- await getTrigger ( ) . focus ( ) ;
300
- await getTrigger ( ) . press ( 'End' ) ;
295
+ await d . getItemAt ( 0 ) . focus ( ) ;
296
+ await d . getItemAt ( 0 ) . press ( 'End' ) ;
301
297
302
- await expect ( getOptionAt ( 'last' ) ) . toHaveAttribute ( 'data-highlighted' ) ;
298
+ await expect ( d . getItemAt ( 'last' ) ) . toHaveAttribute ( 'data-highlighted' ) ;
303
299
} ) ;
304
300
305
301
test ( `GIVEN an open hero select
306
302
WHEN pressing the home key after the end key
307
303
THEN the first option should have data-highlighted` , async ( { page } ) => {
308
- const {
309
- getTrigger,
310
- getItemAt : getOptionAt ,
311
- openListbox,
312
- } = await setup ( page , 'hero' ) ;
304
+ const { driver : d } = await setup ( page , 'hero' ) ;
313
305
314
- await openListbox ( 'click' ) ;
306
+ await d . openListbox ( 'click' ) ;
315
307
316
308
// to last index
317
- await getTrigger ( ) . focus ( ) ;
318
- await getTrigger ( ) . press ( 'End' ) ;
309
+ await d . getItemAt ( 0 ) . focus ( ) ;
310
+ await d . getItemAt ( 0 ) . press ( 'End' ) ;
319
311
320
- await expect ( getOptionAt ( 'last' ) ) . toHaveAttribute ( 'data-highlighted' ) ;
312
+ await expect ( d . getItemAt ( 'last' ) ) . toHaveAttribute ( 'data-highlighted' ) ;
321
313
322
314
// to first index
323
- await getTrigger ( ) . press ( 'Home' ) ;
324
- await expect ( getOptionAt ( 0 ) ) . toHaveAttribute ( 'data-highlighted' ) ;
315
+ const itemsLength = await d . getItemsLength ( ) ;
316
+ const lastItem = d . getItemAt ( itemsLength - 1 ) ;
317
+ await lastItem . press ( 'Home' ) ;
318
+ await expect ( d . getItemAt ( 0 ) ) . toHaveAttribute ( 'data-highlighted' ) ;
325
319
} ) ;
326
320
327
321
test ( `GIVEN an open hero select
0 commit comments