-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #32045 - Add start-end date pickers to job wizard
- Loading branch information
Showing
9 changed files
with
414 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,28 @@ | ||
| import React, { useState } from 'react'; | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { FormGroup, Radio } from '@patternfly/react-core'; | ||
| import { translate as __ } from 'foremanReact/common/I18n'; | ||
|
|
||
| export const ScheduleType = () => { | ||
| const [isFuture, setIsFuture] = useState(false); | ||
| return ( | ||
| <FormGroup label={__('Schedule type')} fieldId="schedule-type"> | ||
| <Radio | ||
| isChecked={!isFuture} | ||
| name="schedule-type" | ||
| onChange={() => setIsFuture(false)} | ||
| id="schedule-type-now" | ||
| label={__('Execute now')} | ||
| /> | ||
| <Radio | ||
| isChecked={isFuture} | ||
| name="schedule-type" | ||
| onChange={() => setIsFuture(true)} | ||
| id="schedule-type-future" | ||
| label={__('Schedule for future execution')} | ||
| /> | ||
| </FormGroup> | ||
| ); | ||
| export const ScheduleType = ({ isFuture, setIsFuture }) => ( | ||
| <FormGroup label={__('Schedule type')} fieldId="schedule-type"> | ||
| <Radio | ||
| isChecked={!isFuture} | ||
| name="schedule-type" | ||
| onChange={() => setIsFuture(false)} | ||
| id="schedule-type-now" | ||
| label={__('Execute now')} | ||
| /> | ||
| <Radio | ||
| isChecked={isFuture} | ||
| name="schedule-type" | ||
| onChange={() => setIsFuture(true)} | ||
| id="schedule-type-future" | ||
| label={__('Schedule for future execution')} | ||
| /> | ||
| </FormGroup> | ||
| ); | ||
|
|
||
| ScheduleType.propTypes = { | ||
| isFuture: PropTypes.bool.isRequired, | ||
| setIsFuture: PropTypes.func.isRequired, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
155 changes: 155 additions & 0 deletions
155
webpack/JobWizard/steps/Schedule/__tests__/Schedule.test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| import React from 'react'; | ||
| import { Provider } from 'react-redux'; | ||
| import configureMockStore from 'redux-mock-store'; | ||
| import { fireEvent, screen, render, act } from '@testing-library/react'; | ||
| import * as api from 'foremanReact/redux/API'; | ||
| import { JobWizard } from '../../../JobWizard'; | ||
| import * as selectors from '../../../JobWizardSelectors'; | ||
| import { jobTemplate, jobTemplateResponse } from '../../../__tests__/fixtures'; | ||
|
|
||
| const lodash = require('lodash'); | ||
|
|
||
| lodash.debounce = fn => fn; | ||
| jest.spyOn(api, 'get'); | ||
| jest.spyOn(selectors, 'selectJobTemplate'); | ||
| jest.spyOn(selectors, 'selectJobTemplates'); | ||
| jest.spyOn(selectors, 'selectJobCategories'); | ||
|
|
||
| const jobCategories = ['Ansible Commands', 'Puppet', 'Services']; | ||
|
|
||
| selectors.selectJobCategories.mockImplementation(() => jobCategories); | ||
|
|
||
| selectors.selectJobTemplates.mockImplementation(() => [ | ||
| jobTemplate, | ||
| { ...jobTemplate, id: 2, name: 'template2' }, | ||
| ]); | ||
| selectors.selectJobTemplate.mockImplementation(() => jobTemplateResponse); | ||
| api.get.mockImplementation(({ handleSuccess, ...action }) => { | ||
| if (action.key === 'JOB_CATEGORIES') { | ||
| handleSuccess && handleSuccess({ data: { job_categories: jobCategories } }); | ||
| } else if (action.key === 'JOB_TEMPLATE') { | ||
| handleSuccess && | ||
| handleSuccess({ | ||
| data: jobTemplateResponse, | ||
| }); | ||
| } else if (action.key === 'JOB_TEMPLATES') { | ||
| handleSuccess && | ||
| handleSuccess({ | ||
| data: { results: [jobTemplateResponse.job_template] }, | ||
| }); | ||
| } | ||
| return { type: 'get', ...action }; | ||
| }); | ||
|
|
||
| const mockStore = configureMockStore([]); | ||
| const store = mockStore({}); | ||
| jest.useFakeTimers(); | ||
|
|
||
| describe('Schedule', () => { | ||
| it('should save date time between steps ', async () => { | ||
| render( | ||
| <Provider store={store}> | ||
| <JobWizard /> | ||
| </Provider> | ||
| ); | ||
| await act(async () => { | ||
| fireEvent.click(screen.getByText('Schedule')); | ||
| }); | ||
| const newStartDate = '2020/03/12'; | ||
| const newStartTime = '12:03'; | ||
| const newEndsDate = '2030/03/12'; | ||
| const newEndsTime = '17:34'; | ||
| const [startsDateField, endsDateField] = screen.getAllByPlaceholderText( | ||
| 'yyyy/mm/dd' | ||
| ); | ||
| const [startsTimeField, endsTimeField] = screen.getAllByPlaceholderText( | ||
| 'hh:mm' | ||
| ); | ||
| await act(async () => { | ||
| await fireEvent.change(startsDateField, { | ||
| target: { value: newStartDate }, | ||
| }); | ||
| await fireEvent.change(startsTimeField, { | ||
| target: { value: newStartTime }, | ||
| }); | ||
| await fireEvent.change(endsDateField, { target: { value: newEndsDate } }); | ||
| await fireEvent.change(endsTimeField, { target: { value: newEndsTime } }); | ||
| jest.runAllTimers(); // to handle pf4 date picket popover useTimer | ||
| }); | ||
| await act(async () => { | ||
| fireEvent.click(screen.getByText('Category and Template')); | ||
| }); | ||
| expect(screen.getAllByText('Category and Template')).toHaveLength(3); | ||
|
|
||
| await act(async () => { | ||
| fireEvent.click(screen.getByText('Schedule')); | ||
| jest.runAllTimers(); | ||
| }); | ||
| expect(startsDateField.value).toBe(newStartDate); | ||
| expect(startsTimeField.value).toBe(newStartTime); | ||
| expect(endsDateField.value).toBe(newEndsDate); | ||
| expect(endsTimeField.value).toBe(newEndsTime); | ||
| }); | ||
| it('should remove start date time on execute now', async () => { | ||
| render( | ||
| <Provider store={store}> | ||
| <JobWizard /> | ||
| </Provider> | ||
| ); | ||
| await act(async () => { | ||
| fireEvent.click(screen.getByText('Schedule')); | ||
| }); | ||
| const executeNow = screen.getByLabelText('Execute now'); | ||
| const executeFuture = screen.getByLabelText( | ||
| 'Schedule for future execution' | ||
| ); | ||
| expect(executeNow.checked).toBeTruthy(); | ||
| const newStartDate = '2020/03/12'; | ||
| const newStartTime = '12:03'; | ||
| const [startsDateField] = screen.getAllByPlaceholderText('yyyy/mm/dd'); | ||
| const [startsTimeField] = screen.getAllByPlaceholderText('hh:mm'); | ||
| await act(async () => { | ||
| await fireEvent.change(startsDateField, { | ||
| target: { value: newStartDate }, | ||
| }); | ||
| await fireEvent.change(startsTimeField, { | ||
| target: { value: newStartTime }, | ||
| }); | ||
| await jest.runOnlyPendingTimers(); | ||
| }); | ||
| expect(startsDateField.value).toBe(newStartDate); | ||
| expect(startsTimeField.value).toBe(newStartTime); | ||
| expect(executeFuture.checked).toBeTruthy(); | ||
| await act(async () => { | ||
| await fireEvent.click(executeNow); | ||
| }); | ||
| expect(executeNow.checked).toBeTruthy(); | ||
| expect(startsDateField.value).toBe(''); | ||
| expect(startsTimeField.value).toBe(''); | ||
| }); | ||
|
|
||
| it('should disable end date on never ends', async () => { | ||
| render( | ||
| <Provider store={store}> | ||
| <JobWizard /> | ||
| </Provider> | ||
| ); | ||
| await act(async () => { | ||
| await fireEvent.click(screen.getByText('Schedule')); | ||
| jest.runAllTimers(); | ||
| }); | ||
| const neverEnds = screen.getByLabelText('Never ends'); | ||
| expect(neverEnds.checked).toBeFalsy(); | ||
|
|
||
| const [, endsDateField] = screen.getAllByPlaceholderText('yyyy/mm/dd'); | ||
| const [, endsTimeField] = screen.getAllByPlaceholderText('hh:mm'); | ||
| expect(endsDateField.disabled).toBeFalsy(); | ||
| expect(endsTimeField.disabled).toBeFalsy(); | ||
| await act(async () => { | ||
| fireEvent.click(neverEnds); | ||
| }); | ||
| expect(neverEnds.checked).toBeTruthy(); | ||
| expect(endsDateField.disabled).toBeTruthy(); | ||
| expect(endsTimeField.disabled).toBeTruthy(); | ||
| }); | ||
| }); |
17 changes: 9 additions & 8 deletions
17
webpack/JobWizard/steps/Schedule/__tests__/StartEndDates.test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,23 @@ | ||
| import React from 'react'; | ||
| import { render, fireEvent, screen } from '@testing-library/react'; | ||
| import { render, fireEvent, screen, act } from '@testing-library/react'; | ||
| import { StartEndDates } from '../StartEndDates'; | ||
|
|
||
| const setEnds = jest.fn(); | ||
| const setIsNeverEnds = jest.fn(); | ||
| const props = { | ||
| starts: '', | ||
| setStarts: jest.fn(), | ||
| ends: 'some-end-date', | ||
| setEnds, | ||
| setIsNeverEnds, | ||
| isNeverEnds: false, | ||
| }; | ||
|
|
||
| describe('StartEndDates', () => { | ||
| it('never ends', () => { | ||
| render(<StartEndDates {...props} />); | ||
| const neverEnds = screen.getByLabelText('Never ends', { | ||
| selector: 'input', | ||
| }); | ||
| fireEvent.click(neverEnds); | ||
| expect(setEnds).toBeCalledWith(''); | ||
| it('never ends', async () => { | ||
| await act(async () => render(<StartEndDates {...props} />)); | ||
| const neverEnds = screen.getByRole('checkbox', { name: 'Never ends' }); | ||
| await act(async () => fireEvent.click(neverEnds)); | ||
| expect(setIsNeverEnds).toBeCalledWith(true); | ||
| }); | ||
| }); |
Oops, something went wrong.