Skip to content

Commit 68d1ef9

Browse files
zdrawkuzdrawku
authored
Merge pull request #5399 from IgniteUI/nrobakova/fix-paging-tests
Update paging test not to throw an error
2 parents 52f0047 + 6221c3c commit 68d1ef9

17 files changed

+243
-164
lines changed

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -214,20 +214,20 @@ describe('IgxGrid - Cell component', () => {
214214
const firstCell = grid.getCellByColumn(0, 'fullName');
215215

216216
expect(firstCell.nativeElement.textContent).toBe('John Brown');
217-
expect(firstCell.inEditMode).toBeFalsy();
217+
expect(firstCell.editMode).toBeFalsy();
218218

219219
cellElem.triggerEventHandler('dblclick', new Event('dblclick'));
220220
fix.detectChanges();
221221
const editCell = cellElem.query(By.css('input'));
222222
expect(editCell.nativeElement.value).toBe('John Brown');
223-
expect(firstCell.inEditMode).toBeTruthy();
223+
expect(firstCell.editMode).toBeTruthy();
224224

225225
UIInteractions.sendInput(editCell, 'test');
226226
fix.detectChanges();
227227
cellElem.triggerEventHandler('dblclick', new Event('dblclick'));
228228
fix.detectChanges();
229229
expect(editCell.nativeElement.value).toBe('test');
230-
expect(firstCell.inEditMode).toBeTruthy();
230+
expect(firstCell.editMode).toBeTruthy();
231231
}));
232232

