fix(Header): Fix image prop
#545
Merged
Conversation
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
layershifter
commented
Sep 24, 2016
| @@ -53,7 +54,7 @@ function Header(props) { | |||
| ) | |||
| } | |||
|
|
|||
| if (image || icon && typeof icon !== 'boolean') { | |||
| if ((image && typeof image !== 'boolean') || (icon && typeof icon !== 'boolean')) { | |||
layershifter
commented
Sep 24, 2016
| .should.not.have.className('icon') | ||
| it('does not add an Image when true', () => { | ||
| shallow(<Header image />) | ||
| .should.not.have.descendants('Image') |
layershifter
commented
Sep 24, 2016
| useKeyOnly(inverted, 'inverted'), | ||
| useKeyOnly(disabled, 'disabled'), | ||
| useKeyOnly(sub, 'sub'), |
Current coverage is 98.86% (diff: 100%)@@ master #545 diff @@
==========================================
Files 108 108
Lines 1764 1764
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
Hits 1744 1744
Misses 20 20
Partials 0 0
|
…into fix/header-prop Conflicts: test/specs/elements/Header/Header-test.js
levithomason
requested changes
Sep 24, 2016
| @@ -69,7 +80,14 @@ describe('Header', () => { | |||
| }) | |||
|
|
|||
| describe('subheader', () => { | |||
| it('adds HeaderSubheader as child when there is an icon', () => { | |||
| it('adds HeaderSubheader as child', () => { | |||
There was a problem hiding this comment.
This one should be covered by implementsShorthandProp() for subheader. Should be able to remove it without a change in coverage.
There was a problem hiding this comment.
Looks like issue with merge, now okay.
…into fix/header-prop Conflicts: test/specs/elements/Header/Header-test.js
levithomason
approved these changes
Sep 25, 2016
|
Released in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #542.