Skip to content

Commit c2bf78d

Browse files
test(hierarchical-grid): move test to virtualization spec
1 parent 8e53018 commit c2bf78d

File tree

2 files changed

+42
-43
lines changed

2 files changed

+42
-43
lines changed

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

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import { clearGridSubs, setupHierarchicalGridScrollDetection } from '../../test-
1111
import { GridFunctions } from '../../test-utils/grid-functions.spec';
1212
import { IgxGridCellComponent } from '../cell.component';
1313
import { IGridCellEventArgs, IgxColumnComponent } from '../public_api';
14-
import { IgxHierarchicalGridDefaultComponent } from '../../test-utils/hierarchical-grid-components.spec';
15-
import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition';
1614

1715
const DEBOUNCE_TIME = 50;
1816
const GRID_CONTENT_CLASS = '.igx-grid__tbody-content';
@@ -33,7 +31,6 @@ describe('IgxHierarchicalGrid Navigation', () => {
3331
IgxHierarchicalGridTestComplexComponent,
3432
IgxHierarchicalGridMultiLayoutComponent,
3533
IgxHierarchicalGridSmallerChildComponent,
36-
IgxHierarchicalGridDefaultComponent
3734
]
3835
}).compileComponents();
3936
jasmine.DEFAULT_TIMEOUT_INTERVAL = defaultTimeout * 2;
@@ -637,45 +634,6 @@ describe('IgxHierarchicalGrid Navigation', () => {
637634

638635
expect(document.activeElement.tagName.toLowerCase()).toBe('input');
639636
});
640-
641-
it('should recalculate and update content correctly after filter is cleared, ensuring no empty areas post-filtering and scrolling', async () => {
642-
// eslint-disable-next-line @typescript-eslint/no-shadow
643-
const fixture = TestBed.createComponent(IgxHierarchicalGridDefaultComponent);
644-
fixture.detectChanges();
645-
// eslint-disable-next-line @typescript-eslint/no-shadow
646-
const hierarchicalGrid = fixture.componentInstance.hierarchicalGrid;
647-
fixture.detectChanges();
648-
await wait(DEBOUNCE_TIME);
649-
650-
hierarchicalGrid.filter('Artist', 'd', IgxStringFilteringOperand.instance().condition('contains'));
651-
fixture.detectChanges();
652-
await wait(DEBOUNCE_TIME);
653-
654-
hierarchicalGrid.expandRow(6);
655-
fixture.detectChanges();
656-
await wait(DEBOUNCE_TIME);
657-
658-
hierarchicalGrid.verticalScrollContainer.getScroll().scrollTop = 2000;
659-
fixture.detectChanges();
660-
await wait(DEBOUNCE_TIME);
661-
662-
hierarchicalGrid.clearFilter();
663-
fixture.detectChanges();
664-
await wait(DEBOUNCE_TIME);
665-
666-
hierarchicalGrid.verticalScrollContainer.getScroll().scrollTop = 2000;
667-
fixture.detectChanges();
668-
await wait(DEBOUNCE_TIME);
669-
fixture.detectChanges();
670-
await wait(DEBOUNCE_TIME);
671-
672-
const hierarchicalGridRect = hierarchicalGrid.tbody.nativeElement.getBoundingClientRect();
673-
const lastRowRect = hierarchicalGrid.dataRowList.last.nativeElement.getBoundingClientRect();
674-
675-
const emptySpace = hierarchicalGridRect.bottom - lastRowRect.bottom;
676-
677-
expect(emptySpace).toBeLessThan(5);
678-
});
679637
});
680638

681639

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

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { IgxStringFilteringOperand } from '../../data-operations/filtering-condi
1414
import { GridFunctions } from '../../test-utils/grid-functions.spec';
1515
import { HierarchicalGridFunctions } from '../../test-utils/hierarchical-grid-functions.spec';
1616
import { IgxHierarchicalRowComponent } from './hierarchical-row.component';
17+
import { IgxHierarchicalGridDefaultComponent } from '../../test-utils/hierarchical-grid-components.spec';
1718

1819
describe('IgxHierarchicalGrid Virtualization #hGrid', () => {
1920
let fixture;
@@ -22,7 +23,8 @@ describe('IgxHierarchicalGrid Virtualization #hGrid', () => {
2223
return TestBed.configureTestingModule({
2324
imports: [
2425
NoopAnimationsModule,
25-
IgxHierarchicalGridTestBaseComponent
26+
IgxHierarchicalGridTestBaseComponent,
27+
IgxHierarchicalGridDefaultComponent
2628
]
2729
});
2830
}));
@@ -393,6 +395,45 @@ describe('IgxHierarchicalGrid Virtualization #hGrid', () => {
393395
expect(ri.gridScroll.emit).toHaveBeenCalled();
394396
expect(ri.dataPreLoad.emit).toHaveBeenCalled();
395397
});
398+
399+
it('should recalculate and update content correctly after filter is cleared, ensuring no empty areas post-filtering and scrolling', async () => {
400+
// eslint-disable-next-line @typescript-eslint/no-shadow
401+
const fixture = TestBed.createComponent(IgxHierarchicalGridDefaultComponent);
402+
fixture.detectChanges();
403+
// eslint-disable-next-line @typescript-eslint/no-shadow
404+
const hierarchicalGrid = fixture.componentInstance.hierarchicalGrid;
405+
fixture.detectChanges();
406+
await wait(50);
407+
408+
hierarchicalGrid.filter('Artist', 'd', IgxStringFilteringOperand.instance().condition('contains'));
409+
fixture.detectChanges();
410+
await wait(50);
411+
412+
hierarchicalGrid.expandRow(6);
413+
fixture.detectChanges();
414+
await wait(50);
415+
416+
hierarchicalGrid.verticalScrollContainer.getScroll().scrollTop = 2000;
417+
fixture.detectChanges();
418+
await wait(50);
419+
420+
hierarchicalGrid.clearFilter();
421+
fixture.detectChanges();
422+
await wait(50);
423+
424+
hierarchicalGrid.verticalScrollContainer.getScroll().scrollTop = 2000;
425+
fixture.detectChanges();
426+
await wait(50);
427+
fixture.detectChanges();
428+
await wait(50);
429+
430+
const hierarchicalGridRect = hierarchicalGrid.tbody.nativeElement.getBoundingClientRect();
431+
const lastRowRect = hierarchicalGrid.dataRowList.last.nativeElement.getBoundingClientRect();
432+
433+
const emptySpace = hierarchicalGridRect.bottom - lastRowRect.bottom;
434+
435+
expect(emptySpace).toBeLessThan(5);
436+
});
396437
});
397438

398439
describe('IgxHierarchicalGrid Virtualization Custom Scenarios #hGrid', () => {

0 commit comments

Comments
 (0)