chore(*): Merge from master.

Author: MKirova

projects/igniteui-angular/src/lib/core/grid-selection.ts

@@ -559,7 +559,7 @@ export class IgxGridSelectionService {
     selectAllRows(event?) {
         const allRowIDs = this.getRowIDs(this.allData);
         const addedRows =  allRowIDs.filter((rID) => !this.isRowSelected(rID));
-        const newSelection = this.rowSelection.size ? allRowIDs.concat(this.getSelectedRows()) : addedRows;
+        const newSelection = this.rowSelection.size ? this.getSelectedRows().concat(addedRows) : addedRows;
 
         this.emitRowSelectionEvent(newSelection, addedRows, [], event);
     }

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

@@ -18,6 +18,7 @@ import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { IgxGridComponent } from './grid.component';
 import { HelperUtils } from '../../test-utils/helper-utils.spec';
+import { GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
 
 describe('IgxGrid - Column Moving #grid', () => {
     configureTestSuite();
@@ -686,7 +687,7 @@ describe('IgxGrid - Column Moving #grid', () => {
             fixture.detectChanges();
             expect(cell.selected).toBeTruthy();
 
-            HelperUtils.verifySelectedRange(grid, 0, 0, 0, 0);
+            GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 0, 0);
 
             // step 2 - reorder that column among columns that are currently out of view
             // and verify selection is preserved
@@ -705,7 +706,7 @@ describe('IgxGrid - Column Moving #grid', () => {
             await wait();
             fixture.detectChanges();
 
-            HelperUtils.verifySelectedRange(grid, 0, 0, 0, 0);
+            GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 0, 0);
         }));
 
         it('Should preserve cell selection after columns are reordered - vertical scrolling.', (async() => {
@@ -725,7 +726,7 @@ describe('IgxGrid - Column Moving #grid', () => {
             fixture.detectChanges();
 
             expect(cell.selected).toBeTruthy();
-            HelperUtils.verifySelectedRange(grid, 25, 25, 9, 9);
+            GridSelectionFunctions.verifySelectedRange(grid, 25, 25, 9, 9);
             expect(grid.getSelectedData()).toEqual(selectedData);
 
             // step 3 - scroll up vertically so that the selected cell becomes out of view
@@ -755,7 +756,7 @@ describe('IgxGrid - Column Moving #grid', () => {
             fixture.detectChanges();
 
             const newSelectedData = [{Country: 'France'}];
-            HelperUtils.verifySelectedRange(grid, 25, 25, 9, 9);
+            GridSelectionFunctions.verifySelectedRange(grid, 25, 25, 9, 9);
             expect(grid.getSelectedData()).toEqual(newSelectedData);
         }));
 
@@ -1296,7 +1297,7 @@ describe('IgxGrid - Column Moving #grid', () => {
             UIInteractions.simulateClickAndSelectCellEvent(cell);
             fixture.detectChanges();
 
-            HelperUtils.verifySelectedRange(grid, 0, 0, 2, 2);
+            GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 2, 2);
 
             // step 2 - reorder the parent column and verify selection is preserved
             const header = fixture.debugElement.queryAll(By.css(COLUMN_GROUP_HEADER_CLASS))[0].nativeElement;
@@ -1310,7 +1311,7 @@ describe('IgxGrid - Column Moving #grid', () => {
             await wait();
             fixture.detectChanges();
 
-            HelperUtils.verifySelectedRange(grid, 0, 0, 2, 2);
+            GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 2, 2);
             expect(grid.getSelectedData()).toEqual([{CompanyName: 'Alfreds Futterkiste' }]);
 
             // step 3 - navigate right and verify cell selection is updated
@@ -1319,7 +1320,7 @@ describe('IgxGrid - Column Moving #grid', () => {
             await wait(50);
             fixture.detectChanges();
 
-            HelperUtils.verifySelectedRange(grid, 0, 0, 3, 3);
+            GridSelectionFunctions.verifySelectedRange(grid, 0, 0, 3, 3);
             expect(grid.getSelectedData()).toEqual([{ContactName: 'Maria Anders' }]);
         }));