chore(*): fixing test failures done by merging conflicts

Author: mddragnev

projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.spec.ts

@@ -1172,7 +1172,7 @@ describe('IgxGrid - multi-row-layout #grid', () => {
         <igx-column-layout *ngFor='let group of colGroups'>
             <igx-column *ngFor='let col of group.columns'
             [rowStart]="col.rowStart" [colStart]="col.colStart" [width]='col.width'
-            [colEnd]="col.colEnd" [rowEnd]="col.rowEnd" [field]='col.field' [editable]='true'></igx-column>
+            [colEnd]="col.colEnd" [rowEnd]="col.rowEnd" [field]='col.field' [editable]='col.editable'></igx-column>
         </igx-column-layout>
     </igx-grid>
     `

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-add-row.spec.ts

@@ -3,17 +3,18 @@ import { IgxHierarchicalGridModule, IgxHierarchicalGridComponent } from './publi
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { IgxActionStripModule, IgxActionStripComponent } from '../../action-strip/public_api';
-import { IgxHierarchicalGridEditActionsComponent } from '../../test-utils/hierarchical-grid-components.spec';
+import { IgxHierarchicalGridActionStripComponent } from '../../test-utils/hierarchical-grid-components.spec';
+import { wait } from '../../test-utils/ui-interactions.spec';
 
-describe('IgxTreeGrid - Add Row UI #tGrid', () => {
+describe('IgxHierarchicalGrid - Add Row UI #tGrid', () => {
     configureTestSuite();
     let fixture;
     let hierarchicalGrid: IgxHierarchicalGridComponent;
     let actionStrip: IgxActionStripComponent;
     beforeAll(async(() => {
         TestBed.configureTestingModule({
             declarations: [
-                IgxHierarchicalGridEditActionsComponent
+                IgxHierarchicalGridActionStripComponent
             ],
             imports: [IgxHierarchicalGridModule, NoopAnimationsModule, IgxActionStripModule]
         })
@@ -22,7 +23,7 @@ describe('IgxTreeGrid - Add Row UI #tGrid', () => {
 
     describe(' Basic', () => {
         beforeEach(fakeAsync(/** height/width setter rAF */() => {
-            fixture = TestBed.createComponent(IgxHierarchicalGridEditActionsComponent);
+            fixture = TestBed.createComponent(IgxHierarchicalGridActionStripComponent);
             fixture.detectChanges();
             hierarchicalGrid = fixture.componentInstance.hgrid;
             actionStrip = fixture.componentInstance.actionStrip;
@@ -40,7 +41,7 @@ describe('IgxTreeGrid - Add Row UI #tGrid', () => {
             expect(hierarchicalGrid.getRowByIndex(1).addRow).toBeTrue();
         });
 
-        it('Should allow the expansion of a newly added (commited) record', () => {
+        it('Should allow the expansion of a newly added (commited) record', async() => {
             const row = hierarchicalGrid.rowList.first;
             hierarchicalGrid.expandRow(row.rowID);
             fixture.detectChanges();
@@ -52,6 +53,11 @@ describe('IgxTreeGrid - Add Row UI #tGrid', () => {
             expect(hierarchicalGrid.getRowByIndex(1).addRow).toBeTrue();
             hierarchicalGrid.endEdit(true);
             fixture.detectChanges();
+            hierarchicalGrid.addRowSnackbar.triggerAction();
+            fixture.detectChanges();
+
+            await wait(100);
+            fixture.detectChanges();
 
             const newRowData = hierarchicalGrid.data[hierarchicalGrid.data.length - 1];
             const newRow = hierarchicalGrid.rowList.find(r => r.rowID === newRowData[hierarchicalGrid.primaryKey]);