fix tests

Author: levithomason

src/collections/Form/Fields.js

@@ -5,7 +5,7 @@ import getUnhandledProps from 'src/utils/getUnhandledProps';
 import numberToWord from 'src/utils/numberToWord';
 import META from 'src/utils/Meta.js';
 
-export default class Field extends Component {
+export default class Fields extends Component {
   static propTypes = {
     children: PropTypes.node,
     className: PropTypes.string,
@@ -21,13 +21,14 @@ export default class Field extends Component {
 
   render() {
     let fieldCount = 0;
-    Children.forEach(child => {
-      _.get(child, '_meta.name') === 'Field' && fieldCount++;
+    Children.forEach(this.props.children, child => {
+      _.get(child, 'type._meta.name') === 'Field' && fieldCount++;
     });
     fieldCount = numberToWord(fieldCount);
+
     const classes = classNames(
-      'sd-field',
-      {fieldCount: this.props.evenlyDivided},
+      'sd-fields',
+      this.props.evenlyDivided && fieldCount,
       this.props.className,
       'fields'
     );

src/elements/Input/Input.js

@@ -8,7 +8,6 @@ export default class Input extends Component {
   static propTypes = {
     children: PropTypes.node,
     className: PropTypes.string,
-    defaultValue: PropTypes.string,
     icon: PropTypes.string,
     ref: PropTypes.string,
   };

src/utils/getUnhandledProps.js

@@ -1,15 +1,15 @@
 import _ from 'lodash';
 
 /**
- * Returns an object consisting of props not defined in propTypes nor defaultProps.
+ * Returns an object consisting of props not defined in propTypes unless defined in defaultProps.
  * @param {*} instance The `this` keyword in a React Component class.
  * @returns {{}} A shallow copy of the prop object
  */
 const getUnhandledProps = instance => {
   return _.omit(instance.props, (val, key) => {
     const inPropTypes = _.has(instance.constructor.propTypes, key);
     const inDefaultProps = _.has(instance.constructor.defaultProps, key);
-    return inPropTypes || inDefaultProps;
+    return inPropTypes && !inDefaultProps;
   });
 };
 

test/specs/Conformance-test.js

@@ -81,8 +81,9 @@ describe('Conformance', () => {
           const props = {};
           // JSX does not render custom html attributes so we prefix them with data-*.
           // https://facebook.github.io/react/docs/jsx-gotchas.html#custom-html-attributes
-          props[`data-${faker.hacker.noun()}`] = faker.hacker.noun();
+          props[`data-${_.kebabCase(faker.hacker.noun())}`] = faker.hacker.noun();
 
+          console.log(props);
           // create element with random props
           render(<SDComponent {...props} />)
             .children()

test/specs/collections/Form/Fields-test.js

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import faker from 'faker';
 import React from 'react';
 
@@ -15,7 +14,7 @@ describe('Fields', () => {
       .findClass('two fields');
   });
   it('renders children', () => {
-    const child = faker.hackerPhrase();
+    const child = faker.hacker.phrase();
     render(<Fields>{child}</Fields>)
       .findText(child);
   });

test/specs/elements/Input/Input-test.js

@@ -11,7 +11,7 @@ describe('Input', () => {
   it('has a default value', () => {
     render(<Input defaultValue='John' />)
       .findTag('input')
-      .props.defaultValue.should.equal('John');
+      .value.should.equal('John');
   });
 
   it('has a type of phone', () => {

test/utils/getUnhandledPops-test.js

@@ -10,24 +10,25 @@ class TestClass {
 }
 
 describe('getUnhandledProps', () => {
-  it('removes props defined in defaultProps', () => {
-    TestClass.defaultProps = {imHandled: 'thanks'};
-    new TestClass()
-      .unhandledProps
-      .should.not.have.any.keys(_.keys(TestClass.defaultProps));
-  });
   it('removes props defined in propTypes', () => {
-    TestClass.propTypes = {imHandled: 'thanks'};
+    TestClass.propTypes = {removeMe: 'thanks'};
     new TestClass()
       .unhandledProps
-      .should.not.have.any.keys(_.keys(TestClass.defaultProps));
+      .should.not.have.any.keys(_.keys(TestClass.propTypes));
   });
-  it('leave props not in defaultProps || propTypes in tact', () => {
-    TestClass.defaultProps = {imHandled: 'thanks'};
-    TestClass.propTypes = {alsoHandled: 'got it'};
-    const props = {thisShould: 'still be here'};
-    new TestClass(props)
-      .unhandledProps
-      .should.eql(props);
+  it('leaves props if not defined in propTypes', () => {
+    const userProps = {leaveThis: 'because it is unhandled'};
+    TestClass.propTypes = {removeMe: 'because we are handling it'};
+    const unhandled = new TestClass(userProps).unhandledProps;
+
+    unhandled.should.not.have.any.keys(_.keys(TestClass.propTypes));
+    unhandled.should.have.all.keys(_.keys(userProps));
+  });
+  it('leaves propType props if also defined in defaultProps', () => {
+    TestClass.propTypes = {leaveMe: 'because it is also in defaultProps'};
+    TestClass.defaultProps = {leaveMe: 'here i am'};
+    const unhandled = new TestClass().unhandledProps;
+
+    unhandled.should.have.all.keys(_.keys(TestClass.defaultProps));
   });
 });