Skip to content

Commit bab6f44

Browse files
nrobakovanrobakova
committed
test(grid): update paging test not to throw an error #5394 
1 parent 47c227f commit bab6f44

17 files changed

+179
-146
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: 4 additions & 2 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,14 +1734,15 @@ 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

17451747
it('Paging: selected range should be cleared on paging', () => {
17461748
grid.paging = true;

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,36 +2051,42 @@ describe('IgxGrid - Summaries', () => {
20512051
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(3);
20522052
}));
20532053

2054-
it('Paging: should render correct summaries when paging is enable and position is buttom', () => {
2054+
it('Paging: should render correct summaries when paging is enable and position is buttom', fakeAsync(() => {
20552055
grid.paging = true;
20562056
grid.perPage = 2;
20572057
fix.detectChanges();
2058+
tick(16);
20582059

20592060
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(2);
20602061
verifyBaseSummaries(fix);
20612062
verifySummariesForParentID17(fix, 3);
20622063

20632064
grid.page = 1;
20642065
fix.detectChanges();
2066+
tick(16);
20652067

20662068
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(2);
20672069
verifyBaseSummaries(fix);
20682070
verifySummariesForParentID19(fix, 2);
20692071

20702072
grid.page = 2;
20712073
fix.detectChanges();
2074+
tick(16);
20722075
verifySummariesForParentID147(fix, 3);
20732076
verifyBaseSummaries(fix);
20742077

20752078
grid.page = 0;
20762079
fix.detectChanges();
2080+
tick(16);
20772081

20782082
const groupRows = grid.groupsRowList.toArray();
20792083
groupRows[0].toggle();
20802084
fix.detectChanges();
2085+
tick(16);
2086+
20812087
expect(HelperUtils.getAllVisibleSummariesLength(fix)).toEqual(1);
20822088
verifyBaseSummaries(fix);
2083-
});
2089+
}));
20842090

20852091
it('Paging: should render correct summaries when paging is enable and position is top', () => {
20862092
grid.paging = true;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ describe('IgxGrid - CRUD operations', () => {
249249
fix.detectChanges();
250250
cellDom.triggerEventHandler('dblclick', {});
251251
fix.detectChanges();
252-
expect(cell.inEditMode).toBe(true);
252+
expect(cell.editMode).toBe(true);
253253
grid.deleteRow(1);
254254
fix.detectChanges();
255255
const firstRow = grid.getRowByKey(1);
@@ -281,7 +281,7 @@ describe('IgxGrid - CRUD operations', () => {
281281
fix.detectChanges();
282282
cellDom.triggerEventHandler('dblclick', {});
283283
fix.detectChanges();
284-
expect(cell.inEditMode).toBe(true);
284+
expect(cell.editMode).toBe(true);
285285
firstRow = grid.getRowByIndex(0);
286286
firstRow.delete();
287287
fix.detectChanges();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ describe('IgxGrid - GroupBy', () => {
12181218
await wait();
12191219
fix.detectChanges();
12201220

1221-
expect(cell.inEditMode).toBe(true);
1221+
expect(cell.editMode).toBe(true);
12221222

12231223
const editCellDom = fix.debugElement.query(By.css('.igx-grid__td--editing'));
12241224
const input = editCellDom.query(By.css('input'));

0 commit comments

Comments
 (0)