Merge branch 'master' into slider-ticks-refactoring

Author: kdinev

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

@@ -584,7 +584,7 @@ export class IgxColumnComponent implements AfterContentInit {
             /* No grid/width available at initialization. `initPinning` in the grid
                will re-init the group (if present)
             */
-            this._unpinnedIndex = this.grid.columns.filter(x => !x.pinned).indexOf(this);
+            this._unpinnedIndex = this.grid ? this.grid.columns.filter(x => !x.pinned).indexOf(this) : 0;
             this._pinned = value;
             this.pinnedChange.emit(this._pinned);
         }

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

@@ -542,10 +542,12 @@ describe('IgxGrid - Advanced Filtering', () => {
             fix.detectChanges();
 
             // Verify the filter results.
-            expect(grid.filteredData.length).toEqual(6);
-            expect(grid.rowList.length).toBe(6);
-            expect(GridFunctions.getCurrentCellFromGrid(grid, 0, 1).value).toBe('Ignite UI for JavaScript');
-            expect(GridFunctions.getCurrentCellFromGrid(grid, 1, 1).value).toBe('NetAdvantage');
+            const expectedData = fix.componentInstance.data.filter(r =>
+                r.ReleaseDate && r.ReleaseDate.getFullYear() === (new Date()).getFullYear());
+            expect(grid.filteredData.length).toEqual(expectedData.length);
+            expect(grid.rowList.length).toBe(expectedData.length);
+            expect(GridFunctions.getCurrentCellFromGrid(grid, 0, 1).value).toBe(expectedData[0].ProductName);
+            expect(GridFunctions.getCurrentCellFromGrid(grid, 1, 1).value).toBe(expectedData[1].ProductName);
         }));
 
         it('Should correctly filter by a \'date\' column through UI with value from calendar.', fakeAsync(() => {