fix(validate cron): allow ranges in fraction numerators

dhis2 · Nov 7, 2022 · 7f01c2f · 7f01c2f
1 parent 4c4d6fd
commit 7f01c2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/services/validators/validate-cron.js b/src/services/validators/validate-cron.js
@@ -40,7 +40,9 @@ const isValidFraction = (fraction, x, y) => {
 
     /* istanbul ignore next */
     return (
-        (isWildcard(components[0]) || isValidNumber(components[0], x, y)) &&
+        (isWildcard(components[0]) ||
+            isValidNumber(components[0], x, y) ||
+            isValidNumberRange(components[0], x, y)) &&
         isValidNumber(components[1], x, y)
     )
 }

diff --git a/src/services/validators/validate-cron.test.js b/src/services/validators/validate-cron.test.js
@@ -35,4 +35,8 @@ describe('validateCron', () => {
     it('should allow for number ranges', () => {
         expect(validateCron('0 0 1-5 * * *')).toEqual(true)
     })
+
+    it('should allow ranges in fraction numerators', () => {
+        expect(validateCron('0 0 10-22/2 ? * *')).toBe(true)
+    })
 })