Skip to content

Commit 33199c2

Browse files
committed
test(query-builder): fix localization test
1 parent 73e3019 commit 33199c2

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

projects/igniteui-angular/src/lib/query-builder/query-builder-functions.spec.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -530,10 +530,10 @@ export class QueryBuilderFunctions {
530530
public static verifyEditModeQueryExpressionInputStates(fix,
531531
entitySelectEnabled: boolean,
532532
fieldComboEnabled: boolean,
533-
columnSelectEnabled: boolean = null,
534-
operatorSelectEnabled: boolean = null,
535-
valueInputEnabled: boolean = null,
536-
commitButtonEnabled: boolean = null,
533+
columnSelectEnabled?: boolean,
534+
operatorSelectEnabled?: boolean,
535+
valueInputEnabled?: boolean,
536+
commitButtonEnabled?: boolean,
537537
level = 0) {
538538
// Verify the entity select state.
539539
const entityInputGroup = QueryBuilderFunctions.getQueryBuilderEntitySelect(fix, level).querySelector('igx-input-group');
@@ -583,9 +583,9 @@ export class QueryBuilderFunctions {
583583
public static verifyQueryEditModeExpressionInputValues(fix,
584584
entityText: string,
585585
fieldsText: string,
586-
columnText: string = null,
587-
operatorText: string = null,
588-
valueText: string = null,
586+
columnText?: string,
587+
operatorText?: string,
588+
valueText?: string,
589589
level = 0) {
590590
const entityInput = QueryBuilderFunctions.getQueryBuilderEntitySelect(fix, level).querySelector('input');
591591
const fieldInput = QueryBuilderFunctions.getQueryBuilderFieldsCombo(fix, level).querySelector('input');
@@ -888,7 +888,6 @@ export class QueryBuilderFunctions {
888888
}
889889

890890
public static selectEntityAndClickInitialAddGroup(fix: ComponentFixture<any>, entityIndex: number, groupIndex: number) {
891-
// Select 'Orders' entity
892891
QueryBuilderFunctions.selectEntityInEditModeExpression(fix, entityIndex);
893892
tick(100);
894893
fix.detectChanges();

projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ describe('IgxQueryBuilder', () => {
3434

3535
describe('Basic', () => {
3636
it('Should render empty Query Builder properly.', fakeAsync(() => {
37+
tick(100);
38+
fix.detectChanges();
3739
const queryBuilderElement: HTMLElement = fix.debugElement.queryAll(By.css(`.${QueryBuilderConstants.QUERY_BUILDER_CLASS}`))[0].nativeElement;
3840
expect(queryBuilderElement).toBeDefined();
3941
expect(queryBuilderElement.children.length).toEqual(2);
@@ -2478,6 +2480,11 @@ describe('IgxQueryBuilder', () => {
24782480
});
24792481
fix.detectChanges();
24802482

2483+
// Select 'Orders' entity
2484+
QueryBuilderFunctions.selectEntityInEditModeExpression(fix, 1);
2485+
tick(100);
2486+
fix.detectChanges();
2487+
24812488
expect(QueryBuilderFunctions.getQueryBuilderHeaderText(fix)).toBe(' My advanced filter ');
24822489
expect((QueryBuilderFunctions.getQueryBuilderHeaderLegendItemAnd(fix) as HTMLElement).innerText).toBe('My and');
24832490
expect((QueryBuilderFunctions.getQueryBuilderHeaderLegendItemOr(fix) as HTMLElement).innerText).toBe('My or');
@@ -2487,6 +2494,7 @@ describe('IgxQueryBuilder', () => {
24872494
.toBe('My or group');
24882495
expect((QueryBuilderFunctions.getQueryBuilderEmptyPrompt(fix) as HTMLElement).innerText).toBe('My initial text');
24892496

2497+
// Click the initial 'Add Or Group' button.
24902498
QueryBuilderFunctions.clickQueryBuilderInitialAddGroupButton(fix, 0);
24912499
tick(100);
24922500
fix.detectChanges();
@@ -2498,11 +2506,9 @@ describe('IgxQueryBuilder', () => {
24982506
expect((QueryBuilderFunctions.getQueryBuilderTreeRootGroupButtons(fix, 0)[2] as HTMLElement).querySelector('span').innerText)
24992507
.toBe('My or group');
25002508

2501-
// Populate edit inputs.
2502-
QueryBuilderFunctions.selectEntityInEditModeExpression(fix, 0); // Select 'Products'.
25032509

25042510
// Show changing entity alert dialog
2505-
QueryBuilderFunctions.selectEntityInEditModeExpression(fix, 1);
2511+
QueryBuilderFunctions.selectEntityInEditModeExpression(fix, 0);
25062512
tick(100);
25072513
fix.detectChanges();
25082514
const dialogOutlet = document.querySelector('.igx-dialog__window');
@@ -2514,6 +2520,13 @@ describe('IgxQueryBuilder', () => {
25142520
expect(dialogOutlet.querySelector('.igx-dialog__window-actions').children[0].textContent.trim()).toBe('My Cancel');
25152521
expect(dialogOutlet.querySelector('.igx-dialog__window-actions').children[1].textContent.trim()).toBe('My Confirm');
25162522

2523+
const confirmButton = Array.from(dialogOutlet.querySelectorAll('button'))[1];
2524+
confirmButton.click();
2525+
fix.detectChanges();
2526+
tick(100);
2527+
fix.detectChanges();
2528+
2529+
// Click the initial 'Add And Group' button.
25172530
QueryBuilderFunctions.clickQueryBuilderInitialAddGroupButton(fix, 0);
25182531
tick(100);
25192532
fix.detectChanges();
@@ -2543,11 +2556,13 @@ describe('IgxQueryBuilder', () => {
25432556

25442557
// Close context menu.
25452558
QueryBuilderFunctions.clickQueryBuilderContextMenuCloseButton(fix);
2559+
tick(100);
25462560
fix.detectChanges();
25472561

25482562
// Add another expression to root group.
25492563
let btn = QueryBuilderFunctions.getQueryBuilderTreeRootGroupButtons(fix, 0)[0] as HTMLElement;
25502564
btn.click();
2565+
tick(100);
25512566
fix.detectChanges();
25522567

25532568
// Populate edit inputs.

0 commit comments

Comments
 (0)