diff --git a/frontend/src/components/Trigger.test.tsx b/frontend/src/components/Trigger.test.tsx index 1cb1f0aa2b7..9a6c361d1cb 100644 --- a/frontend/src/components/Trigger.test.tsx +++ b/frontend/src/components/Trigger.test.tsx @@ -25,10 +25,10 @@ const PARAMS_DEFAULT = { }; const PERIODIC_DEFAULT = { end_time: undefined, - interval_second: '60', + interval_second: (60 * 60).toString(), start_time: undefined, }; -const CRON_DEFAULT = { cron: '0 * * * * ?', end_time: undefined, start_time: undefined }; +const CRON_DEFAULT = { cron: '0 0 * * * ?', end_time: undefined, start_time: undefined }; beforeAll(() => { process.env.TZ = 'UTC'; @@ -98,7 +98,7 @@ describe('Trigger', () => { }); describe('interval trigger', () => { - it('builds an every-minute trigger by default', () => { + it('builds an every-hour trigger by default', () => { const spy = jest.fn(); const tree = shallow(); (tree.instance() as Trigger).handleChange('type')({ @@ -438,7 +438,7 @@ describe('Trigger', () => { }); describe('cron', () => { - it('builds a 1-minute cron trigger by default', () => { + it('builds a 1-hour cron trigger by default', () => { const spy = jest.fn(); const tree = shallow(); (tree.instance() as Trigger).handleChange('type')({ target: { value: TriggerType.CRON } }); @@ -450,7 +450,7 @@ describe('Trigger', () => { }); }); - it('builds a 1-minute cron trigger with specified start date', () => { + it('builds a 1-hour cron trigger with specified start date', () => { const spy = jest.fn(); const tree = shallow(); (tree.instance() as Trigger).handleChange('type')({ target: { value: TriggerType.CRON } }); @@ -461,7 +461,11 @@ describe('Trigger', () => { expect(spy).toHaveBeenLastCalledWith({ ...PARAMS_DEFAULT, trigger: { - cron_schedule: { ...CRON_DEFAULT, start_time: new Date('2018-03-23T07:53:00.000Z') }, + cron_schedule: { + ...CRON_DEFAULT, + start_time: new Date('2018-03-23T07:53:00.000Z'), + cron: '0 53 * * * ?', + }, }, }); }); diff --git a/frontend/src/components/Trigger.tsx b/frontend/src/components/Trigger.tsx index 6d2d5f882d8..a6e844fd186 100644 --- a/frontend/src/components/Trigger.tsx +++ b/frontend/src/components/Trigger.tsx @@ -122,7 +122,7 @@ export default class Trigger extends React.Component editCron: parsedTrigger.type === TriggerType.CRON, cron: parsedTrigger.cron || '', // interval state - intervalCategory: parsedTrigger.intervalCategory ?? PeriodicInterval.MINUTE, + intervalCategory: parsedTrigger.intervalCategory ?? PeriodicInterval.HOUR, intervalValue: parsedTrigger.intervalValue ?? 1, startTimeMessage: '', endTimeMessage: '', diff --git a/frontend/src/components/__snapshots__/Trigger.test.tsx.snap b/frontend/src/components/__snapshots__/Trigger.test.tsx.snap index bf4648f1801..269f98e4e79 100644 --- a/frontend/src/components/__snapshots__/Trigger.test.tsx.snap +++ b/frontend/src/components/__snapshots__/Trigger.test.tsx.snap @@ -935,7 +935,7 @@ exports[`Trigger renders periodic schedule controls for initial render 1`] = ` onChange={[Function]} required={true} select={true} - value="Minute" + value="Hour" variant="outlined" width={95} > @@ -1177,7 +1177,7 @@ exports[`Trigger renders periodic schedule controls if the trigger type is CRON onChange={[Function]} required={true} select={true} - value="Minute" + value="Hour" variant="outlined" width={95} > @@ -1244,7 +1244,7 @@ exports[`Trigger renders periodic schedule controls if the trigger type is CRON disabled={true} label="cron expression" onChange={[Function]} - value="0 * * * * ?" + value="0 0 * * * ?" variant="outlined" width={300} /> diff --git a/frontend/src/pages/NewRun.test.tsx b/frontend/src/pages/NewRun.test.tsx index e96496b384c..e2c7ea752db 100644 --- a/frontend/src/pages/NewRun.test.tsx +++ b/frontend/src/pages/NewRun.test.tsx @@ -1772,7 +1772,7 @@ describe('NewRun', () => { trigger: { periodic_schedule: { end_time: undefined, - interval_second: '60', + interval_second: '3600', start_time: undefined, }, },