chore(*): Minor fixes and refactors for tests.

Author: MKirova

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-keyboard-nav.spec.ts

@@ -112,28 +112,36 @@ describe('IgxPivotGrid - Keyboard navigation #pivotGrid', () => {
     });
 
     it('should allow navigating between column headers', () => {
-        const [firstHeader, secondHeader] = fixture.debugElement.queryAll(
-            By.css(`${PIVOT_HEADER_ROW} ${HEADER_CELL_CSS_CLASS}`));
+        let firstHeader = fixture.debugElement.queryAll(
+            By.css(`${PIVOT_HEADER_ROW} ${HEADER_CELL_CSS_CLASS}`))[0];
         UIInteractions.simulateClickAndSelectEvent(firstHeader);
         fixture.detectChanges();
 
+        firstHeader = fixture.debugElement.queryAll(
+            By.css(`${PIVOT_HEADER_ROW} ${HEADER_CELL_CSS_CLASS}`))[0];
         GridFunctions.verifyHeaderIsFocused(firstHeader.parent);
         let  activeCells = fixture.debugElement.queryAll(By.css(`${ACTIVE_CELL_CSS_CLASS}`));
         expect(activeCells.length).toBe(1);
 
-        UIInteractions.triggerKeyDownEvtUponElem('ArrowRight', firstHeader.nativeElement);
+        UIInteractions.triggerKeyDownEvtUponElem('ArrowRight', pivotGrid.theadRow.nativeElement);
         fixture.detectChanges();
+        
+        const secondHeader = fixture.debugElement.queryAll(
+            By.css(`${PIVOT_HEADER_ROW} ${HEADER_CELL_CSS_CLASS}`))[1];
         GridFunctions.verifyHeaderIsFocused(secondHeader.parent);
         activeCells = fixture.debugElement.queryAll(By.css(`${ACTIVE_CELL_CSS_CLASS}`));
         expect(activeCells.length).toBe(1);
     });
 
     it('should allow navigating from first to last column headers', async () => {
-        const [firstHeader] = fixture.debugElement.queryAll(
-            By.css(`${PIVOT_HEADER_ROW} ${HEADER_CELL_CSS_CLASS}`));
+        let firstHeader = fixture.debugElement.queryAll(
+            By.css(`${PIVOT_HEADER_ROW} ${HEADER_CELL_CSS_CLASS}`))[0];
         UIInteractions.simulateClickAndSelectEvent(firstHeader);
         fixture.detectChanges();
 
+        firstHeader = fixture.debugElement.queryAll(
+            By.css(`${PIVOT_HEADER_ROW} ${HEADER_CELL_CSS_CLASS}`))[0];
+
         GridFunctions.verifyHeaderIsFocused(firstHeader.parent);
         let activeCells = fixture.debugElement.queryAll(By.css(`${ACTIVE_CELL_CSS_CLASS}`));
         expect(activeCells.length).toBe(1);

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

@@ -303,7 +303,7 @@ describe('Basic IgxPivotGrid #pivotGrid', () => {
 
         it('should sort on column for single row dimension.', () => {
             const pivotGrid = fixture.componentInstance.pivotGrid;
-            const headerCell = GridFunctions.getColumnHeader('USA-UnitsSold', fixture);
+            let headerCell = GridFunctions.getColumnHeader('USA-UnitsSold', fixture);
 
             // sort asc
             GridFunctions.clickHeaderSortIcon(headerCell);
@@ -313,6 +313,7 @@ describe('Basic IgxPivotGrid #pivotGrid', () => {
             let columnValues = pivotGrid.dataView.map(x => x['USA-UnitsSold']);
             expect(columnValues).toEqual(expectedOrder);
 
+            headerCell = GridFunctions.getColumnHeader('USA-UnitsSold', fixture);
             // sort desc
             GridFunctions.clickHeaderSortIcon(headerCell);
             fixture.detectChanges();
@@ -322,6 +323,7 @@ describe('Basic IgxPivotGrid #pivotGrid', () => {
             expect(columnValues).toEqual(expectedOrder);
 
             // remove sort
+            headerCell = GridFunctions.getColumnHeader('USA-UnitsSold', fixture);
             GridFunctions.clickHeaderSortIcon(headerCell);
             fixture.detectChanges();
             expect(pivotGrid.sortingExpressions.length).toBe(0);

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.ts

@@ -129,13 +129,15 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent implem
 
     protected populateDimensionRecursively(currentLevelColumns: ColumnType[], level = 0, res: any[]) {
         currentLevelColumns.forEach(col => {
-            res[level].push(col);
-            if (col.columnGroup && col.children.length > 0) {
-                const visibleColumns = col.children.toArray().filter(x => !x.hidden);
-                this.populateDimensionRecursively(visibleColumns, level + 1, res);
-            } else if (level < this.totalDepth - 1) {
-                for (let i = level + 1; i <= this.totalDepth - 1; i++) {
-                    res[i].push(col);
+            if (res[level]) {
+                res[level].push(col);
+                if (col.columnGroup && col.children.length > 0) {
+                    const visibleColumns = col.children.toArray().filter(x => !x.hidden);
+                    this.populateDimensionRecursively(visibleColumns, level + 1, res);
+                } else if (level < this.totalDepth - 1) {
+                    for (let i = level + 1; i <= this.totalDepth - 1; i++) {
+                        res[i].push(col);
+                    }
                 }
             }
         });