Merge branch 'master' into nalipiev/igniteui-schematics

Author: Lipata

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

@@ -4280,7 +4280,10 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             fix.detectChanges();
 
             listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix, searchComponent);
-            expect(listItems.length).toBe(4, 'incorrect rendered list items count');
+            expect(listItems.length).toBeGreaterThan(1);
+            for (let i = 1; i < listItems.length; i++) {
+                expect(listItems[i].textContent.toString().indexOf(todayDate) > -1).toBeTruthy();
+            }
 
             UIInteractions.clickAndSendInputElementValue(inputNativeElement, dayOfWeek, fix);
             tick(100);

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

@@ -60,11 +60,11 @@ describe('IgxGrid - Headers Keyboard navigation #grid', () => {
 
         it('should focus first header when the grid is scrolled', async () => {
             grid.navigateTo(7, 5);
-            await wait(100);
+            await wait(150);
             fix.detectChanges();
 
             gridHeader.triggerEventHandler('focus', {});
-            await wait(200);
+            await wait(250);
             fix.detectChanges();
 
             const header = GridFunctions.getColumnHeader('ID', fix);

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

@@ -421,7 +421,7 @@ describe('IgxGrid - Keyboard navigation #grid', () => {
             fix.detectChanges();
 
             UIInteractions.triggerKeyDownEvtUponElem('home', cell.nativeElement, true, false, false, true);
-            await wait(100);
+            await wait(150);
             fix.detectChanges();
 
             cell = grid.getCellByColumn(0, '0');
@@ -434,7 +434,7 @@ describe('IgxGrid - Keyboard navigation #grid', () => {
             fix.detectChanges();
 
             UIInteractions.triggerKeyDownEvtUponElem('end', cell.nativeElement, true, false, false, true);
-            await wait(150);
+            await wait(200);
             fix.detectChanges();
 
             cell = grid.getCellByColumn(499, '49');

projects/igniteui-angular/src/lib/grids/grid/grid-row.component.html

@@ -156,7 +156,7 @@
         [editMode]="col.editable && crudService.isInEditMode(index, col.index)"
         [column]="col"
         [style.-ms-grid-row-span]="col.gridRowSpan"
-        [style.-ms-grid-column-span]="col.girdColumnSpan"
+        [style.-ms-grid-column-span]="col.gridColumnSpan"
         [style.grid-row-end]="col.rowEnd"
         [style.grid-column-end]="col.colEnd"
         [style.-ms-grid-row]="col.rowStart"
@@ -191,7 +191,7 @@
         [editMode]="col.editable && crudService.isInEditMode(index, col.index)"
         [column]="col"
         [style.-ms-grid-row-span]="col.gridRowSpan"
-        [style.-ms-grid-column-span]="col.girdColumnSpan"
+        [style.-ms-grid-column-span]="col.gridColumnSpan"
         [style.grid-row-end]="col.rowEnd"
         [style.grid-column-end]="col.colEnd"
         [style.-ms-grid-row]="col.rowStart"