Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/input' into feature/input
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/elements/Input/Input.js
#	test/specs/elements/Input/Input-test.js
  • Loading branch information
jhchill666 committed Jul 5, 2016
2 parents b001813 + ca334bf commit 8f4300c
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion test/specs/elements/Input/Input-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react'
import Input from 'src/elements/Input/Input'
import * as common from 'test/specs/commonTests'

describe.only('Input', () => {
describe('Input', () => {
common.isConformant(Input)
common.hasUIClassName(Input)
// TODO: inputs do not render child text, only child components in special cases
Expand All @@ -20,6 +20,10 @@ describe.only('Input', () => {

common.propValueOnlyToClassName(Input, 'size')

common.propKeyOnlyToClassName(Input, 'transparent')
common.propKeyOnlyToClassName(Input, 'inverted')
common.propKeyOnlyToClassName(Input, 'fluid')

it('has the input type of text by default', () => {
shallow(<Input />)
.find('input')
Expand Down

0 comments on commit 8f4300c

Please sign in to comment.