Merge branch 'master' into tzhelev/fix-4898--master

Author: tachojelev

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

@@ -55,6 +55,7 @@ describe('IgxTreeGrid - Integration', () => {
         // Init test
         fix = TestBed.createComponent(IgxTreeGridStringTreeColumnComponent);
         fix.detectChanges();
+        tick();
         treeGrid = fix.componentInstance.treeGrid;
 
         TreeGridFunctions.verifyTreeColumn(fix, 'Name', 4);

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

@@ -39,7 +39,7 @@ describe('IgxTreeGrid - Summaries', () => {
     describe('', () => {
         let fix;
         let treeGrid;
-        beforeEach(fakeAsync(/** height/width setter rAF */() => {
+        beforeEach(async(/** height/width setter rAF */() => {
             fix = TestBed.createComponent(IgxTreeGridSummariesKeyComponent);
             fix.detectChanges();
             treeGrid = fix.componentInstance.treeGrid;

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

@@ -37,28 +37,28 @@ describe('IgxTreeGrid Component Tests', () => {
             grid = fix.componentInstance.treeGrid;
         }));
 
+        it('should render 10 records if height is unset and parent container\'s height is unset', () => {
+            fix.detectChanges();
+            const defaultHeight = fix.debugElement.query(By.css(TBODY_CLASS)).styles.height;
+            expect(defaultHeight).not.toBeNull();
+            expect(parseInt(defaultHeight, 10)).toBeGreaterThan(400);
+            expect(fix.componentInstance.isVerticalScrollbarVisible()).toBeTruthy();
+            expect(grid.rowList.length).toBeGreaterThanOrEqual(10);
+        });
+
         it('should match width and height of parent container when width/height are set in %', fakeAsync(() => {
             fix.componentInstance.outerWidth = 800;
             fix.componentInstance.outerHeight = 600;
             grid.width = '50%';
             grid.height = '50%';
-            tick();
             fix.detectChanges();
+            tick();
 
             expect(window.getComputedStyle(grid.nativeElement).height).toMatch('300px');
             expect(window.getComputedStyle(grid.nativeElement).width).toMatch('400px');
             expect(grid.rowList.length).toBeGreaterThan(0);
         }));
 
-        it('should render 10 records if height is unset and parent container\'s height is unset', () => {
-            fix.detectChanges();
-            const defaultHeight = fix.debugElement.query(By.css(TBODY_CLASS)).styles.height;
-            expect(defaultHeight).not.toBeNull();
-            expect(parseInt(defaultHeight, 10)).toBeGreaterThan(400);
-            expect(fix.componentInstance.isVerticalScrollbarVisible()).toBeTruthy();
-            expect(grid.rowList.length).toBeGreaterThanOrEqual(10);
-        });
-
         it('should render 10 records if height is 100% and parent container\'s height is unset', fakeAsync(() => {
             grid.height = '600px';
             tick();