@@ -32,7 +32,7 @@ import {
32
32
} from '@angular/cdk/testing' ;
33
33
34
34
35
- fdescribe ( 'MdMenu' , ( ) => {
35
+ describe ( 'MdMenu' , ( ) => {
36
36
let overlayContainerElement : HTMLElement ;
37
37
let dir : Direction ;
38
38
@@ -364,8 +364,8 @@ fdescribe('MdMenu', () => {
364
364
* subject.openMenu();
365
365
*/
366
366
class OverlapSubject < T extends TestableMenu > {
367
- private readonly fixture : ComponentFixture < T > ;
368
- private readonly trigger : any ;
367
+ readonly fixture : ComponentFixture < T > ;
368
+ readonly trigger : any ;
369
369
370
370
constructor ( ctor : { new ( ) : T ; } , inputs : { [ key : string ] : any } = { } ) {
371
371
this . fixture = TestBed . createComponent ( ctor ) ;
@@ -383,6 +383,7 @@ fdescribe('MdMenu', () => {
383
383
return extendObject ( this . trigger . style , style ) ;
384
384
}
385
385
386
+
386
387
get overlayRect ( ) {
387
388
return this . overlayPane . getBoundingClientRect ( ) ;
388
389
}
@@ -444,11 +445,11 @@ fdescribe('MdMenu', () => {
444
445
445
446
it ( 'repositions the origin to be below, so the menu opens from the trigger' , ( ) => {
446
447
subject . openMenu ( ) ;
448
+ subject . fixture . detectChanges ( ) ;
447
449
448
450
expect ( subject . menuPanel ! . classList ) . toContain ( 'mat-menu-below' ) ;
449
451
expect ( subject . menuPanel ! . classList ) . not . toContain ( 'mat-menu-above' ) ;
450
452
} ) ;
451
-
452
453
} ) ;
453
454
} ) ;
454
455
@@ -805,7 +806,7 @@ fdescribe('MdMenu', () => {
805
806
fixture . detectChanges ( ) ;
806
807
807
808
const triggerRect = overlay . querySelector ( '#level-one-trigger' ) ! . getBoundingClientRect ( ) ;
808
- const panelRect = overlay . querySelectorAll ( '.mat-menu-panel ' ) [ 1 ] . getBoundingClientRect ( ) ;
809
+ const panelRect = overlay . querySelectorAll ( '.cdk-overlay-pane ' ) [ 1 ] . getBoundingClientRect ( ) ;
809
810
810
811
expect ( Math . round ( triggerRect . right ) ) . toBe ( Math . round ( panelRect . left ) ) ;
811
812
expect ( Math . round ( triggerRect . top ) ) . toBe ( Math . round ( panelRect . top ) + MENU_PANEL_TOP_PADDING ) ;
@@ -823,7 +824,7 @@ fdescribe('MdMenu', () => {
823
824
fixture . detectChanges ( ) ;
824
825
825
826
const triggerRect = overlay . querySelector ( '#level-one-trigger' ) ! . getBoundingClientRect ( ) ;
826
- const panelRect = overlay . querySelectorAll ( '.mat-menu-panel ' ) [ 1 ] . getBoundingClientRect ( ) ;
827
+ const panelRect = overlay . querySelectorAll ( '.cdk-overlay-pane ' ) [ 1 ] . getBoundingClientRect ( ) ;
827
828
828
829
expect ( Math . round ( triggerRect . left ) ) . toBe ( Math . round ( panelRect . right ) ) ;
829
830
expect ( Math . round ( triggerRect . top ) ) . toBe ( Math . round ( panelRect . top ) + MENU_PANEL_TOP_PADDING ) ;
@@ -842,32 +843,28 @@ fdescribe('MdMenu', () => {
842
843
fixture . detectChanges ( ) ;
843
844
844
845
const triggerRect = overlay . querySelector ( '#level-one-trigger' ) ! . getBoundingClientRect ( ) ;
845
- const panelRect = overlay . querySelectorAll ( '.mat-menu-panel ' ) [ 1 ] . getBoundingClientRect ( ) ;
846
+ const panelRect = overlay . querySelectorAll ( '.cdk-overlay-pane ' ) [ 1 ] . getBoundingClientRect ( ) ;
846
847
847
848
expect ( Math . round ( triggerRect . left ) ) . toBe ( Math . round ( panelRect . right ) ) ;
848
849
expect ( Math . round ( triggerRect . top ) ) . toBe ( Math . round ( panelRect . top ) + MENU_PANEL_TOP_PADDING ) ;
849
850
} ) ;
850
851
851
- fit ( 'should fall back to aligning to the right edge of the trigger in rtl' , fakeAsync ( ( ) => {
852
+ it ( 'should fall back to aligning to the right edge of the trigger in rtl' , fakeAsync ( ( ) => {
852
853
dir = 'rtl' ;
853
854
compileTestComponent ( ) ;
854
855
instance . rootTriggerEl . nativeElement . style . position = 'fixed' ;
855
856
instance . rootTriggerEl . nativeElement . style . left = '10px' ;
856
857
instance . rootTriggerEl . nativeElement . style . top = '50%' ;
857
858
instance . rootTrigger . openMenu ( ) ;
858
859
fixture . detectChanges ( ) ;
859
- tick ( 1000 ) ;
860
+ tick ( 500 ) ;
860
861
861
862
instance . levelOneTrigger . openMenu ( ) ;
862
863
fixture . detectChanges ( ) ;
863
- tick ( 1000 ) ;
864
-
865
-
866
- fixture . detectChanges ( ) ;
867
- tick ( 1000 ) ;
864
+ tick ( 500 ) ;
868
865
869
866
const triggerRect = overlay . querySelector ( '#level-one-trigger' ) ! . getBoundingClientRect ( ) ;
870
- const panelRect = overlay . querySelectorAll ( '.mat-menu-panel ' ) [ 1 ] . getBoundingClientRect ( ) ;
867
+ const panelRect = overlay . querySelectorAll ( '.cdk-overlay-pane ' ) [ 1 ] . getBoundingClientRect ( ) ;
871
868
872
869
expect ( Math . round ( triggerRect . right ) ) . toBe ( Math . round ( panelRect . left ) ) ;
873
870
expect ( Math . round ( triggerRect . top ) ) . toBe ( Math . round ( panelRect . top ) + MENU_PANEL_TOP_PADDING ) ;
0 commit comments