Skip to content

Commit 24ba4b3

Browse files
CopilotChronosSF
Copilot
and
ChronosSF
committed
Phase 3 continued: Complete Jasmine to Vitest syntax conversion
Co-authored-by: ChronosSF <[email protected]>
1 parent 4782667 commit 24ba4b3

File tree

31 files changed

+247
-134
lines changed

31 files changed

+247
-134
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,10 @@ describe("IgxCalendar - ", () => {
261261
fixture.detectChanges();
262262

263263
expect(calendar.formatOptions).toEqual(
264-
jasmine.objectContaining(defaultOptions),
264+
expect.objectContaining(defaultOptions),
265265
);
266266
expect(calendar.formatViews).toEqual(
267-
jasmine.objectContaining(defaultViews),
267+
expect.objectContaining(defaultViews),
268268
);
269269
expect(
270270
headerTitle.nativeElement.textContent.trim(),
@@ -293,12 +293,12 @@ describe("IgxCalendar - ", () => {
293293
fixture.detectChanges();
294294

295295
expect(calendar.formatOptions).toEqual(
296-
jasmine.objectContaining(
296+
expect.objectContaining(
297297
Object.assign(defaultOptions, formatOptions),
298298
),
299299
);
300300
expect(calendar.formatViews).toEqual(
301-
jasmine.objectContaining(
301+
expect.objectContaining(
302302
Object.assign(defaultViews, formatViews),
303303
),
304304
);
@@ -327,12 +327,12 @@ describe("IgxCalendar - ", () => {
327327
fixture.detectChanges();
328328

329329
expect(calendar.formatOptions).toEqual(
330-
jasmine.objectContaining(
330+
expect.objectContaining(
331331
Object.assign(defaultOptions, formatOptions),
332332
),
333333
);
334334
expect(calendar.formatViews).toEqual(
335-
jasmine.objectContaining(
335+
expect.objectContaining(
336336
Object.assign(defaultViews, formatViews),
337337
),
338338
);
@@ -2997,10 +2997,10 @@ describe("IgxCalendar - ", () => {
29972997
fixture.detectChanges();
29982998

29992999
expect(calendar.formatOptions).toEqual(
3000-
jasmine.objectContaining(defaultOptions),
3000+
expect.objectContaining(defaultOptions),
30013001
);
30023002
expect(calendar.formatViews).toEqual(
3003-
jasmine.objectContaining(defaultViews),
3003+
expect.objectContaining(defaultViews),
30043004
);
30053005
expect(headerYear.nativeElement.textContent.trim()).toMatch(
30063006
"Select Date",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ describe('IgxMonthPicker', () => {
126126
const yearBtn = dom.query(By.css('.igx-calendar-picker__date'));
127127
const month = dom.queryAll(By.css('.igx-calendar-view__item'))[0];
128128

129-
expect(monthPicker.formatOptions).toEqual(jasmine.objectContaining(defaultOptions));
130-
expect(monthPicker.formatViews).toEqual(jasmine.objectContaining(defaultViews));
129+
expect(monthPicker.formatOptions).toEqual(expect.objectContaining(defaultOptions));
130+
expect(monthPicker.formatViews).toEqual(expect.objectContaining(defaultViews));
131131
expect(yearBtn.nativeElement.textContent.trim()).toMatch('2019');
132132
expect(month.nativeElement.textContent.trim()).toMatch('Jan');
133133

@@ -140,8 +140,8 @@ describe('IgxMonthPicker', () => {
140140

141141
const march = dom.queryAll(By.css('.igx-calendar-view__item'))[2];
142142

143-
expect(monthPicker.formatOptions).toEqual(jasmine.objectContaining(Object.assign(defaultOptions, formatOptions)));
144-
expect(monthPicker.formatViews).toEqual(jasmine.objectContaining(Object.assign(defaultViews, formatViews)));
143+
expect(monthPicker.formatOptions).toEqual(expect.objectContaining(Object.assign(defaultOptions, formatOptions)));
144+
expect(monthPicker.formatViews).toEqual(expect.objectContaining(Object.assign(defaultViews, formatViews)));
145145
expect(yearBtn.nativeElement.textContent.trim()).toMatch('19');
146146
expect(march.nativeElement.textContent.trim()).toMatch('March');
147147

‎projects/igniteui-angular/chat-extras/src/markdown-pipe.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('MarkdownPipe', () => {
4444

4545
expect(bypassSpy).toHaveBeenCalledTimes(1);
4646

47-
const htmlString = bypassSpy.calls.mostRecent().args[0];
47+
const htmlString = bypassSpy.mock.lastCall[0];
4848

4949
expect(htmlString).toContain('style="color: var(--shiki-fg);"');
5050
expect(htmlString).toContain('<pre class="shiki"');

‎projects/igniteui-angular/chips/src/chips/chips-area.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ describe('IgxChipsArea ', () => {
128128
});
129129

130130
it('should add chips when adding data items ', () => {
131-
expect(chipAreaElement.nativeElement.classList).toEqual(jasmine.arrayWithExactContents(['customClass', CHIP_AREA_CLASS]));
131+
expect(chipAreaElement.nativeElement.classList).toEqual(expect.arrayContaining(['customClass', CHIP_AREA_CLASS]));
132132
expect(chipAreaElement.nativeElement.children.length).toEqual(2);
133133

134134
fix.componentInstance.chipList.push({ id: 'Town', text: 'Town', removable: true, selectable: true, draggable: true });

‎projects/igniteui-angular/core/src/date-common/util/date-time.util.spec.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,74 +46,74 @@ describe(`DateTimeUtil Unit tests`, () => {
4646
let result = DateTimeUtil.parseDateTimeFormat('MM/dd/yyyy', angularFormatter);
4747
let resDict = reduceToDictionary(result);
4848
expect(result.length).toEqual(5);
49-
expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
50-
expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
51-
expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
49+
expect(resDict[DatePart.Month]).toEqual(expect.objectContaining({ start: 0, end: 2 }));
50+
expect(resDict[DatePart.Date]).toEqual(expect.objectContaining({ start: 3, end: 5 }));
51+
expect(resDict[DatePart.Year]).toEqual(expect.objectContaining({ start: 6, end: 10 }));
5252

5353
// M/d/yy should be 00/00/00
5454
result = DateTimeUtil.parseDateTimeFormat('M/d/yy', angularFormatter);
5555
resDict = reduceToDictionary(result);
5656
expect(result.length).toEqual(5);
57-
expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
58-
expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
59-
expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 8 }));
57+
expect(resDict[DatePart.Month]).toEqual(expect.objectContaining({ start: 0, end: 2 }));
58+
expect(resDict[DatePart.Date]).toEqual(expect.objectContaining({ start: 3, end: 5 }));
59+
expect(resDict[DatePart.Year]).toEqual(expect.objectContaining({ start: 6, end: 8 }));
6060

6161
// d/M/y should be 00/00/0000
6262
result = DateTimeUtil.parseDateTimeFormat('d/M/y', angularFormatter);
6363
resDict = reduceToDictionary(result);
6464
expect(result.length).toEqual(5);
65-
expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
66-
expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
67-
expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
65+
expect(resDict[DatePart.Date]).toEqual(expect.objectContaining({ start: 0, end: 2 }));
66+
expect(resDict[DatePart.Month]).toEqual(expect.objectContaining({ start: 3, end: 5 }));
67+
expect(resDict[DatePart.Year]).toEqual(expect.objectContaining({ start: 6, end: 10 }));
6868

6969
// d/M/yyy should be 00/00/0000
7070
result = DateTimeUtil.parseDateTimeFormat('d/M/yyy', angularFormatter);
7171
resDict = reduceToDictionary(result);
7272
expect(result.length).toEqual(5);
73-
expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
74-
expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
75-
expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
73+
expect(resDict[DatePart.Date]).toEqual(expect.objectContaining({ start: 0, end: 2 }));
74+
expect(resDict[DatePart.Month]).toEqual(expect.objectContaining({ start: 3, end: 5 }));
75+
expect(resDict[DatePart.Year]).toEqual(expect.objectContaining({ start: 6, end: 10 }));
7676

7777

7878
// d/M/yyyy should 00/00/0000
7979
result = DateTimeUtil.parseDateTimeFormat('d/M/yyyy', angularFormatter);
8080
resDict = reduceToDictionary(result);
8181
expect(result.length).toEqual(5);
82-
expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
83-
expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
84-
expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
82+
expect(resDict[DatePart.Date]).toEqual(expect.objectContaining({ start: 0, end: 2 }));
83+
expect(resDict[DatePart.Month]).toEqual(expect.objectContaining({ start: 3, end: 5 }));
84+
expect(resDict[DatePart.Year]).toEqual(expect.objectContaining({ start: 6, end: 10 }));
8585

8686

8787
// H:m:s should be 00:00:00
8888
result = DateTimeUtil.parseDateTimeFormat('H:m:s', angularFormatter);
8989
resDict = reduceToDictionary(result);
9090
expect(result.length).toEqual(5);
91-
expect(resDict[DatePart.Hours]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
92-
expect(resDict[DatePart.Minutes]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
93-
expect(resDict[DatePart.Seconds]).toEqual(jasmine.objectContaining({ start: 6, end: 8 }));
91+
expect(resDict[DatePart.Hours]).toEqual(expect.objectContaining({ start: 0, end: 2 }));
92+
expect(resDict[DatePart.Minutes]).toEqual(expect.objectContaining({ start: 3, end: 5 }));
93+
expect(resDict[DatePart.Seconds]).toEqual(expect.objectContaining({ start: 6, end: 8 }));
9494

9595
result = DateTimeUtil.parseDateTimeFormat('dd.MM.yyyy г.', angularFormatter);
9696
resDict = reduceToDictionary(result);
9797
expect(result.length).toEqual(6);
98-
expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
99-
expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
100-
expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
98+
expect(resDict[DatePart.Date]).toEqual(expect.objectContaining({ start: 0, end: 2 }));
99+
expect(resDict[DatePart.Month]).toEqual(expect.objectContaining({ start: 3, end: 5 }));
100+
expect(resDict[DatePart.Year]).toEqual(expect.objectContaining({ start: 6, end: 10 }));
101101

102102
// TODO
103103
// result = DateTimeUtil.parseDateTimeFormat('dd.MM.yyyyг');
104104
// resDict = reduceToDictionary(result);
105105
// expect(result.length).toEqual(6);
106-
// expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
107-
// expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
108-
// expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
106+
// expect(resDict[DatePart.Date]).toEqual(expect.objectContaining({ start: 0, end: 2 }));
107+
// expect(resDict[DatePart.Month]).toEqual(expect.objectContaining({ start: 3, end: 5 }));
108+
// expect(resDict[DatePart.Year]).toEqual(expect.objectContaining({ start: 6, end: 10 }));
109109
// expect(result[5]?.format).toEqual('г');
110110

111111
// result = DateTimeUtil.parseDateTimeFormat('yyyy/MM/d');
112112
// resDict = reduceToDictionary(result);
113113
// expect(result.length).toEqual(5);
114-
// expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 0, end: 4 }));
115-
// expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 5, end: 7 }));
116-
// expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 8, end: 10 }));
114+
// expect(resDict[DatePart.Year]).toEqual(expect.objectContaining({ start: 0, end: 4 }));
115+
// expect(resDict[DatePart.Month]).toEqual(expect.objectContaining({ start: 5, end: 7 }));
116+
// expect(resDict[DatePart.Date]).toEqual(expect.objectContaining({ start: 8, end: 10 }));
117117
});
118118

119119
it('should correctly parse boundary dates', () => {

‎projects/igniteui-angular/core/src/services/overlay/overlay.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ describe('igxOverlay', () => {
292292
// expect escape listener to be added to document
293293
expect(addEventSpy).toHaveBeenCalledWith('keydown', expect.any(Function), undefined);
294294

295-
const listener = addEventSpy.calls.all()
295+
const listener = addEventSpy.mock.calls
296296
.find(call => call.args[0] === 'keydown')?.args[1] as EventListener;
297297

298298
expect(listener).toBeDefined();
@@ -511,7 +511,7 @@ describe('igxOverlay', () => {
511511
expect(overlayInstance.opening.emit).toHaveBeenCalledTimes(1);
512512
expect(overlayInstance.opening.emit)
513513
.toHaveBeenCalledWith({ id: firstCallId, componentRef: expect.any(ComponentRef) as any, cancel: false });
514-
const args: OverlayEventArgs = (overlayInstance.opening.emit as jasmine.Spy).calls.mostRecent().args[0];
514+
const args: OverlayEventArgs = (overlayInstance.opening.emit as jasmine.Spy).mock.lastCall[0];
515515
expect(args.componentRef.instance).toEqual(expect.any(SimpleDynamicComponent));
516516
expect(overlayInstance.contentAppending.emit).toHaveBeenCalledTimes(1);
517517
expect(overlayInstance.contentAppended.emit).toHaveBeenCalledTimes(1);

‎projects/igniteui-angular/date-picker/src/date-picker/date-picker.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,8 +1223,8 @@ describe('IgxDatePicker', () => {
12231223
});
12241224

12251225
it('Should call underlying dateEditor decrement and increment methods', () => {
1226-
mockDateEditor.decrement = jasmine.createSpy();
1227-
mockDateEditor.increment = jasmine.createSpy();
1226+
mockDateEditor.decrement = vi.fn();
1227+
mockDateEditor.increment = vi.fn();
12281228
datePicker.decrement();
12291229
expect(mockDateEditor.decrement).toHaveBeenCalledWith(undefined, undefined);
12301230
const mockDatePart = {} as DatePart;

‎projects/igniteui-angular/date-picker/src/date-range-picker/date-range-picker.component.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ describe('IgxDateRangePicker', () => {
100100
mockCalendar = TestBed.inject(IgxCalendarComponent);
101101

102102
mockDaysView = {
103-
focusActiveDate: jasmine.createSpy()
103+
focusActiveDate: vi.fn()
104104
} as any;
105105
mockCalendar.daysView = mockDaysView;
106106
});

‎projects/igniteui-angular/directives/src/directives/mask/mask.directive.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ describe('igxMaskDirective ControlValueAccessor Unit', () => {
633633
// writeValue
634634
inputGet.mockReturnValue('formatted');
635635
mask.writeValue('test');
636-
expect(mockParser.applyMask).toHaveBeenCalledWith('test', jasmine.objectContaining({ format }));
636+
expect(mockParser.applyMask).toHaveBeenCalledWith('test', expect.objectContaining({ format }));
637637
expect(inputSet).toHaveBeenCalledWith('test____');
638638
expect(mockNgControl.registerOnChangeCb).not.toHaveBeenCalled();
639639
expect(mask.valueChanged.emit).toHaveBeenCalledWith({ rawValue: 'test', formattedValue: 'formatted' });
@@ -643,7 +643,7 @@ describe('igxMaskDirective ControlValueAccessor Unit', () => {
643643
spyOnProperty(mask as any, 'selectionEnd').mockReturnValue(6);
644644
const setSelectionSpy = vi.spyOn(mask as any, 'setSelectionRange');
645645
mask.onInputChanged(false);
646-
expect(mockParser.replaceInMask).toHaveBeenCalledWith('', 'test_2', jasmine.objectContaining({ format }), 0, 0);
646+
expect(mockParser.replaceInMask).toHaveBeenCalledWith('', 'test_2', expect.objectContaining({ format }), 0, 0);
647647
expect(inputSet).toHaveBeenCalledWith('test_2__');
648648
expect(setSelectionSpy).toHaveBeenCalledWith(6);
649649
expect(mockNgControl.registerOnChangeCb).toHaveBeenCalledWith('test2');

‎projects/igniteui-angular/directives/src/directives/toggle/toggle.directive.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ describe('IgxToggle', () => {
631631

632632
fixture.componentInstance.toggleAction.onClick();
633633
expect(IgxToggleDirective.prototype.toggle).toHaveBeenCalledWith(settings);
634-
const directive = toggleSpy.calls.mostRecent().args[0].outlet as IgxOverlayOutletDirective;
634+
const directive = toggleSpy.mock.lastCall[0].outlet as IgxOverlayOutletDirective;
635635
expect(directive.nativeElement).toBe(outlet);
636636
});
637637
});

0 commit comments

Comments
 (0)