77 */
88
99import { Component } from '@angular/core' ;
10- import { TestBed } from '@angular/core/testing' ;
10+ import { ComponentFixture , TestBed } from '@angular/core/testing' ;
11+ import { HarnessLoader } from '@angular/cdk/testing' ;
1112import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed' ;
1213import { Menu } from '../menu' ;
1314import { MenuContent } from '../menu-content' ;
@@ -17,22 +18,19 @@ import {MenuBar} from '../menu-bar';
1718import { MenuItemHarness , MenuHarness } from './menu-harness' ;
1819
1920describe ( 'Aria Menu Harness' , ( ) => {
20- let fixture : any ;
21- let loader : any ;
21+ let fixture : ComponentFixture < MenuTestApp > ;
22+ let loader : HarnessLoader ;
2223
2324 beforeEach ( ( ) => {
24- TestBed . configureTestingModule ( {
25- imports : [ Menu , MenuItem , MenuTrigger , MenuBar , MenuContent , MenuTestApp ] ,
26- } ) ;
27-
2825 fixture = TestBed . createComponent ( MenuTestApp ) ;
2926 fixture . detectChanges ( ) ;
3027 loader = TestbedHarnessEnvironment . loader ( fixture ) ;
3128 } ) ;
3229
3330 it ( 'should locate the menu harness' , async ( ) => {
34- const menu = await loader . getHarness ( MenuHarness . with ( { triggerText : 'Open Menu' } ) ) ;
35- expect ( menu ) . toBeTruthy ( ) ;
31+ await expectAsync (
32+ loader . getHarness ( MenuHarness . with ( { triggerText : 'Open Menu' } ) ) ,
33+ ) . toBeResolved ( ) ;
3634 } ) ;
3735
3836 it ( 'should verify that the menu is initially closed' , async ( ) => {
@@ -88,7 +86,6 @@ describe('Aria Menu Harness', () => {
8886 fixture . detectChanges ( ) ;
8987
9088 const submenu = await subItem . getSubmenu ( ) ;
91- expect ( submenu ) . toBeTruthy ( ) ;
9289 expect ( await submenu ! . isOpen ( ) ) . toBe ( true ) ;
9390 } ) ;
9491
@@ -109,7 +106,6 @@ describe('Aria Menu Harness', () => {
109106
110107 it ( 'should confirm persistent horizontal menu bars are always open' , async ( ) => {
111108 const menubar = await loader . getHarness ( MenuHarness . with ( { selector : '[ngMenuBar]' } ) ) ;
112- expect ( menubar ) . toBeTruthy ( ) ;
113109 expect ( await menubar . isOpen ( ) ) . toBe ( true ) ;
114110 } ) ;
115111
0 commit comments