Skip to content

Commit 7862011

Browse files
committed
chore(*): update missed tests
1 parent ad33d95 commit 7862011

File tree

4 files changed

+48
-18
lines changed

4 files changed

+48
-18
lines changed

projects/igniteui-angular/src/lib/grids/grid/grid-multi-cell-selection.spec.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,10 +1744,11 @@ describe('IgxGrid - Multi Cell selection', () => {
17441744
expect(grid.getSelectedData()).toEqual(fData);
17451745
}));
17461746

1747-
it('Paging: selected range should be cleared on paging', () => {
1747+
it('Paging: selected range should be cleared on paging', fakeAsync(() => {
17481748
grid.paging = true;
17491749
grid.perPage = 5;
17501750
fix.detectChanges();
1751+
tick(16);
17511752

17521753
const range = { rowStart: 1, rowEnd: 4, columnStart: 'ID', columnEnd: 'HireDate' };
17531754
grid.selectRange(range);
@@ -1763,17 +1764,19 @@ describe('IgxGrid - Multi Cell selection', () => {
17631764
expect(grid.getSelectedData()).toEqual(selectedData);
17641765
grid.paginate(1);
17651766
fix.detectChanges();
1767+
tick(16);
17661768

17671769
expect(grid.getSelectedRanges().length).toBe(0);
17681770
expect(grid.getSelectedRanges()).toEqual([]);
17691771
expect(grid.getSelectedData().length).toBe(0);
17701772
expect(grid.getSelectedData()).toEqual([]);
1771-
});
1773+
}));
17721774

1773-
it('Paging: selected range should be cleared when perPage items are changed', () => {
1775+
it('Paging: selected range should be cleared when perPage items are changed', fakeAsync(() => {
17741776
grid.paging = true;
17751777
grid.perPage = 5;
17761778
fix.detectChanges();
1779+
tick(16);
17771780

17781781
const range = { rowStart: 2, rowEnd: 4, columnStart: 'ID', columnEnd: 'OnPTO' };
17791782
grid.selectRange(range);
@@ -1789,12 +1792,13 @@ describe('IgxGrid - Multi Cell selection', () => {
17891792
expect(grid.getSelectedData()).toEqual(selectedData);
17901793
grid.perPage = 7;
17911794
fix.detectChanges();
1795+
tick(16);
17921796

17931797
expect(grid.getSelectedRanges().length).toBe(0);
17941798
expect(grid.getSelectedRanges()).toEqual([]);
17951799
expect(grid.getSelectedData().length).toBe(0);
17961800
expect(grid.getSelectedData()).toEqual([]);
1797-
});
1801+
}));
17981802

17991803
xit('Resizing: selected range should not change on resizing', fakeAsync(() => {
18001804
const range = { rowStart: 2, rowEnd: 4, columnStart: 'ID', columnEnd: 'HireDate' };

projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,14 +2088,16 @@ describe('IgxGrid - Summaries', () => {
20882088
verifyBaseSummaries(fix);
20892089
}));
20902090

2091-
it('Paging: should render correct summaries when paging is enable and position is top', () => {
2091+
it('Paging: should render correct summaries when paging is enable and position is top', fakeAsync(() => {
20922092
grid.paging = true;
20932093
grid.perPage = 2;
20942094
grid.summaryPosition = 'top';
20952095
fix.detectChanges();
2096+
tick(16);
20962097

20972098
grid.page = 1;
20982099
fix.detectChanges();
2100+
tick(16);
20992101

21002102
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(3);
21012103
verifyBaseSummaries(fix);
@@ -2104,10 +2106,12 @@ describe('IgxGrid - Summaries', () => {
21042106

21052107
grid.page = 2;
21062108
fix.detectChanges();
2109+
tick(16);
2110+
21072111
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(2);
21082112
verifySummariesForParentID147(fix, 1);
21092113
verifyBaseSummaries(fix);
2110-
});
2114+
}));
21112115

21122116
it('CRUD: Add grouped item', () => {
21132117
const newRow = {

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-expanding.spec.ts

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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', () => {

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-summaries.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,12 @@ describe('IgxTreeGrid - Summaries ', () => {
437437
verifySummaryForRow317(fix, 2);
438438
}));
439439

440-
it('Paging: should render correct summaries when paging is enable and position is top', () => {
440+
it('Paging: should render correct summaries when paging is enable and position is top', fakeAsync(() => {
441441
treeGrid.paging = true;
442442
treeGrid.perPage = 4;
443443
treeGrid.summaryPosition = 'top';
444444
fix.detectChanges();
445+
tick(16);
445446

446447
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(1);
447448
verifyTreeBaseSummaries(fix);
@@ -462,6 +463,7 @@ describe('IgxTreeGrid - Summaries ', () => {
462463

463464
treeGrid.page = 1;
464465
fix.detectChanges();
466+
tick(16);
465467

466468
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(1);
467469
verifyTreeBaseSummaries(fix);
@@ -471,7 +473,7 @@ describe('IgxTreeGrid - Summaries ', () => {
471473

472474
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(2);
473475
verifySummaryForRow847(fix, 3);
474-
});
476+
}));
475477

476478
it('CRUD: Add root node', () => {
477479
treeGrid.expandAll();

0 commit comments

Comments
 (0)