Skip to content

Commit ed266a2

Browse files
skrustevskrustev
committed
fix(localization): Fix failing tests and create util fo
1 parent a83ea0f commit ed266a2

File tree

2 files changed

+19
-21
lines changed

2 files changed

+19
-21
lines changed

‎projects/igniteui-angular/src/lib/core/i18n/formatters/formatter-base.spec.ts‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,30 +70,28 @@ describe('Localization', () => {
7070
// Defaults to Angular's one because they are registered in tests
7171
expect(i18nFormatter.getLocaleDateTimeFormat('en', false)).toEqual('M/d/yyyy');
7272
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'short' })).toEqual('M/d/yy');
73-
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'medium' })).toEqual('MMM d, y');
74-
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'long' })).toEqual('MMMM d, y');
75-
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'full' })).toEqual('EEEE, MMMM d, y');
73+
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'medium' })).toEqual('MMM d, yyyy');
74+
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'long' })).toEqual('MMMM d, yyyy');
75+
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'full' })).toEqual('EEEE, MMMM d, yyyy');
7676

77-
expect(i18nFormatter.getLocaleDateTimeFormat('de', false)).toEqual('dd.MM.yyyy');
77+
expect(i18nFormatter.getLocaleDateTimeFormat('de', false)).toEqual('d.M.yyyy');
7878
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'short' })).toEqual('dd.MM.yy');
79-
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'medium' })).toEqual('dd.MM.y');
80-
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'long' })).toEqual('d. MMMM y');
81-
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'full' })).toEqual('EEEE, d. MMMM y');
79+
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'medium' })).toEqual('dd.MM.yyyy');
80+
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'long' })).toEqual('d. MMMM yyyy');
81+
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'full' })).toEqual('EEEE, d. MMMM yyyy');
8282
});
8383

8484
it('should return correct datetime format per locale', () => {
8585
// Defaults to Angular's one because they are registered in tests
86-
expect(i18nFormatter.getLocaleDateTimeFormat('en', false)).toEqual('{1}, {0}');
87-
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'short', timeStyle: 'short' })).toEqual('{1}, {0}');
88-
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'medium', timeStyle: 'short' })).toEqual('{1}, {0}');
89-
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'short', timeStyle: 'short' })).toEqual(`{1} 'at' {0}`);
90-
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'full', timeStyle: 'short' })).toEqual(`{1} 'at' {0}`);
91-
92-
expect(i18nFormatter.getLocaleDateTimeFormat('de', false)).toEqual('{1}, {0}');
93-
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'short', timeStyle: 'short' })).toEqual('{1}, {0}');
94-
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'medium', timeStyle: 'short' })).toEqual('{1}, {0}');
95-
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'long', timeStyle: 'short' })).toEqual(`{1} 'um' {0}`);
96-
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'full', timeStyle: 'short' })).toEqual(`{1} 'um' {0}`);
86+
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'short', timeStyle: 'short' })).toEqual('M/d/yy, h:mm a');
87+
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'medium', timeStyle: 'short' })).toEqual('MMM d, yyyy, h:mm a');
88+
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'long', timeStyle: 'long' })).toEqual(`MMMM d, yyyy at h:mm:ss a z`);
89+
expect(i18nFormatter.getLocaleDateTimeFormat('en', false, { dateStyle: 'full', timeStyle: 'short' })).toEqual(`EEEE, MMMM d, yyyy at h:mm a`);
90+
91+
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'short', timeStyle: 'short' })).toEqual('dd.MM.yy, HH:mm');
92+
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'medium', timeStyle: 'short' })).toEqual('dd.MM.yyyy, HH:mm');
93+
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'long', timeStyle: 'short' })).toEqual(`d. MMMM yyyy um HH:mm`);
94+
expect(i18nFormatter.getLocaleDateTimeFormat('de', false, { dateStyle: 'full', timeStyle: 'short' })).toEqual(`EEEE, d. MMMM yyyy um HH:mm`);
9795
});
9896
});
9997

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { BaseFormatter } from '../core/i18n/formatters/formatter-base';
3232
const DEBOUNCE_TIME = 16;
3333
const DEFAULT_ICON_TEXT = 'date_range';
3434
const CLEAR_ICON_TEXT = 'clear';
35-
const DEFAULT_FORMAT_OPTIONS = { day: '2-digit', month: '2-digit', year: 'numeric' };
35+
const DEFAULT_FORMAT_OPTIONS = { day: 'numeric', month: 'numeric', year: 'numeric' };
3636
const CSS_CLASS_INPUT_BUNDLE = '.igx-input-group__bundle';
3737
const CSS_CLASS_INPUT_START = '.igx-input-group__bundle-start'
3838
const CSS_CLASS_INPUT_END = '.igx-input-group__bundle-end'
@@ -563,7 +563,7 @@ describe('IgxDateRangePicker', () => {
563563
dateRange.inputFormat = 'dd/MM/yy'; // should not be registered
564564
dateRange.displayFormat = 'longDate';
565565
fixture.detectChanges();
566-
expect(dateRange.inputDirective.placeholder).toEqual(`MMMM d, y - MMMM d, y`);
566+
expect(dateRange.inputDirective.placeholder).toEqual(`MMMM d, yyyy - MMMM d, yyyy`);
567567
const today = new Date();
568568
startDate = new Date(today.getFullYear(), today.getMonth(), 1, 0, 0, 0);
569569
endDate = new Date(today.getFullYear(), today.getMonth(), 5, 0, 0, 0);
@@ -593,7 +593,7 @@ describe('IgxDateRangePicker', () => {
593593
dateRange.displayFormat = 'fullDate';
594594
fixture.detectChanges();
595595

596-
expect(dateRange.inputDirective.placeholder).toEqual(`EEEE, MMMM d, y - EEEE, MMMM d, y`);
596+
expect(dateRange.inputDirective.placeholder).toEqual(`EEEE, MMMM d, yyyy - EEEE, MMMM d, yyyy`);
597597
startDate.setDate(12);
598598
endDate.setDate(23);
599599
dateRange.select(startDate, endDate);

0 commit comments

Comments
 (0)