Skip to content

Commit 358c7a9

Browse files
authored
Merge branch '8.2.x' into zkolev/revert-change-6376-82x
2 parents 036e60d + d924b3b commit 358c7a9

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,14 +1251,15 @@ describe('IgxGrid - Filtering actions #grid', () => {
12511251
fix.detectChanges();
12521252

12531253
const firstMonth = calendar.querySelector('.igx-calendar__month');
1254+
const firstMonthText = (firstMonth as HTMLElement).innerText;
12541255
firstMonth.dispatchEvent(new Event('click'));
12551256
tick();
12561257
fix.detectChanges();
12571258

12581259
calendar = outlet.getElementsByClassName('igx-calendar')[0];
12591260
const month = calendar.querySelector('.igx-calendar-picker__date');
12601261

1261-
expect(month.innerHTML.trim()).toEqual('Jan');
1262+
expect(month.innerHTML.trim()).toEqual(firstMonthText);
12621263
}));
12631264

12641265
it('Should correctly select year from year view datepicker/calendar component', fakeAsync(() => {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,7 @@ describe('IgxGrid - GroupBy #grid', () => {
25652565
it('should apply custom comparer function when grouping by dragging a column into the group area', async () => {
25662566
const fix = TestBed.createComponent(GroupableGridComponent);
25672567
const grid = fix.componentInstance.instance;
2568+
const year = new Date().getFullYear().toString();
25682569
fix.detectChanges();
25692570
await wait();
25702571

@@ -2604,7 +2605,7 @@ describe('IgxGrid - GroupBy #grid', () => {
26042605
expect(grid.groupsRecords.length).toEqual(2);
26052606
expect(grid.groupsRecords[1].records.length).toEqual(6);
26062607
for (let i = 0; i < grid.groupsRecords[1].records.length; i++) {
2607-
expect(grid.groupsRecords[1].records[i].ReleaseDate.getFullYear().toString()).toEqual('2019');
2608+
expect(grid.groupsRecords[1].records[i].ReleaseDate.getFullYear().toString()).toEqual(year);
26082609
}
26092610
});
26102611

0 commit comments

Comments
 (0)