@@ -328,13 +328,16 @@ describe('IgxTreeGrid - Expanding / Collapsing ', () => {
328328 expect ( treeGrid . totalPages ) . toBe ( 1 ) ;
329329 } ) ;
330330
331- it ( 'Should update the paginator when a row of any level is expanded' , ( ) => {
331+ it ( 'Should update the paginator when a row of any level is expanded' , fakeAsync ( ( ) => {
332332 // Test prerequisites
333333 treeGrid . paging = true ;
334334 treeGrid . perPage = 5 ;
335335 fix . detectChanges ( ) ;
336+ tick ( 16 ) ;
337+
336338 treeGrid . collapseAll ( ) ;
337339 fix . detectChanges ( ) ;
340+ tick ( 16 ) ;
338341
339342 // Verify current page
340343 verifyGridPager ( fix , 4 , '147' , '1 of 1' , [ true , true , true , true ] ) ;
@@ -356,21 +359,26 @@ describe('IgxTreeGrid - Expanding / Collapsing ', () => {
356359
357360 treeGrid . page = 1 ;
358361 fix . detectChanges ( ) ;
362+ tick ( 16 ) ;
363+
359364 indicatorDivDOM = TreeGridFunctions . getExpansionIndicatorDiv ( rowsDOM [ 1 ] ) ;
360365 indicatorDivDOM . triggerEventHandler ( 'click' , new Event ( 'click' ) ) ;
361366
362367 // Verify current page
363368 verifyGridPager ( fix , 5 , '17' , '2 of 3' , [ false , false , false , false ] ) ;
364369 expect ( treeGrid . totalPages ) . toBe ( 3 ) ;
365- } ) ;
370+ } ) ) ;
366371
367- it ( 'Should update the paginator when a row of any level is collapsed' , ( ) => {
372+ it ( 'Should update the paginator when a row of any level is collapsed' , fakeAsync ( ( ) => {
368373 // Test prerequisites
369374 treeGrid . paging = true ;
370375 treeGrid . perPage = 5 ;
371376 fix . detectChanges ( ) ;
377+ tick ( 16 ) ;
378+
372379 treeGrid . expandAll ( ) ;
373380 fix . detectChanges ( ) ;
381+ tick ( 16 ) ;
374382
375383 // Verify current page
376384 verifyGridPager ( fix , 5 , '147' , '1 of 4' , [ true , true , false , false ] ) ;
@@ -379,6 +387,7 @@ describe('IgxTreeGrid - Expanding / Collapsing ', () => {
379387 // Go to third page
380388 treeGrid . page = 2 ;
381389 fix . detectChanges ( ) ;
390+ tick ( 16 ) ;
382391 verifyGridPager ( fix , 5 , '19' , '3 of 4' , [ false , false , false , false ] ) ;
383392 expect ( treeGrid . totalPages ) . toBe ( 4 ) ;
384393
@@ -396,13 +405,14 @@ describe('IgxTreeGrid - Expanding / Collapsing ', () => {
396405
397406 treeGrid . page = 0 ;
398407 fix . detectChanges ( ) ;
408+ tick ( 16 ) ;
399409 indicatorDivDOM = TreeGridFunctions . getExpansionIndicatorDiv ( rowsDOM [ 0 ] ) ;
400410 indicatorDivDOM . triggerEventHandler ( 'click' , new Event ( 'click' ) ) ;
401411
402412 // // Verify current page
403413 verifyGridPager ( fix , 5 , '147' , '1 of 2' , [ true , true , false , false ] ) ;
404414 expect ( treeGrid . totalPages ) . toBe ( 2 ) ;
405- } ) ;
415+ } ) ) ;
406416
407417 it ( 'Should update the paginator when navigating through pages' , ( ) => {
408418 // Test prerequisites
@@ -731,13 +741,16 @@ describe('IgxTreeGrid - Expanding / Collapsing ', () => {
731741 tick ( 16 ) ;
732742 } ) ) ;
733743
734- it ( 'Should update the paginator when a row of any level is expanded' , ( ) => {
744+ it ( 'Should update the paginator when a row of any level is expanded' , fakeAsync ( ( ) => {
735745 // Test prerequisites
736746 treeGrid . paging = true ;
737747 treeGrid . perPage = 5 ;
738748 fix . detectChanges ( ) ;
749+ tick ( 16 ) ;
750+
739751 treeGrid . collapseAll ( ) ;
740752 fix . detectChanges ( ) ;
753+ tick ( 16 ) ;
741754
742755 // Verify current page
743756 verifyGridPager ( fix , 3 , '1' , '1 of 1' , [ true , true , true , true ] ) ;
@@ -762,21 +775,25 @@ describe('IgxTreeGrid - Expanding / Collapsing ', () => {
762775
763776 treeGrid . page = 1 ;
764777 fix . detectChanges ( ) ;
778+ tick ( 16 ) ;
765779 indicatorDivDOM = TreeGridFunctions . getExpansionIndicatorDiv ( rowsDOM [ 1 ] ) ;
766780 indicatorDivDOM . triggerEventHandler ( 'click' , new Event ( 'click' ) ) ;
767781
768782 // Verify current page
769783 verifyGridPager ( fix , 3 , '6' , '2 of 2' , [ false , false , true , true ] ) ;
770784 expect ( treeGrid . totalPages ) . toBe ( 2 ) ;
771- } ) ;
785+ } ) ) ;
772786
773- it ( 'Should update the paginator when a row of any level is collapsed' , ( ) => {
787+ it ( 'Should update the paginator when a row of any level is collapsed' , fakeAsync ( ( ) => {
774788 // Test prerequisites
775789 treeGrid . paging = true ;
776790 treeGrid . perPage = 5 ;
777791 fix . detectChanges ( ) ;
792+ tick ( 16 ) ;
793+
778794 treeGrid . expandAll ( ) ;
779795 fix . detectChanges ( ) ;
796+ tick ( 16 ) ;
780797
781798 // Verify current page
782799 verifyGridPager ( fix , 5 , '1' , '1 of 2' , [ true , true , false , false ] ) ;
@@ -795,13 +812,14 @@ describe('IgxTreeGrid - Expanding / Collapsing ', () => {
795812 // // Verify current page
796813 verifyGridPager ( fix , 3 , '1' , '1 of 1' , [ true , true , true , true ] ) ;
797814 expect ( treeGrid . totalPages ) . toBe ( 1 ) ;
798- } ) ;
815+ } ) ) ;
799816
800- it ( 'Should update the paginator when navigating through pages' , ( ) => {
817+ it ( 'Should update the paginator when navigating through pages' , fakeAsync ( ( ) => {
801818 // Test prerequisites
802819 treeGrid . paging = true ;
803820 treeGrid . perPage = 5 ;
804821 fix . detectChanges ( ) ;
822+ tick ( 16 ) ;
805823
806824 // Verify current page
807825 verifyGridPager ( fix , 3 , '1' , '1 of 1' , [ true , true , true , true ] ) ;
@@ -823,16 +841,18 @@ describe('IgxTreeGrid - Expanding / Collapsing ', () => {
823841 const paginator = tGrid . querySelectorAll ( '.igx-grid-paginator__pager > button' ) ;
824842 paginator [ 3 ] . dispatchEvent ( new Event ( 'click' ) ) ;
825843 fix . detectChanges ( ) ;
844+ tick ( 16 ) ;
826845 // Verify current page
827846 verifyGridPager ( fix , 1 , '9' , '2 of 2' , [ false , false , true , true ] ) ;
828847 expect ( treeGrid . totalPages ) . toBe ( 2 ) ;
829848
830849 paginator [ 1 ] . dispatchEvent ( new Event ( 'click' ) ) ;
831850 fix . detectChanges ( ) ;
851+ tick ( 16 ) ;
832852 // Verify current page
833853 verifyGridPager ( fix , 5 , '1' , '1 of 2' , [ true , true , false , false ] ) ;
834854 expect ( treeGrid . totalPages ) . toBe ( 2 ) ;
835- } ) ;
855+ } ) ) ;
836856 } ) ;
837857
838858 describe ( 'Load On Demand' , ( ) => {
0 commit comments