Skip to content

fix: Generate should not change value immutable data #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2020
Merged

fix: Generate should not change value immutable data #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/generate/moment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { GenerateConfig } from '.';
const generateConfig: GenerateConfig<Moment> = {
// get
getNow: () => moment(),
getWeekDay: date => date.locale('en_US').weekday(),
getWeekDay: date => date.clone().locale('en_US').weekday(),
getYear: date => date.year(),
getMonth: date => date.month(),
getDate: date => date.date(),
Expand Down
78 changes: 37 additions & 41 deletions tests/generate.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import dayjsGenerateConfig from '../src/generate/dayjs';
import { getMoment } from './util/commonUtil';

import 'dayjs/locale/zh-cn';
import { GenerateConfig } from '../src/generate';

describe('Picker.Generate', () => {
beforeAll(() => {
Expand All @@ -14,10 +15,12 @@ describe('Picker.Generate', () => {
MockDate.reset();
});

[
const list: { name: string; generateConfig: GenerateConfig<any> }[] = [
{ name: 'moment', generateConfig: momentGenerateConfig },
{ name: 'dayjs', generateConfig: dayjsGenerateConfig },
].forEach(({ name, generateConfig }) => {
];

list.forEach(({ name, generateConfig }) => {
describe(name, () => {
it('get', () => {
const now = generateConfig.getNow();
Expand Down Expand Up @@ -85,19 +88,15 @@ describe('Picker.Generate', () => {
expect(
generateConfig.locale.format(
'en_US',
generateConfig.locale.parse('en_US', '2019-1st', [
'gggg-wo',
])!,
generateConfig.locale.parse('en_US', '2019-1st', ['gggg-wo'])!,
'gggg-wo',
),
).toEqual('2019-1st');

expect(
generateConfig.locale.format(
'zh_CN',
generateConfig.locale.parse('zh_CN', '2019-45周', [
'gggg-wo',
])!,
generateConfig.locale.parse('zh_CN', '2019-45周', ['gggg-wo'])!,
'gggg-wo',
),
).toEqual('2019-45周');
Expand All @@ -118,7 +117,7 @@ describe('Picker.Generate', () => {
).toEqual('2000-01-02');
});
});
})
});

it('getWeekFirstDay', () => {
expect(generateConfig.locale.getWeekFirstDay('en_US')).toEqual(0);
Expand All @@ -138,40 +137,32 @@ describe('Picker.Generate', () => {

it('Parse format Wo', () => {
expect(
generateConfig.locale.parse(
'en_US',
'2012-51st',
['YYYY-Wo'],
)?.format('Wo'),
generateConfig.locale
.parse('en_US', '2012-51st', ['YYYY-Wo'])
?.format('Wo'),
).toEqual('51st');
expect(
generateConfig.locale.parse(
'zh_CN',
'2012-1周',
['YYYY-Wo'],
)?.format('Wo'),
generateConfig.locale
.parse('zh_CN', '2012-1周', ['YYYY-Wo'])
?.format('Wo'),
).toEqual('1周');
});

it('Parse format faild', () => {
expect(
generateConfig.locale.parse(
'en_US',
generateConfig.locale.parse('en_US', 'invalid string', [
'invalid string',
['invalid string'],
),
]),
).toEqual(null);
expect(
generateConfig.locale.parse(
'en_US',
'invalid string',
['invalid string-Wo'],
),
generateConfig.locale.parse('en_US', 'invalid string', [
'invalid string-Wo',
]),
).toEqual(null);
});

it('getShortWeekDays', () => {
expect(generateConfig.locale.getShortWeekDays('zh_CN')).toEqual([
expect(generateConfig.locale.getShortWeekDays!('zh_CN')).toEqual([
'日',
'一',
'二',
Expand All @@ -180,7 +171,7 @@ describe('Picker.Generate', () => {
'五',
'六',
]);
expect(generateConfig.locale.getShortWeekDays('en_US')).toEqual([
expect(generateConfig.locale.getShortWeekDays!('en_US')).toEqual([
'Su',
'Mo',
'Tu',
Expand All @@ -192,7 +183,7 @@ describe('Picker.Generate', () => {
});

it('getShortMonths', () => {
expect(generateConfig.locale.getShortMonths('zh_CN')).toEqual([
expect(generateConfig.locale.getShortMonths!('zh_CN')).toEqual([
'1月',
'2月',
'3月',
Expand All @@ -206,7 +197,7 @@ describe('Picker.Generate', () => {
'11月',
'12月',
]);
expect(generateConfig.locale.getShortMonths('en_US')).toEqual([
expect(generateConfig.locale.getShortMonths!('en_US')).toEqual([
'Jan',
'Feb',
'Mar',
Expand All @@ -226,9 +217,7 @@ describe('Picker.Generate', () => {
expect(
generateConfig.locale.getWeek(
'zh_CN',
generateConfig.locale.parse('zh_CN', '2019-12-08', [
'YYYY-MM-DD',
])!,
generateConfig.locale.parse('zh_CN', '2019-12-08', ['YYYY-MM-DD'])!,
),
).toEqual(49);
});
Expand All @@ -237,20 +226,27 @@ describe('Picker.Generate', () => {
expect(
generateConfig.locale.getWeek(
'zh_CN',
generateConfig.locale.parse('zh_CN', '2019-12-08', [
'YYYY-MM-DD',
])!,
generateConfig.locale.parse('zh_CN', '2019-12-08', ['YYYY-MM-DD'])!,
),
).toEqual(49);
expect(
generateConfig.locale.getWeek(
'en_US',
generateConfig.locale.parse('en_US', '2019-12-08', [
'YYYY-MM-DD',
])!,
generateConfig.locale.parse('en_US', '2019-12-08', ['YYYY-MM-DD'])!,
),
).toEqual(50);
});
});
});
});

describe('Generate:moment', () => {
it('getWeekDay', () => {
const now = momentGenerateConfig.getNow();
now.locale('zh-cn');
expect(now.locale()).toEqual('zh-cn');

momentGenerateConfig.getWeekDay(now);
expect(now.locale()).toEqual('zh-cn');
});
});