Skip to content

Commit fa48396

Browse files
kdinevkdinev
authored
Merge branch '9.0.x' into hPopov/refactor-grid-pinning-tests-90x
2 parents be35f57 + a772761 commit fa48396

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+986
-967
lines changed

‎projects/igniteui-angular/src/lib/calendar/calendar-multi-view.component.spec.ts‎

Lines changed: 65 additions & 76 deletions
Large diffs are not rendered by default.

‎projects/igniteui-angular/src/lib/calendar/calendar.component.spec.ts‎

Lines changed: 85 additions & 84 deletions
Large diffs are not rendered by default.

‎projects/igniteui-angular/src/lib/calendar/month-picker/month-picker.component.spec.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ describe('IgxMonthPicker', () => {
242242

243243
expect(prev.nativeElement).toBe(document.activeElement);
244244

245-
UIInteractions.simulateKeyDownEvent(prev.nativeElement, 'Enter');
245+
UIInteractions.triggerKeyDownEvtUponElem('Enter', prev.nativeElement);
246246
fixture.detectChanges();
247247

248248
expect(monthPicker.viewDate.getFullYear()).toEqual(2018);
@@ -252,23 +252,23 @@ describe('IgxMonthPicker', () => {
252252

253253
expect(next.nativeElement).toBe(document.activeElement);
254254

255-
UIInteractions.simulateKeyDownEvent(next.nativeElement, 'Enter');
256-
UIInteractions.simulateKeyDownEvent(next.nativeElement, 'Enter');
257-
UIInteractions.simulateKeyDownEvent(next.nativeElement, 'Enter');
255+
UIInteractions.triggerKeyDownEvtUponElem('Enter', next.nativeElement);
256+
UIInteractions.triggerKeyDownEvtUponElem('Enter', next.nativeElement);
257+
UIInteractions.triggerKeyDownEvtUponElem('Enter', next.nativeElement);
258258
fixture.detectChanges();
259259

260260
expect(monthPicker.viewDate.getFullYear()).toEqual(2021);
261261
expect(yearBtn.nativeElement.textContent.trim()).toMatch('2021');
262262

263263
yearBtn.nativeElement.focus();
264264

265-
UIInteractions.simulateKeyDownEvent(yearBtn.nativeElement, 'ArrowRight');
265+
UIInteractions.triggerKeyDownEvtUponElem('ArrowRight', yearBtn.nativeElement);
266266
fixture.detectChanges();
267267

268268
expect(monthPicker.viewDate.getFullYear()).toEqual(2022);
269269
expect(yearBtn.nativeElement.textContent.trim()).toMatch('2022');
270270

271-
UIInteractions.simulateKeyDownEvent(yearBtn.nativeElement, 'ArrowLeft');
271+
UIInteractions.triggerKeyDownEvtUponElem('ArrowLeft', yearBtn.nativeElement);
272272
fixture.detectChanges();
273273

274274
expect(monthPicker.viewDate.getFullYear()).toEqual(2021);
@@ -287,25 +287,25 @@ describe('IgxMonthPicker', () => {
287287

288288
expect(year.nativeElement).toBe(document.activeElement);
289289

290-
UIInteractions.simulateKeyDownEvent(document.activeElement, 'Enter');
290+
UIInteractions.triggerKeyDownEvtUponElem('Enter' , document.activeElement );
291291
fixture.detectChanges();
292292

293293
let currentYear = dom.query(By.css('.igx-calendar__year--current'));
294294

295-
UIInteractions.simulateKeyDownEvent(currentYear.nativeElement, 'ArrowDown');
295+
UIInteractions.triggerKeyDownEvtUponElem('ArrowDown' , currentYear.nativeElement );
296296
fixture.detectChanges();
297297

298298
currentYear = dom.query(By.css('.igx-calendar__year--current'));
299299
expect(currentYear.nativeElement.textContent.trim()).toMatch('2020');
300300

301-
UIInteractions.simulateKeyDownEvent(currentYear.nativeElement, 'ArrowUp');
302-
UIInteractions.simulateKeyDownEvent(currentYear.nativeElement, 'ArrowUp');
301+
UIInteractions.triggerKeyDownEvtUponElem('ArrowUp' , currentYear.nativeElement );
302+
UIInteractions.triggerKeyDownEvtUponElem('ArrowUp' , currentYear.nativeElement );
303303
fixture.detectChanges();
304304

305305
currentYear = dom.query(By.css('.igx-calendar__year--current'));
306306
expect(currentYear.nativeElement.textContent.trim()).toMatch('2018');
307307

308-
UIInteractions.simulateKeyDownEvent(currentYear.nativeElement, 'Enter');
308+
UIInteractions.triggerKeyDownEvtUponElem('Enter' , currentYear.nativeElement );
309309
fixture.detectChanges();
310310

311311
year = dom.query(By.css('.igx-calendar-picker__date'));
@@ -327,28 +327,28 @@ describe('IgxMonthPicker', () => {
327327
expect(months.length).toEqual(11);
328328
expect(currentMonth.nativeElement.textContent.trim()).toMatch('Feb');
329329

330-
UIInteractions.simulateKeyDownEvent(currentMonth.nativeElement, 'Home');
330+
UIInteractions.triggerKeyDownEvtUponElem('Home' , currentMonth.nativeElement );
331331
fixture.detectChanges();
332332

333333
expect(document.activeElement.textContent.trim()).toMatch('Jan');
334334

335-
UIInteractions.simulateKeyDownEvent(currentMonth.nativeElement, 'End');
335+
UIInteractions.triggerKeyDownEvtUponElem('End' , currentMonth.nativeElement );
336336
fixture.detectChanges();
337337

338338
expect(document.activeElement.textContent.trim()).toMatch('Dec');
339339

340-
UIInteractions.simulateKeyDownEvent(document.activeElement, 'ArrowLeft');
340+
UIInteractions.triggerKeyDownEvtUponElem('ArrowLeft' , document.activeElement );
341341
fixture.detectChanges();
342342

343-
UIInteractions.simulateKeyDownEvent(document.activeElement, 'ArrowUp');
343+
UIInteractions.triggerKeyDownEvtUponElem('ArrowUp' , document.activeElement );
344344
fixture.detectChanges();
345345

346-
UIInteractions.simulateKeyDownEvent(document.activeElement, 'ArrowRight');
346+
UIInteractions.triggerKeyDownEvtUponElem('ArrowRight' , document.activeElement );
347347
fixture.detectChanges();
348348

349349
expect(document.activeElement.textContent.trim()).toMatch('Sep');
350350

351-
UIInteractions.simulateKeyDownEvent(document.activeElement, 'Enter');
351+
UIInteractions.triggerKeyDownEvtUponElem('Enter' , document.activeElement );
352352
fixture.detectChanges();
353353

354354
expect(monthPicker.viewDate.getMonth()).toEqual(8);

‎projects/igniteui-angular/src/lib/combo/combo.component.spec.ts‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,14 +1303,14 @@ describe('igxCombo', () => {
13031303
}));
13041304
it('should toggle combo dropdown on toggle button click', fakeAsync(() => {
13051305
spyOn(combo, 'toggle').and.callThrough();
1306-
input.triggerEventHandler('click', UIInteractions.clickEvent);
1306+
input.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
13071307
tick();
13081308
fixture.detectChanges();
13091309
expect(combo.collapsed).toEqual(false);
13101310
expect(combo.toggle).toHaveBeenCalledTimes(1);
13111311
expect(document.activeElement).toEqual(combo.searchInput.nativeElement);
13121312

1313-
input.triggerEventHandler('click', UIInteractions.clickEvent);
1313+
input.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
13141314
tick();
13151315
fixture.detectChanges();
13161316
expect(combo.collapsed).toEqual(true);
@@ -1581,7 +1581,7 @@ describe('igxCombo', () => {
15811581
await wait(30);
15821582
fixture.detectChanges();
15831583
let selectedItem = fixture.debugElement.queryAll(By.css(`.${CSS_CLASS_DROPDOWNLISTITEM}`))[1];
1584-
selectedItem.triggerEventHandler('click', UIInteractions.clickEvent);
1584+
selectedItem.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
15851585
fixture.detectChanges();
15861586
expect(selectedItem.classes[CSS_CLASS_SELECTED]).toEqual(true);
15871587
const selectedItemText = selectedItem.nativeElement.textContent;
@@ -1636,7 +1636,7 @@ describe('igxCombo', () => {
16361636
function simulateComboItemCheckboxClick(itemIndex: number, isHeader = false) {
16371637
const itemClass = isHeader ? CSS_CLASS_HEADERITEM : CSS_CLASS_DROPDOWNLISTITEM;
16381638
const dropdownItem = fixture.debugElement.queryAll(By.css('.' + itemClass))[itemIndex];
1639-
dropdownItem.triggerEventHandler('click', UIInteractions.clickEvent);
1639+
dropdownItem.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
16401640
fixture.detectChanges();
16411641
}
16421642
it('should append/remove selected items to the input in their selection order', () => {
@@ -1687,7 +1687,7 @@ describe('igxCombo', () => {
16871687
expect(combo.dropdown.items[6].selected).toBeTruthy();
16881688

16891689
const clearBtn = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
1690-
clearBtn.triggerEventHandler('click', UIInteractions.clickEvent);
1690+
clearBtn.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
16911691
fixture.detectChanges();
16921692

16931693
expect(input.nativeElement.value).toEqual('');
@@ -1721,7 +1721,8 @@ describe('igxCombo', () => {
17211721
expect(fixture.debugElement.queryAll(By.css(`.${CSS_CLASS_CLEARBUTTON}`)).length).toEqual(1);
17221722

17231723
// Clear selected items
1724-
fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`)).triggerEventHandler('click', UIInteractions.clickEvent);
1724+
const clearButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
1725+
clearButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
17251726
fixture.detectChanges();
17261727
fixture.detectChanges();
17271728
expect(fixture.debugElement.queryAll(By.css(`.${CSS_CLASS_CLEARBUTTON}`)).length).toBeFalsy();
@@ -1744,7 +1745,7 @@ describe('igxCombo', () => {
17441745
oldSelection: [],
17451746
added: [selectedItem_1.value[combo.valueKey]],
17461747
removed: [],
1747-
event: UIInteractions.clickEvent,
1748+
event: UIInteractions.getMouseEvent('click'),
17481749
displayText: selectedItem_1.value[combo.valueKey],
17491750
cancel: false
17501751
});
@@ -1761,7 +1762,7 @@ describe('igxCombo', () => {
17611762
oldSelection: [selectedItem_1.value[combo.valueKey]],
17621763
added: [selectedItem_2.value[combo.valueKey]],
17631764
removed: [],
1764-
event: UIInteractions.clickEvent,
1765+
event: UIInteractions.getMouseEvent('click'),
17651766
displayText: selectedItem_1.value[combo.valueKey] + ', ' + selectedItem_2.value[combo.valueKey],
17661767
cancel: false
17671768
});
@@ -1779,7 +1780,7 @@ describe('igxCombo', () => {
17791780
oldSelection: [selectedItem_1.value[combo.valueKey], selectedItem_2.value[combo.valueKey]],
17801781
added: [],
17811782
removed: [unselectedItem.value[combo.valueKey]],
1782-
event: UIInteractions.clickEvent,
1783+
event: UIInteractions.getMouseEvent('click'),
17831784
displayText: selectedItem_2.value[combo.valueKey],
17841785
cancel: false
17851786
});
@@ -2186,13 +2187,13 @@ describe('igxCombo', () => {
21862187
const addItemButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_ADDBUTTON}`));
21872188
expect(addItemButton.nativeElement).toBeDefined();
21882189

2189-
addItemButton.triggerEventHandler('click', UIInteractions.clickEvent);
2190+
addItemButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
21902191
fixture.detectChanges();
21912192
expect(combo.selectedItems()).toEqual(['New']);
21922193
expect(combo.comboInput.nativeElement.value).toEqual('New');
21932194

21942195
const clearButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
2195-
clearButton.triggerEventHandler('click', UIInteractions.clickEvent);
2196+
clearButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
21962197
fixture.detectChanges();
21972198
expect(combo.selectedItems()).toEqual([]);
21982199
expect(combo.comboInput.nativeElement.value).toEqual('');
@@ -2267,7 +2268,7 @@ describe('igxCombo', () => {
22672268
expect(combo.value).toEqual('');
22682269

22692270
const focusedItem = fixture.debugElement.query(By.css(`.${CSS_CLASS_FOCUSED}`));
2270-
focusedItem.triggerEventHandler('click', UIInteractions.clickEvent);
2271+
focusedItem.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
22712272
fixture.detectChanges();
22722273
expect(combo.collapsed).toBeFalsy();
22732274
expect(combo.value).toEqual('My New Custom Item');
@@ -2356,7 +2357,7 @@ describe('igxCombo', () => {
23562357
expect(combo.valid).toEqual(IgxComboState.INITIAL);
23572358
expect(combo.comboInput.valid).toEqual(IgxInputState.INITIAL);
23582359
const clearButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
2359-
clearButton.triggerEventHandler('click', UIInteractions.clickEvent);
2360+
clearButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
23602361
fixture.detectChanges();
23612362
expect(combo.valid).toEqual(IgxComboState.INVALID);
23622363
expect(combo.comboInput.valid).toEqual(IgxInputState.INVALID);
@@ -2387,7 +2388,7 @@ describe('igxCombo', () => {
23872388
expect(combo.valid).toEqual(IgxComboState.INITIAL);
23882389
expect(combo.comboInput.valid).toEqual(IgxInputState.INITIAL);
23892390
const clearButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
2390-
clearButton.triggerEventHandler('click', UIInteractions.clickEvent);
2391+
clearButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
23912392
fixture.detectChanges();
23922393
expect(combo.valid).toEqual(IgxComboState.INITIAL);
23932394
expect(combo.comboInput.valid).toEqual(IgxInputState.INITIAL);
@@ -2468,7 +2469,7 @@ describe('igxCombo', () => {
24682469
spyOn(console, 'log');
24692470
fixture.detectChanges();
24702471
expect(form.status).toEqual('VALID');
2471-
fixture.debugElement.query(By.css('button')).triggerEventHandler('click', UIInteractions.clickElement);
2472+
fixture.debugElement.query(By.css('button')).triggerEventHandler('click', UIInteractions.simulateClickAndSelectEvent);
24722473
});
24732474
});
24742475
describe('Template form tests: ', () => {
@@ -2510,7 +2511,7 @@ describe('igxCombo', () => {
25102511
expect(combo.comboInput.valid).toEqual(IgxInputState.VALID);
25112512

25122513
const clearButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
2513-
clearButton.triggerEventHandler('click', UIInteractions.clickEvent);
2514+
clearButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
25142515
fixture.detectChanges();
25152516
expect(combo.valid).toEqual(IgxComboState.INVALID);
25162517
expect(combo.comboInput.valid).toEqual(IgxInputState.INVALID);

0 commit comments

Comments
 (0)