renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-11 22:46:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(schedule): use consistent error messages

Browse source
This commit is contained in:
Rhys Arkins 2020-02-14 13:44:40 +01:00
parent 6a6d646dd5
commit 562f3d7696
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/workers/branch/schedule.ts
View file

@ -16,7 +16,7 @@ export function hasValidTimezone(
timezone: string timezone: string
): [boolean] | [boolean, string] { ): [boolean] | [boolean, string] {
if (!moment.tz.zone(timezone)) { if (!moment.tz.zone(timezone)) {
return [false, `Invalid timezone: ${timezone}`]; return [false, `Invalid schedule: Unsupported timezone ${timezone}`];
} }
return [true]; return [true];
} }
@ -39,12 +39,12 @@ export function hasValidSchedule(
); );
const parsedSchedule = later.parse.text(massagedText); const parsedSchedule = later.parse.text(massagedText);
if (parsedSchedule.error !== -1) { if (parsedSchedule.error !== -1) {
message = `Failed to parse schedule "${scheduleText}"`; message = `Invalid schedule: Failed to parse "${scheduleText}"`;
// It failed to parse // It failed to parse
return true; return true;
} }
if (parsedSchedule.schedules.some(s => s.m)) { if (parsedSchedule.schedules.some(s => s.m)) {
message = `Schedule "${scheduleText}" should not specify minutes`; message = `Invalid schedule: "${scheduleText}" should not specify minutes`;
return true; return true;
} }
if ( if (
@ -52,7 +52,7 @@ export function hasValidSchedule(
s => s.M || s.d !== undefined || s.D || s.t_a !== undefined || s.t_b s => s.M || s.d !== undefined || s.D || s.t_a !== undefined || s.t_b
) )
) { ) {
message = `Schedule "${scheduleText}" has no months, days of week or time of day`; message = `Invalid schedule: "${scheduleText}" has no months, days of week or time of day`;
return true; return true;
} }
// It must be OK // It must be OK

6
test/config/__snapshots__/validation.spec.ts.snap
View file

@ -41,11 +41,11 @@ Array [
}, },
Object { Object {
"depName": "Configuration Error", "depName": "Configuration Error",
"message": "Invalid schedule: \`Schedule \\"every 15 mins every weekday\\" should not specify minutes\`", "message": "Invalid schedule: \`Invalid schedule: \\"every 15 mins every weekday\\" should not specify minutes\`",
}, },
Object { Object {
"depName": "Configuration Error", "depName": "Configuration Error",
"message": "extends: Invalid timezone: Europe/Brussel", "message": "extends: Invalid schedule: Unsupported timezone Europe/Brussel",
}, },
Object { Object {
"depName": "Configuration Error", "depName": "Configuration Error",
@ -57,7 +57,7 @@ Array [
}, },
Object { Object {
"depName": "Configuration Error", "depName": "Configuration Error",
"message": "timezone: Invalid timezone: Asia", "message": "timezone: Invalid schedule: Unsupported timezone Asia",
}, },
] ]
`; `;