233233
describe('Cell Editing', () => {
@@ -252,27 +252,27 @@ describe('IgxGrid - Cell component', () => {
252252

253253
rv.triggerEventHandler('dblclick', {});
254254
fixture.detectChanges();
255-
expect(cell.inEditMode).toBe(true);
255+
expect(cell.editMode).toBe(true);
256256

257257
UIInteractions.triggerKeyDownEvtUponElem('escape', rv.nativeElement, true);
258258
fixture.detectChanges();
259-
expect(cell.inEditMode).toBe(false);
259+
expect(cell.editMode).toBe(false);
260260

261261
UIInteractions.triggerKeyDownEvtUponElem('enter', rv.nativeElement, true);
262262
fixture.detectChanges();
263-
expect(cell.inEditMode).toBe(true);
263+
expect(cell.editMode).toBe(true);
264264

265265
UIInteractions.triggerKeyDownEvtUponElem('escape', rv.nativeElement, true);
266266
fixture.detectChanges();
267-
expect(cell.inEditMode).toBe(false);
267+
expect(cell.editMode).toBe(false);
268268

269269
UIInteractions.triggerKeyDownEvtUponElem('f2', rv.nativeElement, true);
270270
fixture.detectChanges();
271-
expect(cell.inEditMode).toBe(true);
271+
expect(cell.editMode).toBe(true);
272272

273273
UIInteractions.triggerKeyDownEvtUponElem('escape', rv.nativeElement, true);
274274
fixture.detectChanges();
275-
expect(cell.inEditMode).toBe(false);
275+
expect(cell.editMode).toBe(false);
276276
});
277277

278278
it('should be able to edit cell which is a Primary Key', () => {
@@ -285,7 +285,7 @@ describe('IgxGrid - Cell component', () => {
285285
fixture.detectChanges();
286286
cellDomPK.triggerEventHandler('dblclick', {});
287287
fixture.detectChanges();
288-
expect(cell.inEditMode).toBe(true);
288+
expect(cell.editMode).toBe(true);
289289

290290
const editTemplate = cellDomPK.query(By.css('input[type=\'number\']'));
291291
UIInteractions.sendInput(editTemplate, 87);
@@ -294,7 +294,7 @@ describe('IgxGrid - Cell component', () => {
294294
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomPK.nativeElement, true);
295295

296296
fixture.detectChanges();
297-
expect(cell.inEditMode).toBe(false);
297+
expect(cell.editMode).toBe(false);
298298
expect(cell.value).toBe(87);
299299
});
300300

@@ -305,7 +305,7 @@ describe('IgxGrid - Cell component', () => {
305305
cellDomNumber.triggerEventHandler('dblclick', {});
306306
fixture.detectChanges();
307307

308-
expect(cell.inEditMode).toBe(true);
308+
expect(cell.editMode).toBe(true);
309309
const editTemplate = cellDomNumber.query(By.css('input[type=\'number\']'));
310310
expect(editTemplate).toBeDefined();
311311

@@ -314,7 +314,7 @@ describe('IgxGrid - Cell component', () => {
314314
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomNumber.nativeElement, true);
315315
fixture.detectChanges();
316316

317-
expect(cell.inEditMode).toBe(false);
317+
expect(cell.editMode).toBe(false);
318318
expect(parseFloat(cell.value)).toBe(0.3698);
319319
expect(editTemplate.nativeElement.type).toBe('number');
320320
});
@@ -336,7 +336,7 @@ describe('IgxGrid - Cell component', () => {
336336
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomNumber.nativeElement, true);
337337
fixture.detectChanges();
338338

339-
expect(cell.inEditMode).toBe(false);
339+
expect(cell.editMode).toBe(false);
340340
expect(parseFloat(cell.value)).toBe(expectedValue);
341341

342342
cellDomNumber.triggerEventHandler('dblclick', {});
@@ -348,7 +348,7 @@ describe('IgxGrid - Cell component', () => {
348348
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomNumber.nativeElement, true);
349349
fixture.detectChanges();
350350

351-
expect(cell.inEditMode).toBe(false);
351+
expect(cell.editMode).toBe(false);
352352
expect(parseFloat(cell.value)).toBe(expectedValue);
353353
});
354354

@@ -359,7 +359,7 @@ describe('IgxGrid - Cell component', () => {
359359
cellDomBoolean.triggerEventHandler('dblclick', {});
360360
fixture.detectChanges();
361361

362-
expect(cell.inEditMode).toBe(true);
362+
expect(cell.editMode).toBe(true);
363363

364364
const editTemplate = cellDomBoolean.query(By.css('.igx-checkbox')).query(By.css('.igx-checkbox__label'));
365365
expect(editTemplate).toBeDefined();
@@ -371,7 +371,7 @@ describe('IgxGrid - Cell component', () => {
371371
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomBoolean.nativeElement, true);
372372
fixture.detectChanges();
373373

374-
expect(cell.inEditMode).toBe(false);
374+
expect(cell.editMode).toBe(false);
375375
expect(cell.value).toBe(false);
376376
});
377377

@@ -383,7 +383,7 @@ describe('IgxGrid - Cell component', () => {
383383
cellDomDate.triggerEventHandler('dblclick', {});
384384
fixture.detectChanges();
385385

386-
expect(cell.inEditMode).toBe(true);
386+
expect(cell.editMode).toBe(true);
387387
const datePicker = cellDomDate.query(By.css('igx-date-picker')).componentInstance;
388388
expect(datePicker).toBeDefined();
389389

@@ -394,7 +394,7 @@ describe('IgxGrid - Cell component', () => {
394394
UIInteractions.triggerKeyDownEvtUponElem('enter', cellDomDate.nativeElement, true);
395395
fixture.detectChanges();
396396

397-
expect(cell.inEditMode).toBe(false);
397+
expect(cell.editMode).toBe(false);
398398
expect(cell.value.getTime()).toBe(selectedDate.getTime());
399399
});
400400

@@ -407,7 +407,7 @@ describe('IgxGrid - Cell component', () => {
407407
fixture.detectChanges();
408408

409409
const editTemplate = cellDom.query(By.css('input'));
410-
expect(cell.inEditMode).toBe(true);
410+
expect(cell.editMode).toBe(true);
411411

412412
UIInteractions.sendInput(editTemplate, 'Rick Gilmore');
413413
fixture.detectChanges();
@@ -418,7 +418,7 @@ describe('IgxGrid - Cell component', () => {
418418
fixture.detectChanges();
419419

420420
cell = grid.getCellByColumn(0, 'fullName');
421-
expect(cell.inEditMode).toBe(false);
421+
expect(cell.editMode).toBe(false);
422422
expect(cell.value).toBe(cellValue);
423423
});
424424

@@ -432,7 +432,7 @@ describe('IgxGrid - Cell component', () => {
432432

433433
cellDomPK.triggerEventHandler('dblclick', {});
434434
fixture.detectChanges();
435-
expect(cell.inEditMode).toBe(true);
435+
expect(cell.editMode).toBe(true);
436436

437437
const editTemplate = cellDomPK.query(By.css('input[type=\'number\']'));
438438
UIInteractions.sendInput(editTemplate, 9);
@@ -449,7 +449,7 @@ describe('IgxGrid - Cell component', () => {
449449
fixture.detectChanges();
450450

451451
const editTemplate = cellDom.query(By.css('input'));
452-
expect(cell.inEditMode).toBe(true);
452+
expect(cell.editMode).toBe(true);
453453
UIInteractions.sendInput(editTemplate, 'Rick Gilmore');
454454
fixture.detectChanges();
455455

@@ -469,7 +469,7 @@ describe('IgxGrid - Cell component', () => {
469469
fixture.detectChanges();
470470

471471
const editTemplate = cellDom.query(By.css('input'));
472-
expect(cell.inEditMode).toBe(true);
472+
expect(cell.editMode).toBe(true);
473473
expect(cell.editValue).toBe('Tom Riddle');
474474
UIInteractions.sendInput(editTemplate, 'Rick Gilmore');
475475
fixture.detectChanges();
@@ -507,12 +507,12 @@ describe('IgxGrid - Cell component', () => {
507507
UIInteractions.triggerKeyDownEvtUponElem('enter', rv.nativeElement, true);
508508
fixture.detectChanges();
509509

510-
expect(cell.inEditMode).toBe(true);
510+
expect(cell.editMode).toBe(true);
511511

512512
button.nativeElement.dispatchEvent(new Event('click'));
513513
fixture.detectChanges();
514514

515-
expect(cell.inEditMode).toBe(true);
515+
expect(cell.editMode).toBe(true);
516516
}));
517517

518518
it('edit mode - exit edit mode and submit when pin/unpin unpin column', fakeAsync(/** height/width setter rAF */() => {
@@ -534,15 +534,15 @@ describe('IgxGrid - Cell component', () => {
534534
expect(cell.value).toBe('Gary Martin');
535535
cell = grid.getCellByColumn(1, 'firstName');
536536
const cellValue = cell.value;
537-
cell.inEditMode = true;
537+
cell.setEditMode(true);
538538
fixture.detectChanges();
539539

540540
expect(cell.gridAPI.get_cell_inEditMode()).toBeDefined();
541541
grid.unpinColumn('firstName');
542542
cell = grid.getCellByColumn(1, 'firstName');
543543
expect(grid.pinnedColumns.length).toBe(0);
544544
expect(cell.gridAPI.get_cell_inEditMode()).toBeNull();
545-
expect(cell.inEditMode).toBe(false);
545+
expect(cell.editMode).toBe(false);
546546
expect(cell.value).toBe(cellValue);
547547
}));
548548

‎projects/igniteui-angular/src/lib/grids/grid/column-moving.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ describe('IgxGrid - Column Moving', () => {
346346

347347
cell.triggerEventHandler('dblclick', {});
348348
fixture.detectChanges();
349-
expect(grid.getCellByColumn(0, 'ID').inEditMode).toBe(true);
349+
expect(grid.getCellByColumn(0, 'ID').editMode).toBe(true);
350350

351351
// step 2 - enter some new value
352352
const editTemplate = cell.query(By.css('input'));
@@ -368,7 +368,7 @@ describe('IgxGrid - Column Moving', () => {
368368

369369
// step 4 - verify cell has exited edit mode correctly
370370
expect(grid.columnList.toArray()[1].field).toEqual('ID');
371-
expect(grid.getCellByColumn(0, 'ID').inEditMode).toBe(false);
371+
expect(grid.getCellByColumn(0, 'ID').editMode).toBe(false);
372372
expect(grid.getCellByColumn(0, 'ID').value).toBe('4');
373373
}));
374374

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ describe('IgxGrid - Column properties', () => {
263263
expect(header.elementRef.nativeElement.querySelector('.customHeaderTemplate')).toBeDefined());
264264

265265
const cell = grid.getCellByColumn(0, 'ID');
266-
cell.inEditMode = true;
266+
cell.setEditMode(true);
267267
fixture.detectChanges();
268268

269269
expect(cell.nativeElement.querySelector('.customEditorTemplate')).toBeDefined();

‎projects/igniteui-angular/src/lib/grids/grid/grid-multi-cell-selection.spec.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,10 +1716,11 @@ describe('IgxGrid - Multi Cell selection', () => {
17161716
expect(grid.getSelectedData()).toEqual(selectedData);
17171717
});
17181718

1719-
it('Filtering, Paging: selected range should not change when perform filtering', () => {
1719+
it('Filtering, Paging: selected range should not change when perform filtering', fakeAsync(() => {
17201720
grid.paging = true;
17211721
grid.perPage = 5;
17221722
fix.detectChanges();
1723+
tick(16);
17231724

17241725
const selectRange = { rowStart: 1, rowEnd: 2, columnStart: 'ID', columnEnd: 'HireDate' };
17251726
grid.selectRange(selectRange);
@@ -1733,19 +1734,21 @@ describe('IgxGrid - Multi Cell selection', () => {
17331734
expect(grid.getSelectedData()).toEqual(selData);
17341735
grid.filter('Name', 'm', IgxStringFilteringOperand.instance().condition('contains'), false);
17351736
fix.detectChanges();
1737+
tick(16);
17361738

17371739
const fData = [
17381740
{ ID: 957, ParentID: 147, Name: 'Thomas Hardy', HireDate: new Date('Jul 19, 2009')},
17391741
{ ID: 317, ParentID: 147, Name: 'Monica Reyes', HireDate: new Date('Sep 18, 2014') },
17401742
];
17411743
HelperUtils.verifySelectedRange(grid, 1, 2, 0, 3);
17421744
expect(grid.getSelectedData()).toEqual(fData);
1743-
});
1745+
}));
17441746

1745-
it('Paging: selected range should be cleared on paging', () => {
1747+
it('Paging: selected range should be cleared on paging', fakeAsync(() => {
17461748
grid.paging = true;
17471749
grid.perPage = 5;
17481750
fix.detectChanges();
1751+
tick(16);
17491752

17501753
const range = { rowStart: 1, rowEnd: 4, columnStart: 'ID', columnEnd: 'HireDate' };
17511754
grid.selectRange(range);
@@ -1761,17 +1764,19 @@ describe('IgxGrid - Multi Cell selection', () => {
17611764
expect(grid.getSelectedData()).toEqual(selectedData);
17621765
grid.paginate(1);
17631766
fix.detectChanges();
1767+
tick(16);
17641768

17651769
expect(grid.getSelectedRanges().length).toBe(0);
17661770
expect(grid.getSelectedRanges()).toEqual([]);
17671771
expect(grid.getSelectedData().length).toBe(0);
17681772
expect(grid.getSelectedData()).toEqual([]);
1769-
});
1773+
}));
17701774

1771-
it('Paging: selected range should be cleared when perPage items are changed', () => {
1775+
it('Paging: selected range should be cleared when perPage items are changed', fakeAsync(() => {
17721776
grid.paging = true;
17731777
grid.perPage = 5;
17741778
fix.detectChanges();
1779+
tick(16);
17751780

17761781
const range = { rowStart: 2, rowEnd: 4, columnStart: 'ID', columnEnd: 'OnPTO' };
17771782
grid.selectRange(range);
@@ -1787,12 +1792,13 @@ describe('IgxGrid - Multi Cell selection', () => {
17871792
expect(grid.getSelectedData()).toEqual(selectedData);
17881793
grid.perPage = 7;
17891794
fix.detectChanges();
1795+
tick(16);
17901796

17911797
expect(grid.getSelectedRanges().length).toBe(0);
17921798
expect(grid.getSelectedRanges()).toEqual([]);
17931799
expect(grid.getSelectedData().length).toBe(0);
17941800
expect(grid.getSelectedData()).toEqual([]);
1795-
});
1801+
}));
17961802

17971803
xit('Resizing: selected range should not change on resizing', fakeAsync(() => {
17981804
const range = { rowStart: 2, rowEnd: 4, columnStart: 'ID', columnEnd: 'HireDate' };

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,29 +2050,35 @@ describe('IgxGrid - Summaries', () => {
20502050
grid.paging = true;
20512051
grid.perPage = 3;
20522052
fix.detectChanges();
2053+
tick(16);
20532054

20542055
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(2);
20552056
verifyBaseSummaries(fix);
20562057
verifySummariesForParentID17(fix, 3);
20572058

20582059
grid.page = 1;
20592060
fix.detectChanges();
2061+
tick(16);
20602062

20612063
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(2);
20622064
verifyBaseSummaries(fix);
20632065
verifySummariesForParentID19(fix, 2);
20642066

20652067
grid.page = 2;
20662068
fix.detectChanges();
2069+
tick(16);
20672070
verifySummariesForParentID147(fix, 3);
20682071
verifyBaseSummaries(fix);
20692072

20702073
grid.page = 0;
20712074
fix.detectChanges();
2075+
tick(16);
20722076

20732077
const groupRows = grid.groupsRowList.toArray();
20742078
groupRows[0].toggle();
20752079
fix.detectChanges();
2080+
tick(16);
2081+
20762082
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(2);
20772083
verifyBaseSummaries(fix);
20782084
}));
@@ -2082,9 +2088,11 @@ describe('IgxGrid - Summaries', () => {
20822088
grid.perPage = 3;
20832089
grid.summaryPosition = 'top';
20842090
fix.detectChanges();
2091+
tick(16);
20852092

20862093
grid.page = 1;
20872094
fix.detectChanges();
2095+
tick(16);
20882096

20892097
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(3);
20902098
verifyBaseSummaries(fix);
@@ -2093,6 +2101,8 @@ describe('IgxGrid - Summaries', () => {
20932101

20942102
grid.page = 2;
20952103
fix.detectChanges();
2104+
tick(16);
2105+
20962106
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(1);
20972107
verifyBaseSummaries(fix);
20982108
}));

0 commit comments

Comments
 (0)