Merge branch '8.1.x' into zkolev/revert-change-6376-82x-81x

Author: zdrawku

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

@@ -1249,14 +1249,15 @@ describe('IgxGrid - Filtering actions', () => {
         fix.detectChanges();
 
         const firstMonth = calendar.querySelector('.igx-calendar__month');
+        const firstMonthText = (firstMonth as HTMLElement).innerText;
         firstMonth.dispatchEvent(new Event('click'));
         tick();
         fix.detectChanges();
 
         calendar = outlet.getElementsByClassName('igx-calendar')[0];
         const month = calendar.querySelector('.igx-calendar-picker__date');
 
-        expect(month.innerHTML.trim()).toEqual('Jan');
+        expect(month.innerHTML.trim()).toEqual(firstMonthText);
     }));
 
     it('Should correctly select year from year view datepicker/calendar component', fakeAsync(() => {

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

@@ -2535,6 +2535,7 @@ describe('IgxGrid - GroupBy', () => {
     it('should apply custom comparer function when grouping by dragging a column into the group area', async () => {
         const fix = TestBed.createComponent(GroupableGridComponent);
         const grid = fix.componentInstance.instance;
+        const year =  new Date().getFullYear().toString();
         fix.detectChanges();
         await wait();
 
@@ -2574,7 +2575,7 @@ describe('IgxGrid - GroupBy', () => {
         expect(grid.groupsRecords.length).toEqual(2);
         expect(grid.groupsRecords[1].records.length).toEqual(6);
         for (let i = 0; i < grid.groupsRecords[1].records.length; i++) {
-            expect(grid.groupsRecords[1].records[i].ReleaseDate.getFullYear().toString()).toEqual('2019');
+            expect(grid.groupsRecords[1].records[i].ReleaseDate.getFullYear().toString()).toEqual(year);
         }
     });