Skip to content

Commit

Permalink
Fix refactoring issues in test files.
Browse files Browse the repository at this point in the history
  • Loading branch information
justinkambic committed Jan 27, 2021
1 parent 73cf9ad commit 349db31
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ describe('NavButtons', () => {
beforeEach(() => {
defaultProps = {
maxSteps: 3,
stepNo: 2,
setStepNo: jest.fn(),
stepNumber: 2,
setStepNumber: jest.fn(),
setIsImagePopoverOpen: jest.fn(),
};
});
Expand All @@ -36,8 +36,8 @@ describe('NavButtons', () => {
fireEvent.click(nextButton);

await waitFor(() => {
expect(defaultProps.setStepNo).toHaveBeenCalledTimes(1);
expect(defaultProps.setStepNo).toHaveBeenCalledWith(3);
expect(defaultProps.setStepNumber).toHaveBeenCalledTimes(1);
expect(defaultProps.setStepNumber).toHaveBeenCalledWith(3);
});
});

Expand All @@ -49,22 +49,23 @@ describe('NavButtons', () => {
fireEvent.click(nextButton);

await waitFor(() => {
expect(defaultProps.setStepNo).toHaveBeenCalledTimes(1);
expect(defaultProps.setStepNo).toHaveBeenCalledWith(1);
expect(defaultProps.setStepNumber).toHaveBeenCalledTimes(1);
expect(defaultProps.setStepNumber).toHaveBeenCalledWith(1);
});
});

it('disables `next` button on final step', () => {
defaultProps.stepNo = 3;
defaultProps.stepNumber = 3;

const { getByLabelText } = render(<NavButtons {...defaultProps} />);

// getByLabelText('Next step');
expect(getByLabelText('Next step')).toHaveAttribute('disabled');
expect(getByLabelText('Previous step')).not.toHaveAttribute('disabled');
});

it('disables `prev` button on final step', () => {
defaultProps.stepNo = 1;
defaultProps.stepNumber = 1;

const { getByLabelText } = render(<NavButtons {...defaultProps} />);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import * as observabilityPublic from '../../../../../../../observability/public'

mockReduxHooks();

jest.mock('../../../../../../observability/public', () => {
const originalModule = jest.requireActual('../../../../../../observability/public');
jest.mock('../../../../../../../observability/public', () => {
const originalModule = jest.requireActual('../../../../../../../observability/public');

return {
...originalModule,
Expand Down Expand Up @@ -107,7 +107,7 @@ describe('Ping Timestamp component', () => {
const caption = getByText('Nov 26, 2020 10:28:56 AM');
fireEvent.mouseEnter(caption);

const altText = `A full-size screenshot for this journey step's thumbnail.`;
const altText = `A larger version of the screenshot for this journey step's thumbnail.`;

await waitFor(() => getByAltText(altText));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ describe('StepImageCaption', () => {
captionContent: 'test caption content',
imgSrc: 'http://sample.com/sampleImageSrc.png',
maxSteps: 3,
setStepNo: jest.fn(),
stepNo: 2,
setStepNumber: jest.fn(),
stepNumber: 2,
timestamp: '2020-11-26T15:28:56.896Z',
};
});
Expand All @@ -38,8 +38,8 @@ describe('StepImageCaption', () => {
fireEvent.click(nextButton);

await waitFor(() => {
expect(defaultProps.setStepNo).toHaveBeenCalledTimes(1);
expect(defaultProps.setStepNo).toHaveBeenCalledWith(3);
expect(defaultProps.setStepNumber).toHaveBeenCalledTimes(1);
expect(defaultProps.setStepNumber).toHaveBeenCalledWith(3);
});
});

Expand All @@ -51,22 +51,23 @@ describe('StepImageCaption', () => {
fireEvent.click(nextButton);

await waitFor(() => {
expect(defaultProps.setStepNo).toHaveBeenCalledTimes(1);
expect(defaultProps.setStepNo).toHaveBeenCalledWith(1);
expect(defaultProps.setStepNumber).toHaveBeenCalledTimes(1);
expect(defaultProps.setStepNumber).toHaveBeenCalledWith(1);
});
});

it('disables `next` button on final step', () => {
defaultProps.stepNo = 3;
defaultProps.stepNumber = 3;

const { getByLabelText } = render(<StepImageCaption {...defaultProps} />);

// getByLabelText('Next step');
expect(getByLabelText('Next step')).toHaveAttribute('disabled');
expect(getByLabelText('Previous step')).not.toHaveAttribute('disabled');
});

it('disables `prev` button on final step', () => {
defaultProps.stepNo = 1;
defaultProps.stepNumber = 1;

const { getByLabelText } = render(<StepImageCaption {...defaultProps} />);

Expand Down

0 comments on commit 349db31

Please sign in to comment.