Skip to content

Commit 5134504

Browse files
ChronosSFChronosSF
authored
Merge branch 'master' into pbozhinov/treegrid-rp-filtering
2 parents e5b7960 + 24c11a4 commit 5134504

File tree

51 files changed

+1303
-1317
lines changed

Some content is hidden

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

51 files changed

+1303
-1317
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
@@ -1334,14 +1334,14 @@ describe('igxCombo', () => {
13341334
}));
13351335
it('should toggle combo dropdown on toggle button click', fakeAsync(() => {
13361336
spyOn(combo, 'toggle').and.callThrough();
1337-
input.triggerEventHandler('click', UIInteractions.clickEvent);
1337+
input.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
13381338
tick();
13391339
fixture.detectChanges();
13401340
expect(combo.collapsed).toEqual(false);
13411341
expect(combo.toggle).toHaveBeenCalledTimes(1);
13421342
expect(document.activeElement).toEqual(combo.searchInput.nativeElement);
13431343

1344-
input.triggerEventHandler('click', UIInteractions.clickEvent);
1344+
input.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
13451345
tick();
13461346
fixture.detectChanges();
13471347
expect(combo.collapsed).toEqual(true);
@@ -1612,7 +1612,7 @@ describe('igxCombo', () => {
16121612
await wait(30);
16131613
fixture.detectChanges();
16141614
let selectedItem = fixture.debugElement.queryAll(By.css(`.${CSS_CLASS_DROPDOWNLISTITEM}`))[1];
1615-
selectedItem.triggerEventHandler('click', UIInteractions.clickEvent);
1615+
selectedItem.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
16161616
fixture.detectChanges();
16171617
expect(selectedItem.classes[CSS_CLASS_SELECTED]).toEqual(true);
16181618
const selectedItemText = selectedItem.nativeElement.textContent;
@@ -1667,7 +1667,7 @@ describe('igxCombo', () => {
16671667
function simulateComboItemCheckboxClick(itemIndex: number, isHeader = false) {
16681668
const itemClass = isHeader ? CSS_CLASS_HEADERITEM : CSS_CLASS_DROPDOWNLISTITEM;
16691669
const dropdownItem = fixture.debugElement.queryAll(By.css('.' + itemClass))[itemIndex];
1670-
dropdownItem.triggerEventHandler('click', UIInteractions.clickEvent);
1670+
dropdownItem.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
16711671
fixture.detectChanges();
16721672
}
16731673
it('should append/remove selected items to the input in their selection order', () => {
@@ -1718,7 +1718,7 @@ describe('igxCombo', () => {
17181718
expect(combo.dropdown.items[6].selected).toBeTruthy();
17191719

17201720
const clearBtn = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
1721-
clearBtn.triggerEventHandler('click', UIInteractions.clickEvent);
1721+
clearBtn.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
17221722
fixture.detectChanges();
17231723

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

17541754
// Clear selected items
1755-
fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`)).triggerEventHandler('click', UIInteractions.clickEvent);
1755+
const clearButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
1756+
clearButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
17561757
fixture.detectChanges();
17571758
fixture.detectChanges();
17581759
expect(fixture.debugElement.queryAll(By.css(`.${CSS_CLASS_CLEARBUTTON}`)).length).toBeFalsy();
@@ -1775,7 +1776,7 @@ describe('igxCombo', () => {
17751776
oldSelection: [],
17761777
added: [selectedItem_1.value[combo.valueKey]],
17771778
removed: [],
1778-
event: UIInteractions.clickEvent,
1779+
event: UIInteractions.getMouseEvent('click'),
17791780
displayText: selectedItem_1.value[combo.valueKey],
17801781
cancel: false
17811782
});
@@ -1792,7 +1793,7 @@ describe('igxCombo', () => {
17921793
oldSelection: [selectedItem_1.value[combo.valueKey]],
17931794
added: [selectedItem_2.value[combo.valueKey]],
17941795
removed: [],
1795-
event: UIInteractions.clickEvent,
1796+
event: UIInteractions.getMouseEvent('click'),
17961797
displayText: selectedItem_1.value[combo.valueKey] + ', ' + selectedItem_2.value[combo.valueKey],
17971798
cancel: false
17981799
});
@@ -1810,7 +1811,7 @@ describe('igxCombo', () => {
18101811
oldSelection: [selectedItem_1.value[combo.valueKey], selectedItem_2.value[combo.valueKey]],
18111812
added: [],
18121813
removed: [unselectedItem.value[combo.valueKey]],
1813-
event: UIInteractions.clickEvent,
1814+
event: UIInteractions.getMouseEvent('click'),
18141815
displayText: selectedItem_2.value[combo.valueKey],
18151816
cancel: false
18161817
});
@@ -2217,13 +2218,13 @@ describe('igxCombo', () => {
22172218
const addItemButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_ADDBUTTON}`));
22182219
expect(addItemButton.nativeElement).toBeDefined();
22192220

2220-
addItemButton.triggerEventHandler('click', UIInteractions.clickEvent);
2221+
addItemButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
22212222
fixture.detectChanges();
22222223
expect(combo.selectedItems()).toEqual(['New']);
22232224
expect(combo.comboInput.nativeElement.value).toEqual('New');
22242225

22252226
const clearButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
2226-
clearButton.triggerEventHandler('click', UIInteractions.clickEvent);
2227+
clearButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
22272228
fixture.detectChanges();
22282229
expect(combo.selectedItems()).toEqual([]);
22292230
expect(combo.comboInput.nativeElement.value).toEqual('');
@@ -2298,7 +2299,7 @@ describe('igxCombo', () => {
22982299
expect(combo.value).toEqual('');
22992300

23002301
const focusedItem = fixture.debugElement.query(By.css(`.${CSS_CLASS_FOCUSED}`));
2301-
focusedItem.triggerEventHandler('click', UIInteractions.clickEvent);
2302+
focusedItem.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
23022303
fixture.detectChanges();
23032304
expect(combo.collapsed).toBeFalsy();
23042305
expect(combo.value).toEqual('My New Custom Item');
@@ -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.INVALID);
23932394
expect(combo.comboInput.valid).toEqual(IgxInputState.INVALID);
@@ -2418,7 +2419,7 @@ describe('igxCombo', () => {
24182419
expect(combo.valid).toEqual(IgxComboState.INITIAL);
24192420
expect(combo.comboInput.valid).toEqual(IgxInputState.INITIAL);
24202421
const clearButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
2421-
clearButton.triggerEventHandler('click', UIInteractions.clickEvent);
2422+
clearButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
24222423
fixture.detectChanges();
24232424
expect(combo.valid).toEqual(IgxComboState.INITIAL);
24242425
expect(combo.comboInput.valid).toEqual(IgxInputState.INITIAL);
@@ -2499,7 +2500,7 @@ describe('igxCombo', () => {
24992500
spyOn(console, 'log');
25002501
fixture.detectChanges();
25012502
expect(form.status).toEqual('VALID');
2502-
fixture.debugElement.query(By.css('button')).triggerEventHandler('click', UIInteractions.clickElement);
2503+
fixture.debugElement.query(By.css('button')).triggerEventHandler('click', UIInteractions.simulateClickAndSelectEvent);
25032504
});
25042505
});
25052506
describe('Template form tests: ', () => {
@@ -2541,7 +2542,7 @@ describe('igxCombo', () => {
25412542
expect(combo.comboInput.valid).toEqual(IgxInputState.VALID);
25422543

25432544
const clearButton = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
2544-
clearButton.triggerEventHandler('click', UIInteractions.clickEvent);
2545+
clearButton.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
25452546
fixture.detectChanges();
25462547
expect(combo.valid).toEqual(IgxComboState.INVALID);
25472548
expect(combo.comboInput.valid).toEqual(IgxInputState.INVALID);

0 commit comments

Comments
 (0)