test(hgrid): minor adjustments

Author: IMinchev64

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

@@ -6,7 +6,7 @@ import { IgxPaginatorComponent } from 'igniteui-angular/paginator';;
 import { DataParent } from '../../../test-utils/sample-test-data.spec';
 import { GridFunctions, GridSelectionFunctions } from '../../../test-utils/grid-functions.spec';
 import { By } from '@angular/platform-browser';
-import { UIInteractions, wait } from '../../../test-utils/ui-interactions.spec';
+import { UIInteractions, wait, waitForActiveNodeChange } from '../../../test-utils/ui-interactions.spec';
 import { hasClass, setElementSize } from '../../../test-utils/helper-utils.spec';
 import { ColumnLayoutTestComponent } from './grid.multi-row-layout.spec';
 import { IgxHierarchicalGridTestBaseComponent } from '../../hierarchical-grid/src/hierarchical-grid.spec';
@@ -1161,9 +1161,10 @@ describe('IgxGrid - Cell merging #grid', () => {
                 const parentRowDE = parentRows[0];
                 const parentCells = parentRowDE.queryAll(By.css('.igx-grid__td'));
                 const parentCellDE = parentCells[1];
+                const activeChange = waitForActiveNodeChange(childGrid);
                 UIInteractions.simulateClickAndSelectEvent(parentCellDE.nativeElement);
-                parentCellDE.nativeElement.dispatchEvent(new FocusEvent('focusin', { bubbles: true }));
-                await wait(1);
+                await activeChange;
+                await wait(20);
                 fix.detectChanges();
 
                 GridFunctions.verifyColumnMergedState(childGrid, childCol, [