Merge branch 'master' into bpenkov/date-time-editor

Author: Lipata

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

@@ -271,18 +271,19 @@ describe('IgxHierarchicalGrid Basic Navigation #hGrid', () => {
     }));
 
     it('should scroll top of child grid into view when pressing Ctrl + Arrow Up when cell is selected in it.', (async () => {
-        pending('related to the bug #7118');
         hierarchicalGrid.verticalScrollContainer.scrollTo(7);
         fixture.detectChanges();
         await wait(DEBOUNCE_TIME);
+        hierarchicalGrid.verticalScrollContainer.scrollTo(7);
         fixture.detectChanges();
+        await wait(DEBOUNCE_TIME);
 
         const childGrid = hierarchicalGrid.hgridAPI.getChildGrids(false)[3];
 
         const childLastRowCell =  childGrid.dataRowList.toArray()[9].cells.toArray()[0];
+        const childGridContent =  fixture.debugElement.queryAll(By.css(GRID_CONTENT_CLASS))[1];
         GridFunctions.focusCell(fixture, childLastRowCell);
         fixture.detectChanges();
-        const childGridContent =  fixture.debugElement.queryAll(By.css(GRID_CONTENT_CLASS))[1];
         UIInteractions.triggerEventHandlerKeyDown('arrowup', childGridContent, false, false, true);
         fixture.detectChanges();
         await wait(200);