@@ -689,23 +689,36 @@ describe('typeahead tests', function() {
689
689
690
690
it ( 'should activate prev/next matches on up/down keys' , function ( ) {
691
691
changeInputValueTo ( element , 'b' ) ;
692
- expect ( element ) . toBeOpenWithActive ( 2 , 0 ) ;
692
+ var parentNode = element . find ( 'ul' ) . eq ( 0 ) [ 0 ] ;
693
+ var liIndex ;
694
+
695
+ liIndex = 0 ;
696
+ expect ( element ) . toBeOpenWithActive ( 2 , liIndex ) ;
697
+ expect ( parentNode . scrollTop ) . toEqual ( element . find ( 'li' ) . eq ( liIndex ) [ 0 ] . offsetTop ) ;
693
698
694
699
// Down arrow key
695
700
triggerKeyDown ( element , 40 ) ;
696
- expect ( element ) . toBeOpenWithActive ( 2 , 1 ) ;
701
+ liIndex = 1 ;
702
+ expect ( element ) . toBeOpenWithActive ( 2 , liIndex ) ;
703
+ expect ( parentNode . scrollTop ) . toEqual ( element . find ( 'li' ) . eq ( liIndex ) [ 0 ] . offsetTop ) ;
697
704
698
705
// Down arrow key goes back to first element
699
706
triggerKeyDown ( element , 40 ) ;
700
- expect ( element ) . toBeOpenWithActive ( 2 , 0 ) ;
707
+ liIndex = 0 ;
708
+ expect ( element ) . toBeOpenWithActive ( 2 , liIndex ) ;
709
+ expect ( parentNode . scrollTop ) . toEqual ( element . find ( 'li' ) . eq ( liIndex ) [ 0 ] . offsetTop ) ;
701
710
702
711
// Up arrow key goes back to last element
703
712
triggerKeyDown ( element , 38 ) ;
704
- expect ( element ) . toBeOpenWithActive ( 2 , 1 ) ;
713
+ liIndex = 1 ;
714
+ expect ( element ) . toBeOpenWithActive ( 2 , liIndex ) ;
715
+ expect ( parentNode . scrollTop ) . toEqual ( element . find ( 'li' ) . eq ( liIndex ) [ 0 ] . offsetTop ) ;
705
716
706
717
// Up arrow key goes back to first element
707
718
triggerKeyDown ( element , 38 ) ;
708
- expect ( element ) . toBeOpenWithActive ( 2 , 0 ) ;
719
+ liIndex = 0 ;
720
+ expect ( parentNode . scrollTop ) . toEqual ( element . find ( 'li' ) . eq ( liIndex ) [ 0 ] . offsetTop ) ;
721
+ expect ( element ) . toBeOpenWithActive ( 2 , liIndex ) ;
709
722
} ) ;
710
723
711
724
it ( 'should close popup on escape key' , function ( ) {
0 commit comments