Skip to content

Commit 359bf7c

Browse files
authored
Merge pull request #6586 from IgniteUI/nrobakova/refactor-keyboardNav-tests
refactor keyboard navigation tests
2 parents 233b454 + 3dc4804 commit 359bf7c

File tree

8 files changed

+779
-1058
lines changed

8 files changed

+779
-1058
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { SampleTestData } from '../../test-utils/sample-test-data.spec';
1313
import { IColumnResized } from '../../test-utils/grid-interfaces.spec';
1414
import { MultiColumnHeadersComponent } from '../../test-utils/grid-samples.spec';
1515
import { configureTestSuite } from '../../test-utils/configure-suite';
16+
import { GridFunctions } from '../../test-utils/grid-functions.spec';
1617

1718
describe('IgxGrid - Deferred Column Resizing #grid', () => {
1819
configureTestSuite();
@@ -511,7 +512,7 @@ describe('IgxGrid - Deferred Column Resizing #grid', () => {
511512
fixture.detectChanges();
512513
const grid = fixture.componentInstance.grid;
513514
const headers: DebugElement[] = fixture.debugElement.queryAll(By.css(COLUMN_HEADER_GROUP_CLASS));
514-
const displayContainer: HTMLElement = fixture.componentInstance.grid.tbody.nativeElement.querySelector('igx-display-container');
515+
const displayContainer: HTMLElement = GridFunctions.getGridDisplayContainer(fixture).nativeElement;
515516
let rowsRendered = displayContainer.querySelectorAll('igx-display-container');
516517
let colsRendered = rowsRendered[0].children;
517518

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -283,22 +283,22 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
283283
fix.detectChanges();
284284
GridFunctions.verifyFilteringDropDownIsOpened(fix);
285285

286-
prefix.triggerEventHandler('keydown', UIInteractions.spaceEvent);
286+
UIInteractions.triggerEventHandlerKeyDown(' ', prefix);
287287
tick(30);
288288
fix.detectChanges();
289289
GridFunctions.verifyFilteringDropDownIsOpened(fix, false);
290290

291-
input.triggerEventHandler('keydown', UIInteractions.enterEvent);
291+
UIInteractions.triggerEventHandlerKeyDown('Enter', input);
292292
tick(30);
293293
fix.detectChanges();
294294
GridFunctions.verifyFilteringDropDownIsOpened(fix);
295295

296-
prefix.triggerEventHandler('keydown', UIInteractions.tabEvent);
296+
UIInteractions.triggerEventHandlerKeyDown('Tab', prefix);
297297
tick(30);
298298
fix.detectChanges();
299299
GridFunctions.verifyFilteringDropDownIsOpened(fix, false);
300300

301-
input.triggerEventHandler('keydown', UIInteractions.spaceEvent);
301+
UIInteractions.triggerEventHandlerKeyDown(' ', input);
302302
tick(30);
303303
fix.detectChanges();
304304
GridFunctions.verifyFilteringDropDownIsOpened(fix);
@@ -980,7 +980,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
980980
expect(filterChip.componentInstance.selected).toBeTruthy();
981981
expect(input.componentInstance.value).toEqual('a');
982982

983-
input.triggerEventHandler('keydown', UIInteractions.enterEvent);
983+
UIInteractions.triggerEventHandlerKeyDown('Enter', input);
984984
fix.detectChanges();
985985

986986
// Check focus is kept and chips is no longer selected.
@@ -1298,8 +1298,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
12981298

12991299
const filterUIRow = fix.debugElement.query(By.css(FILTER_UI_ROW));
13001300
const input = filterUIRow.query(By.directive(IgxInputDirective));
1301-
1302-
input.triggerEventHandler('keydown', UIInteractions.altAndArrowDownEvent);
1301+
UIInteractions.triggerEventHandlerKeyDown('ArrowDown', input, true);
13031302
tick(30);
13041303
fix.detectChanges();
13051304
GridFunctions.verifyFilteringDropDownIsOpened(fix);
@@ -1311,7 +1310,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
13111310
let filterUIRow = fix.debugElement.query(By.css(FILTER_UI_ROW));
13121311
const input = filterUIRow.query(By.directive(IgxInputDirective));
13131312

1314-
input.triggerEventHandler('keydown', UIInteractions.escapeEvent);
1313+
UIInteractions.triggerEventHandlerKeyDown('Escape', input);
13151314
tick(100);
13161315
fix.detectChanges();
13171316

@@ -1348,7 +1347,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
13481347
verifyFilterRowUI(input, close, reset, false);
13491348

13501349
// submit the input with empty value
1351-
input.triggerEventHandler('keydown', UIInteractions.enterEvent);
1350+
UIInteractions.triggerEventHandlerKeyDown('Enter', input);
13521351
tick(50);
13531352
fix.detectChanges();
13541353

@@ -1623,7 +1622,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
16231622

16241623
// Press 'Enter' on the commit icon.
16251624
const inputCommitIcon = GridFunctions.getFilterRowInputCommitIcon(fix);
1626-
inputCommitIcon.triggerEventHandler('keydown', UIInteractions.enterEvent);
1625+
UIInteractions.triggerEventHandlerKeyDown('Enter', inputCommitIcon);
16271626
tick(200);
16281627
fix.detectChanges();
16291628

@@ -1645,7 +1644,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
16451644

16461645
// Press 'Enter' on the clear icon.
16471646
const inputClearIcon = GridFunctions.getFilterRowInputClearIcon(fix);
1648-
inputClearIcon.triggerEventHandler('keydown', UIInteractions.enterEvent);
1647+
UIInteractions.triggerEventHandlerKeyDown('Enter', inputClearIcon);
16491648
tick(200);
16501649
fix.detectChanges();
16511650

@@ -1659,7 +1658,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
16591658
expect(fix.debugElement.query(By.css(FILTER_UI_ROW))).toBeNull();
16601659

16611660
const filterCellChip = GridFunctions.getFilterChipsForColumn('ReleaseDate', fix)[0];
1662-
filterCellChip.triggerEventHandler('keydown', UIInteractions.enterEvent);
1661+
UIInteractions.triggerEventHandlerKeyDown('Enter', filterCellChip);
16631662
tick(200);
16641663
fix.detectChanges();
16651664

0 commit comments

Comments
 (0)