Skip to content

Commit

Permalink
Merge pull request #113 from sproogen/revert-112-f/#105-button-tests
Browse files Browse the repository at this point in the history
Revert "F/#105 button tests"
  • Loading branch information
sproogen committed Aug 14, 2017
2 parents 135b7ae + c80bb5d commit 45041ef
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 130 deletions.
10 changes: 4 additions & 6 deletions app/Resources/client/src/components/Button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Button extends React.Component {
if (event) {
event.preventDefault()
}
if (!this.isDisabled() && this.props.callback) {
if (!this.isDisabled()) {
this.setState({
disabled : true,
loading : true
Expand Down Expand Up @@ -64,17 +64,15 @@ class Button extends React.Component {
}

Button.propTypes = {
text : PropTypes.string,
text : PropTypes.string.isRequired,
className : PropTypes.string,
disabled : PropTypes.bool,
callback : PropTypes.func,
callback : PropTypes.func.isRequired,
submitEvent : PropTypes.string
}

Button.defaultProps = {
text : '',
className : '',
disabled : false,
disabled : false,
}

export default Button
124 changes: 0 additions & 124 deletions app/Resources/client/tests/components/Button.spec.js

This file was deleted.

0 comments on commit 45041ef

Please sign in to comment.