-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #132 from hdwilber/feature/request-fields_aligned
Request inputs aligned in one line for better vertical space use #79
- Loading branch information
Showing
9 changed files
with
340 additions
and
190 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import React, { PropTypes } from 'react'; | ||
| import { Button } from 'react-bootstrap'; | ||
|
|
||
| function SubmitButton(props) { | ||
| if (props.editMode) { | ||
| return ( | ||
| <Button type="submit" bsStyle="success" block> | ||
| {(props.compact ? 'Update' : 'Update request')} | ||
| </Button> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <Button type="submit" bsStyle="primary" block> | ||
| {(props.compact ? 'Send' : 'Send request')} | ||
| </Button> | ||
| ); | ||
| } | ||
|
|
||
| SubmitButton.propTypes = { | ||
| editMode: PropTypes.bool.isRequired, | ||
| compact: PropTypes.bool, | ||
| /* eslint-enable react/forbid-prop-types */ | ||
| }; | ||
|
|
||
| export default SubmitButton; | ||
|
|
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 |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| import React from 'react'; | ||
| import renderer from 'react-test-renderer'; | ||
| import { mount } from 'enzyme'; | ||
|
|
||
| /* eslint-disable import/no-unresolved */ | ||
| import SubmitButton from 'components/Request/SubmitButton'; | ||
|
|
||
| describe('SubmitButton', () => { | ||
| describe('EditMode: false', () => { | ||
| let initialProps; | ||
|
|
||
| beforeEach(() => { | ||
| initialProps = { | ||
| editMode: false, | ||
| }; | ||
| }); | ||
|
|
||
| it('should match the previous snapshot with editMode false', () => { | ||
| const tree = renderer | ||
| .create(<SubmitButton {...initialProps} />); | ||
|
|
||
| expect(tree).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it('should render a submit button with a New Request Label', () => { | ||
| const tree = mount( | ||
| <SubmitButton {...initialProps} />, | ||
| ); | ||
|
|
||
| expect(tree.find('button').length).toBe(1); | ||
| expect(tree.find('button').text()).toBe('Send request'); | ||
| }); | ||
| }); | ||
|
|
||
| describe('EditMode: true', () => { | ||
| let initialProps; | ||
|
|
||
| beforeEach(() => { | ||
| initialProps = { | ||
| editMode: true, | ||
| }; | ||
| }); | ||
|
|
||
| it('should match the previous snapshot with editMode true', () => { | ||
| const tree = renderer | ||
| .create(<SubmitButton {...initialProps} />); | ||
|
|
||
| expect(tree).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it('should render a submit button with Update label', () => { | ||
| const tree = mount( | ||
| <SubmitButton {...initialProps} />, | ||
| ); | ||
| expect(tree.find('button').length).toBe(1); | ||
| expect(tree.find('button').text()).toBe('Update request'); | ||
| }); | ||
| }); | ||
|
|
||
| describe('Compact: true', () => { | ||
| let initialProps; | ||
|
|
||
| beforeEach(() => { | ||
| initialProps = { | ||
| editMode: false, | ||
| compact: true, | ||
| }; | ||
| }); | ||
|
|
||
| it('should match the previous snapshot with compact true', () => { | ||
| const tree = renderer | ||
| .create(<SubmitButton {...initialProps} />); | ||
|
|
||
| expect(tree).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it('should render a submit button with a Compact Request Label', () => { | ||
| const tree = mount( | ||
| <SubmitButton {...initialProps} />, | ||
| ); | ||
|
|
||
| expect(tree.find('button').length).toBe(1); | ||
| expect(tree.find('button').text()).toBe('Send'); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
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
Oops, something went wrong.