diff --git a/@xen-orchestra/cron/src/next.spec.js b/@xen-orchestra/cron/src/next.spec.js index 471b397c4..9d1b8cca0 100644 --- a/@xen-orchestra/cron/src/next.spec.js +++ b/@xen-orchestra/cron/src/next.spec.js @@ -41,4 +41,8 @@ describe('next()', () => { 'no solutions found for this schedule' ) }) + + it('select the first sunday of the month', () => { + expect(N('* * * * 0', '2018-03-31T00:00')).toBe('2018-04-01T00:00') + }) }) diff --git a/@xen-orchestra/cron/src/parse.js b/@xen-orchestra/cron/src/parse.js index 3e5c9a912..2872f2a4b 100644 --- a/@xen-orchestra/cron/src/parse.js +++ b/@xen-orchestra/cron/src/parse.js @@ -176,10 +176,10 @@ export default createParser({ range: [0, 11], }, { - aliases: 'mon tue wen thu fri sat sun'.split(' '), + aliases: 'sun mon tue wen thu fri sat'.split(' '), name: 'dayOfWeek', - post: value => (value === 0 ? 7 : value), - range: [1, 7], + post: value => (value === 7 ? 0 : value), + range: [0, 6], }, ], presets: { diff --git a/@xen-orchestra/cron/src/parse.spec.js b/@xen-orchestra/cron/src/parse.spec.js index 508e6a095..609887906 100644 --- a/@xen-orchestra/cron/src/parse.spec.js +++ b/@xen-orchestra/cron/src/parse.spec.js @@ -23,7 +23,7 @@ describe('parse()', () => { it('correctly parse days', () => { expect(parse('* * * * mon,sun')).toEqual({ - dayOfWeek: [1, 7], + dayOfWeek: [0, 1], }) }) @@ -40,10 +40,10 @@ describe('parse()', () => { it('dayOfWeek: 0 and 7 bind to sunday', () => { expect(parse('* * * * 0')).toEqual({ - dayOfWeek: [7], + dayOfWeek: [0], }) expect(parse('* * * * 7')).toEqual({ - dayOfWeek: [7], + dayOfWeek: [0], }) }) })