rebase from master, finish tests

Author: levithomason

docs/app/Components/ComponentDoc/ComponentExample.js

@@ -42,12 +42,12 @@ export default class ComponentExample extends Component {
       </Column>
     );
 
-    let linkIconStyle = {
+    const linkIconStyle = {
       display: this.state.showLink ? 'inline-block' : 'none',
       marginLeft: '0.25em',
     };
 
-    let children = <Column>{this.props.children}</Column>;
+    const children = <Column>{this.props.children}</Column>;
 
     return (
       <Grid className='one column' style={{marginBottom: '4em'}} id={this.anchor}>

docs/app/Examples/modules/Checkbox/States/Checked.js

@@ -1,18 +1,8 @@
-import React, {Component} from 'react';
+import React from 'react';
 import {Checkbox} from 'stardust';
 
-export default class CheckboxCheckedExample extends Component {
-  state = {isChecked: true};
-
-  handleChange = e => {
-    this.setState({
-      isChecked: !this.state.isChecked
-    });
-  };
-
-  render() {
-    return (
-      <Checkbox defaultChecked={true} label='This checkbox comes prechecked' />
-    );
-  }
-}
+export default CheckboxCheckedExample => {
+  return (
+    <Checkbox defaultChecked label='This checkbox comes prechecked' />
+  );
+};

src/elements/Input/Input.js

@@ -43,7 +43,6 @@ export default class Input extends Component {
     const actionChildren = [];
 
     Children.forEach(this.props.children, child => {
-      // TODO: use child._meta here, once merged, to determine component type
       const isButton = child.type.name === 'Button';
       const isDropdown = child.type.name === 'Dropdown';
       // TODO: use child.type.name === 'Label' once Label component is merged.

src/modules/Dropdown/Dropdown.js

@@ -3,6 +3,7 @@ import $ from 'jquery';
 import classNames from 'classnames';
 import React, {Component, PropTypes} from 'react';
 import META from 'src/utils/Meta';
+import getUnhandledProps from 'src/utils/getUnhandledProps';
 
 export default class Dropdown extends Component {
   static propTypes = {
@@ -11,11 +12,12 @@ export default class Dropdown extends Component {
       value: PropTypes.string,
       text: PropTypes.string,
     })),
+    settings: PropTypes.object,
   };
 
   componentDidMount() {
     this.element = $(this.refs.select);
-    this.element.dropdown();
+    this.element.dropdown(this.props.settings);
   }
 
   componentDidUpdate(prevProps, prevState) {
@@ -43,8 +45,7 @@ export default class Dropdown extends Component {
       'dropdown'
     );
 
-    const props = _.clone(this.props);
-    delete props.options;
+    const props = getUnhandledProps(this);
 
     return (
       <select {...props} className={classes} ref='select'>

src/modules/Modal/Modal.js

@@ -1,12 +1,14 @@
 import React, {Component, PropTypes} from 'react';
 import classNames from 'classnames';
 import META from 'src/utils/Meta';
+import getUnhandledProps from 'src/utils/getUnhandledProps';
 
-class Modal extends Component {
+export default class Modal extends Component {
   static propTypes = {
     children: PropTypes.any,
     className: PropTypes.string,
     ref: PropTypes.string,
+    settings: PropTypes.object,
   };
 
   static defaultProps = {
@@ -38,12 +40,12 @@ class Modal extends Component {
       {'transition visible active': this.state.isShown},
     );
 
+    const props = getUnhandledProps(this);
+
     return (
-      <div {...this.props} className={classes}>
+      <div {...props} className={classes}>
         {this.props.children}
       </div>
     );
   }
 }
-
-export default Modal;

src/modules/Modal/ModalHeader.js

@@ -6,6 +6,7 @@ export default class ModalHeader extends Component {
   static propTypes = {
     children: PropTypes.any,
     className: PropTypes.string,
+    settings: PropTypes.object,
   };
 
   static _meta = {

src/utils/Meta.js

@@ -15,7 +15,22 @@ const META = {
     element: 'element',
     view: 'view',
     module: 'module',
-  }
+  },
+
+  // library
+  isSemanticUI: ({_meta}) => _meta.library === META.library.semanticUI,
+  isStardust: ({_meta}) => _meta.library === META.library.stardust,
+
+  // type
+  isAddon: ({_meta}) => _meta.type === META.type.addon,
+  isGlobal: ({_meta}) => _meta.type === META.type.global,
+  isCollection: ({_meta}) => _meta.type === META.type.collection,
+  isElement: ({_meta}) => _meta.type === META.type.element,
+  isView: ({_meta}) => _meta.type === META.type.view,
+  isModule: ({_meta}) => _meta.type === META.type.module,
+
+  // parent
+  isChild: ({_meta}) => !!_meta.parent,
 };
 
 export default META;

test/specs/Conformance-test.js

@@ -127,15 +127,20 @@ describe('Conformance', () => {
             });
           }
 
-          // TODO: this is only true for "module" type components
-          // Update this test once we get component meta data
-          it('does not spread the settings prop', () => {
-            const props = {settings: {}};
-            render(<SDComponent {...props} />)
-              .children()
-              .some(element => _.has(element.props, 'settings'))
-              .should.equal(false);
-          });
+          if (META.isModule(SDComponent) && !META.isChild(SDComponent)) {
+            describe('settings', () => {
+              it('is defined in propTypes', () => {
+                SDComponent.propTypes.settings.should.be.a('function');
+              });
+              it('is not spread', () => {
+                const props = {settings: {}};
+                render(<SDComponent {...props} />)
+                  .children()
+                  .some(element => _.has(element.props, 'settings'))
+                  .should.equal(false);
+              });
+            });
+          }
         });
       });
     });

test/specs/modules/Checkbox/Checkbox-test.js

@@ -4,8 +4,8 @@ import {Checkbox} from 'stardust';
 describe('Checkbox', () => {
   it('can be checked by default', () => {
     render(<Checkbox defaultChecked name='firstName' />)
-      .first()
-      .refs.checkbox.checked.should.equal(true);
+      .findTag('input')
+      .checked.should.equal(true);
   });
   it('should have a semantic ui plugin to handle the check action', () => {
     render(<Checkbox name='firstName' label='Include First' />)