@@ -609,7 +609,8 @@ describe('MatBottomSheet', () => {
609
609
} ) ;
610
610
611
611
viewContainerFixture . detectChanges ( ) ;
612
- flushMicrotasks ( ) ;
612
+ flush ( ) ;
613
+ viewContainerFixture . detectChanges ( ) ;
613
614
614
615
expect ( document . activeElement ! . tagName )
615
616
. withContext ( 'Expected bottom sheet container to be focused.' )
@@ -658,7 +659,8 @@ describe('MatBottomSheet', () => {
658
659
} ) ;
659
660
660
661
viewContainerFixture . detectChanges ( ) ;
661
- flushMicrotasks ( ) ;
662
+ flush ( ) ;
663
+ viewContainerFixture . detectChanges ( ) ;
662
664
663
665
let container = overlayContainerElement . querySelector (
664
666
'.mat-bottom-sheet-container' ,
@@ -679,7 +681,8 @@ describe('MatBottomSheet', () => {
679
681
} ) ;
680
682
681
683
viewContainerFixture . detectChanges ( ) ;
682
- flushMicrotasks ( ) ;
684
+ flush ( ) ;
685
+ viewContainerFixture . detectChanges ( ) ;
683
686
684
687
let firstHeader = overlayContainerElement . querySelector (
685
688
'h1[tabindex="-1"]' ,
@@ -701,7 +704,8 @@ describe('MatBottomSheet', () => {
701
704
} ) ;
702
705
703
706
viewContainerFixture . detectChanges ( ) ;
704
- flushMicrotasks ( ) ;
707
+ flush ( ) ;
708
+ viewContainerFixture . detectChanges ( ) ;
705
709
706
710
let firstParagraph = overlayContainerElement . querySelector (
707
711
'p[tabindex="-1"]' ,
@@ -721,9 +725,10 @@ describe('MatBottomSheet', () => {
721
725
722
726
const bottomSheetRef = bottomSheet . open ( PizzaMsg , { viewContainerRef : testViewContainerRef } ) ;
723
727
724
- flushMicrotasks ( ) ;
728
+ flush ( ) ;
729
+ viewContainerFixture . detectChanges ( ) ;
730
+ flush ( ) ;
725
731
viewContainerFixture . detectChanges ( ) ;
726
- flushMicrotasks ( ) ;
727
732
728
733
expect ( document . activeElement ! . id ) . not . toBe (
729
734
'bottom-sheet-trigger' ,
@@ -736,7 +741,7 @@ describe('MatBottomSheet', () => {
736
741
'Expcted the focus not to have changed before the animation finishes.' ,
737
742
) ;
738
743
739
- flushMicrotasks ( ) ;
744
+ flush ( ) ;
740
745
viewContainerFixture . detectChanges ( ) ;
741
746
tick ( 500 ) ;
742
747
@@ -758,9 +763,10 @@ describe('MatBottomSheet', () => {
758
763
restoreFocus : false ,
759
764
} ) ;
760
765
761
- flushMicrotasks ( ) ;
766
+ flush ( ) ;
767
+ viewContainerFixture . detectChanges ( ) ;
768
+ flush ( ) ;
762
769
viewContainerFixture . detectChanges ( ) ;
763
- flushMicrotasks ( ) ;
764
770
765
771
expect ( document . activeElement ! . id ) . not . toBe (
766
772
'bottom-sheet-trigger' ,
@@ -773,7 +779,7 @@ describe('MatBottomSheet', () => {
773
779
'Expcted the focus not to have changed before the animation finishes.' ,
774
780
) ;
775
781
776
- flushMicrotasks ( ) ;
782
+ flush ( ) ;
777
783
viewContainerFixture . detectChanges ( ) ;
778
784
tick ( 500 ) ;
779
785
@@ -798,9 +804,10 @@ describe('MatBottomSheet', () => {
798
804
799
805
const bottomSheetRef = bottomSheet . open ( PizzaMsg , { viewContainerRef : testViewContainerRef } ) ;
800
806
801
- flushMicrotasks ( ) ;
807
+ flush ( ) ;
808
+ viewContainerFixture . detectChanges ( ) ;
809
+ flush ( ) ;
802
810
viewContainerFixture . detectChanges ( ) ;
803
- flushMicrotasks ( ) ;
804
811
805
812
expect ( document . activeElement ! . id ) . not . toBe (
806
813
'bottom-sheet-trigger' ,
0 commit comments