@@ -9,9 +9,10 @@ import { MenuItemDirective } from './menu-item.directive';
99@Component ( {
1010 selector : 'fd-menu-test' ,
1111 template : `
12- <fd-menu>
12+ <fd-menu fd-menu-addon >
1313 <ul fd-menu-list>
1414 <li fd-menu-item #element1>
15+ <div fd-menu-item-addon></div>
1516 Option 1
1617 </li>
1718 <li fd-menu-item #element2>
@@ -38,7 +39,7 @@ export class TestMenuComponent implements AfterViewInit {
3839 @ViewChild ( 'elementOutOfScope' ) elementOutOfScope : ElementRef ;
3940 @ViewChildren ( MenuItemDirective )
4041 menuItems : QueryList < MenuItemDirective > ;
41- public ngAfterViewInit ( ) : void { }
42+ public ngAfterViewInit ( ) : void { }
4243}
4344
4445
@@ -81,15 +82,15 @@ describe('MenuComponent', () => {
8182 it ( 'should focus second element' , ( ) => {
8283 const list = elements . map ( element => element . nativeElement ) ;
8384 spyOn ( list [ 1 ] , 'focus' ) ;
84- const event : any = { code : 'ArrowDown' , preventDefault : ( ) => { } } ;
85+ const event : any = { code : 'ArrowDown' , preventDefault : ( ) => { } } ;
8586 service . keyDownHandler ( event , 0 , items . toArray ( ) ) ;
8687 expect ( list [ 1 ] . focus ) . toHaveBeenCalled ( ) ;
8788 } ) ;
88-
89+
8990 it ( 'Should use default function and select last element, when encounter a beginning and arrow up' , ( ) => {
9091 const list = elements . map ( element => element . nativeElement ) ;
9192 spyOn ( list [ 3 ] , 'focus' ) ;
92- const event : any = { code : 'ArrowUp' , preventDefault : ( ) => { } } ;
93+ const event : any = { code : 'ArrowUp' , preventDefault : ( ) => { } } ;
9394 service . keyDownHandler ( event , 0 , items . toArray ( ) ) ;
9495 expect ( list [ 3 ] . focus ) . toHaveBeenCalled ( ) ;
9596 } ) ;
@@ -98,7 +99,7 @@ describe('MenuComponent', () => {
9899 const _elementOutOfScope = elementOutOfScope . nativeElement ;
99100 service . focusEscapeAfterList = ( ) => { _elementOutOfScope . focus ( ) ; } ;
100101 spyOn ( _elementOutOfScope , 'focus' ) ;
101- const event : any = { code : 'ArrowDown' , preventDefault : ( ) => { } } ;
102+ const event : any = { code : 'ArrowDown' , preventDefault : ( ) => { } } ;
102103 service . keyDownHandler ( event , 3 , items . toArray ( ) ) ;
103104 expect ( _elementOutOfScope . focus ) . toHaveBeenCalled ( ) ;
104105 } ) ;
@@ -107,7 +108,7 @@ describe('MenuComponent', () => {
107108 const _elementOutOfScope = elementOutOfScope . nativeElement ;
108109 service . focusEscapeBeforeList = ( ) => { _elementOutOfScope . focus ( ) ; } ;
109110 spyOn ( _elementOutOfScope , 'focus' ) ;
110- const event : any = { code : 'ArrowUp' , preventDefault : ( ) => { } } ;
111+ const event : any = { code : 'ArrowUp' , preventDefault : ( ) => { } } ;
111112 service . keyDownHandler ( event , 0 , items . toArray ( ) ) ;
112113 expect ( _elementOutOfScope . focus ) . toHaveBeenCalled ( ) ;
113114 } ) ;
0 commit comments