Skip to content

Commit 4e846b0

Browse files
authored
Merge pull request #5717 from IgniteUI/nrobakova/refactor-re-tests
Move grid cell editing and row editing tests
2 parents 315d43c + 17fedf7 commit 4e846b0

24 files changed

+6532
-6441
lines changed

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

Lines changed: 1 addition & 670 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
1818
import { configureTestSuite } from '../../test-utils/configure-suite';
1919
import { IgxGridComponent } from './grid.component';
2020
import { HelperUtils } from '../../test-utils/helper-utils.spec';
21+
import { GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
2122

2223
describe('IgxGrid - Column Moving #grid', () => {
2324
configureTestSuite();
@@ -686,7 +687,7 @@ describe('IgxGrid - Column Moving #grid', () => {
686687
fixture.detectChanges();
687688
expect(cell.selected).toBeTruthy();
688689

689-
HelperUtils.verifySelectedRange(grid, 0, 0, 0, 0);
690+
GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 0, 0);
690691

691692
// step 2 - reorder that column among columns that are currently out of view
692693
// and verify selection is preserved
@@ -705,7 +706,7 @@ describe('IgxGrid - Column Moving #grid', () => {
705706
await wait();
706707
fixture.detectChanges();
707708

708-
HelperUtils.verifySelectedRange(grid, 0, 0, 0, 0);
709+
GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 0, 0);
709710
}));
710711

711712
it('Should preserve cell selection after columns are reordered - vertical scrolling.', (async() => {
@@ -725,7 +726,7 @@ describe('IgxGrid - Column Moving #grid', () => {
725726
fixture.detectChanges();
726727

727728
expect(cell.selected).toBeTruthy();
728-
HelperUtils.verifySelectedRange(grid, 25, 25, 9, 9);
729+
GridSelectionFunctions.verifySelectedRange(grid, 25, 25, 9, 9);
729730
expect(grid.getSelectedData()).toEqual(selectedData);
730731

731732
// step 3 - scroll up vertically so that the selected cell becomes out of view
@@ -755,7 +756,7 @@ describe('IgxGrid - Column Moving #grid', () => {
755756
fixture.detectChanges();
756757

757758
const newSelectedData = [{Country: 'France'}];
758-
HelperUtils.verifySelectedRange(grid, 25, 25, 9, 9);
759+
GridSelectionFunctions.verifySelectedRange(grid, 25, 25, 9, 9);
759760
expect(grid.getSelectedData()).toEqual(newSelectedData);
760761
}));
761762

@@ -1296,7 +1297,7 @@ describe('IgxGrid - Column Moving #grid', () => {
12961297
UIInteractions.simulateClickAndSelectCellEvent(cell);
12971298
fixture.detectChanges();
12981299

1299-
HelperUtils.verifySelectedRange(grid, 0, 0, 2, 2);
1300+
GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 2, 2);
13001301

13011302
// step 2 - reorder the parent column and verify selection is preserved
13021303
const header = fixture.debugElement.queryAll(By.css(COLUMN_GROUP_HEADER_CLASS))[0].nativeElement;
@@ -1310,7 +1311,7 @@ describe('IgxGrid - Column Moving #grid', () => {
13101311
await wait();
13111312
fixture.detectChanges();
13121313

1313-
HelperUtils.verifySelectedRange(grid, 0, 0, 2, 2);
1314+
GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 2, 2);
13141315
expect(grid.getSelectedData()).toEqual([{CompanyName: 'Alfreds Futterkiste' }]);
13151316

13161317
// step 3 - navigate right and verify cell selection is updated
@@ -1319,7 +1320,7 @@ describe('IgxGrid - Column Moving #grid', () => {
13191320
await wait(50);
13201321
fixture.detectChanges();
13211322

1322-
HelperUtils.verifySelectedRange(grid, 0, 0, 3, 3);
1323+
GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 3, 3);
13231324
expect(grid.getSelectedData()).toEqual([{ContactName: 'Maria Anders' }]);
13241325
}));
13251326

0 commit comments

Comments
 (0)