@@ -366,8 +366,8 @@ describe('MatMenu', () => {
366
366
* subject.openMenu();
367
367
*/
368
368
class OverlapSubject < T extends TestableMenu > {
369
- private readonly fixture : ComponentFixture < T > ;
370
- private readonly trigger : any ;
369
+ readonly fixture : ComponentFixture < T > ;
370
+ readonly trigger : any ;
371
371
372
372
constructor ( ctor : { new ( ) : T ; } , inputs : { [ key : string ] : any } = { } ) {
373
373
this . fixture = TestBed . createComponent ( ctor ) ;
@@ -385,6 +385,7 @@ describe('MatMenu', () => {
385
385
return extendObject ( this . trigger . style , style ) ;
386
386
}
387
387
388
+
388
389
get overlayRect ( ) {
389
390
return this . overlayPane . getBoundingClientRect ( ) ;
390
391
}
@@ -446,11 +447,11 @@ describe('MatMenu', () => {
446
447
447
448
it ( 'repositions the origin to be below, so the menu opens from the trigger' , ( ) => {
448
449
subject . openMenu ( ) ;
450
+ subject . fixture . detectChanges ( ) ;
449
451
450
452
expect ( subject . menuPanel ! . classList ) . toContain ( 'mat-menu-below' ) ;
451
453
expect ( subject . menuPanel ! . classList ) . not . toContain ( 'mat-menu-above' ) ;
452
454
} ) ;
453
-
454
455
} ) ;
455
456
} ) ;
456
457
@@ -821,7 +822,7 @@ describe('MatMenu', () => {
821
822
fixture . detectChanges ( ) ;
822
823
823
824
const triggerRect = overlay . querySelector ( '#level-one-trigger' ) ! . getBoundingClientRect ( ) ;
824
- const panelRect = overlay . querySelectorAll ( '.mat-menu-panel ' ) [ 1 ] . getBoundingClientRect ( ) ;
825
+ const panelRect = overlay . querySelectorAll ( '.cdk-overlay-pane ' ) [ 1 ] . getBoundingClientRect ( ) ;
825
826
826
827
expect ( Math . round ( triggerRect . right ) ) . toBe ( Math . round ( panelRect . left ) ) ;
827
828
expect ( Math . round ( triggerRect . top ) ) . toBe ( Math . round ( panelRect . top ) + MENU_PANEL_TOP_PADDING ) ;
@@ -839,7 +840,7 @@ describe('MatMenu', () => {
839
840
fixture . detectChanges ( ) ;
840
841
841
842
const triggerRect = overlay . querySelector ( '#level-one-trigger' ) ! . getBoundingClientRect ( ) ;
842
- const panelRect = overlay . querySelectorAll ( '.mat-menu-panel ' ) [ 1 ] . getBoundingClientRect ( ) ;
843
+ const panelRect = overlay . querySelectorAll ( '.cdk-overlay-pane ' ) [ 1 ] . getBoundingClientRect ( ) ;
843
844
844
845
expect ( Math . round ( triggerRect . left ) ) . toBe ( Math . round ( panelRect . right ) ) ;
845
846
expect ( Math . round ( triggerRect . top ) ) . toBe ( Math . round ( panelRect . top ) + MENU_PANEL_TOP_PADDING ) ;
@@ -858,32 +859,28 @@ describe('MatMenu', () => {
858
859
fixture . detectChanges ( ) ;
859
860
860
861
const triggerRect = overlay . querySelector ( '#level-one-trigger' ) ! . getBoundingClientRect ( ) ;
861
- const panelRect = overlay . querySelectorAll ( '.mat-menu-panel ' ) [ 1 ] . getBoundingClientRect ( ) ;
862
+ const panelRect = overlay . querySelectorAll ( '.cdk-overlay-pane ' ) [ 1 ] . getBoundingClientRect ( ) ;
862
863
863
864
expect ( Math . round ( triggerRect . left ) ) . toBe ( Math . round ( panelRect . right ) ) ;
864
865
expect ( Math . round ( triggerRect . top ) ) . toBe ( Math . round ( panelRect . top ) + MENU_PANEL_TOP_PADDING ) ;
865
866
} ) ;
866
867
867
- fit ( 'should fall back to aligning to the right edge of the trigger in rtl' , fakeAsync ( ( ) => {
868
+ it ( 'should fall back to aligning to the right edge of the trigger in rtl' , fakeAsync ( ( ) => {
868
869
dir = 'rtl' ;
869
870
compileTestComponent ( ) ;
870
871
instance . rootTriggerEl . nativeElement . style . position = 'fixed' ;
871
872
instance . rootTriggerEl . nativeElement . style . left = '10px' ;
872
873
instance . rootTriggerEl . nativeElement . style . top = '50%' ;
873
874
instance . rootTrigger . openMenu ( ) ;
874
875
fixture . detectChanges ( ) ;
875
- tick ( 1000 ) ;
876
+ tick ( 500 ) ;
876
877
877
878
instance . levelOneTrigger . openMenu ( ) ;
878
879
fixture . detectChanges ( ) ;
879
- tick ( 1000 ) ;
880
-
881
-
882
- fixture . detectChanges ( ) ;
883
- tick ( 1000 ) ;
880
+ tick ( 500 ) ;
884
881
885
882
const triggerRect = overlay . querySelector ( '#level-one-trigger' ) ! . getBoundingClientRect ( ) ;
886
- const panelRect = overlay . querySelectorAll ( '.mat-menu-panel ' ) [ 1 ] . getBoundingClientRect ( ) ;
883
+ const panelRect = overlay . querySelectorAll ( '.cdk-overlay-pane ' ) [ 1 ] . getBoundingClientRect ( ) ;
887
884
888
885
expect ( Math . round ( triggerRect . right ) ) . toBe ( Math . round ( panelRect . left ) ) ;
889
886
expect ( Math . round ( triggerRect . top ) ) . toBe ( Math . round ( panelRect . top ) + MENU_PANEL_TOP_PADDING ) ;
0 commit comments