Skip to content

Commit d8c3881

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Fix flicker in tests due to async update on activeNodeChange.
1 parent 6346c87 commit d8c3881

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,10 @@ describe('IgxGrid - Cell merging #grid', () => {
451451

452452
UIInteractions.simulateClickAndSelectEvent(row1.cells.toArray()[1].nativeElement);
453453
await wait(1);
454+
(grid as any)._activeRowIndexes = null;
454455
fix.detectChanges();
455456

457+
expect((grid as any).activeRowIndexes).toEqual([0, 0]);
456458
GridFunctions.verifyColumnMergedState(grid, col, [
457459
{ value: 'Ignite UI for JavaScript', span: 1 },
458460
{ value: 'Ignite UI for JavaScript', span: 1 },
@@ -548,8 +550,10 @@ describe('IgxGrid - Cell merging #grid', () => {
548550
const row1 = grid.rowList.toArray()[0];
549551
UIInteractions.simulateClickAndSelectEvent(row1.cells.toArray()[1].nativeElement);
550552
await wait(1);
553+
(grid as any)._activeRowIndexes = null;
551554
fix.detectChanges();
552555

556+
expect((grid as any).activeRowIndexes).toEqual([0, 0]);
553557
GridFunctions.verifyColumnMergedState(grid, col1, [
554558
{ value: 'Ignite UI for JavaScript', span: 1 },
555559
{ value: 'Ignite UI for JavaScript', span: 1 },
@@ -586,8 +590,10 @@ describe('IgxGrid - Cell merging #grid', () => {
586590
const row2 = grid.rowList.toArray()[1];
587591
UIInteractions.simulateClickAndSelectEvent(row2.cells.toArray()[1].nativeElement);
588592
await wait(1);
593+
(grid as any)._activeRowIndexes = null;
589594
fix.detectChanges();
590595

596+
expect((grid as any).activeRowIndexes).toEqual([1, 1]);
591597
GridFunctions.verifyColumnMergedState(grid, col1, [
592598
{ value: 'Ignite UI for JavaScript', span: 1 },
593599
{ value: 'Ignite UI for JavaScript', span: 1 },
@@ -627,8 +633,10 @@ describe('IgxGrid - Cell merging #grid', () => {
627633
const row3 = grid.rowList.toArray()[2];
628634
UIInteractions.simulateClickAndSelectEvent(row3.cells.toArray()[1].nativeElement);
629635
await wait(1);
636+
(grid as any)._activeRowIndexes = null;
630637
fix.detectChanges();
631638

639+
expect((grid as any).activeRowIndexes).toEqual([2, 2]);
632640
GridFunctions.verifyColumnMergedState(grid, col1, [
633641
{ value: 'Ignite UI for JavaScript', span: 2 },
634642
{ value: 'Ignite UI for Angular', span: 1 },

0 commit comments

Comments
 (0)