@@ -198,40 +198,6 @@ const testLocalization = (engine: TestEngineBase) => {
198198 }
199199 ) ;
200200
201- // test('Enum name should allow normal text', () => {
202- // const weekEnum = Enum(StandardWeekConfig, { name: 'Week Days' });
203- // expect(weekEnum.name).toBe('Week Days');
204- // });
205- // test('Enum name should support global localization (English)', () => {
206- // setLang('en-US');
207- // const weekEnum = Enum(StandardWeekConfig, { name: 'weekDay.name' });
208- // expect(weekEnum.name).toBe(localeEN['weekDay.name']);
209- // });
210- // test('Enum name should support global localization (Chinese)', () => {
211- // setLang('zh-CN');
212- // const weekEnum = Enum(StandardWeekConfig, { name: 'weekDay.name' });
213- // expect(weekEnum.name).toBe(localeCN['weekDay.name']);
214- // });
215- // test('Enum name should support global localization (No Locale)', () => {
216- // setLang(undefined);
217- // const weekEnum = Enum(StandardWeekConfig, { name: 'weekDay.name' });
218- // expect(weekEnum.name).toBe(noLocale['weekDay.name']);
219- // });
220- // test('Enum name should support custom localization (English)', () => {
221- // Enum.localize = undefined!;
222- // const weekEnum = Enum(StandardWeekConfig, { localize: genSillyLocalizer('en-US'), name: 'weekDay.name' });
223- // expect(weekEnum.name).toBe(localeEN['weekDay.name']);
224- // });
225- // test('Enum name should support custom localization (Chinese)', () => {
226- // Enum.localize = undefined!;
227- // const weekEnum = Enum(StandardWeekConfig, { localize: genSillyLocalizer('zh-CN'), name: 'weekDay.name' });
228- // expect(weekEnum.name).toBe(localeCN['weekDay.name']);
229- // });
230- // test('Enum name should support custom localization (No Locale)', () => {
231- // Enum.localize = undefined!;
232- // const weekEnum = Enum(StandardWeekConfig, { localize: genSillyLocalizer(undefined), name: 'weekDay.name' });
233- // expect(weekEnum.name).toBe(noLocale['weekDay.name']);
234- // });
235201 engine . test (
236202 'Enum name should allow normal text' ,
237203 ( { EnumPlus : { Enum } , WeekConfig : { StandardWeekConfig } } ) => {
@@ -285,8 +251,8 @@ const testLocalization = (engine: TestEngineBase) => {
285251 engine . test (
286252 'Enum name should support custom localization (English)' ,
287253 ( {
288- EnumPlus : { Enum, defaultLocalize, genSillyLocalizer } ,
289- WeekConfig : { StandardWeekConfig, setLang, localeEN, getLocales } ,
254+ EnumPlus : { Enum, defaultLocalize } ,
255+ WeekConfig : { StandardWeekConfig, setLang, localeEN, getLocales, genSillyLocalizer } ,
290256 } ) => {
291257 const weekEnum = Enum ( StandardWeekConfig , {
292258 localize : genSillyLocalizer ( 'en-US' , getLocales , defaultLocalize ) ,
@@ -301,8 +267,8 @@ const testLocalization = (engine: TestEngineBase) => {
301267 engine . test (
302268 'Enum name should support custom localization (Chinese)' ,
303269 ( {
304- EnumPlus : { Enum, defaultLocalize, genSillyLocalizer } ,
305- WeekConfig : { StandardWeekConfig, setLang, localeCN, getLocales } ,
270+ EnumPlus : { Enum, defaultLocalize } ,
271+ WeekConfig : { StandardWeekConfig, setLang, localeCN, getLocales, genSillyLocalizer } ,
306272 } ) => {
307273 const weekEnum = Enum ( StandardWeekConfig , {
308274 localize : genSillyLocalizer ( 'zh-CN' , getLocales , defaultLocalize ) ,
@@ -317,8 +283,8 @@ const testLocalization = (engine: TestEngineBase) => {
317283 engine . test (
318284 'Enum name should support custom localization (No Locale)' ,
319285 ( {
320- EnumPlus : { Enum, defaultLocalize, genSillyLocalizer } ,
321- WeekConfig : { StandardWeekConfig, setLang, noLocale, getLocales } ,
286+ EnumPlus : { Enum, defaultLocalize } ,
287+ WeekConfig : { StandardWeekConfig, setLang, noLocale, getLocales, genSillyLocalizer } ,
322288 } ) => {
323289 const weekEnum = Enum ( StandardWeekConfig , {
324290 localize : genSillyLocalizer ( undefined , getLocales , defaultLocalize ) ,
@@ -330,6 +296,23 @@ const testLocalization = (engine: TestEngineBase) => {
330296 engine . expect ( weekEnum . name ) . toBe ( noLocale [ 'weekDay.name' ] ) ;
331297 }
332298 ) ;
299+ engine . test (
300+ 'Enum name should respect Enum options over global setting (Chinese over English)' ,
301+ ( {
302+ EnumPlus : { Enum, defaultLocalize } ,
303+ WeekConfig : { StandardWeekConfig, setLang, localeCN, getLocales, genSillyLocalizer } ,
304+ } ) => {
305+ setLang ( 'en-US' , Enum , getLocales , defaultLocalize ) ;
306+ const weekEnum = Enum ( StandardWeekConfig , {
307+ localize : genSillyLocalizer ( 'zh-CN' , getLocales , defaultLocalize ) ,
308+ name : 'weekDay.name' ,
309+ } ) ;
310+ return { weekEnum, localeCN } ;
311+ } ,
312+ ( { weekEnum, localeCN } ) => {
313+ engine . expect ( weekEnum . name ) . toBe ( localeCN [ 'weekDay.name' ] ) ;
314+ }
315+ ) ;
333316 } ) ;
334317
335318 function assertEnum (
0 commit comments