diff --git a/.stylelintrc b/.stylelintrc index de1aeda1..edc4ab55 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,5 +1,8 @@ { "extends": "stylelint-config-standard", + "plugins": [ + "stylelint-order" + ], "rules": { "at-rule-no-unknown": [true, { ignoreAtRules: ["define-mixin", "mixin", "each"] @@ -11,7 +14,11 @@ ] }], "color-hex-case": "lower", - "declaration-block-properties-order": "alphabetical", + "order/declaration-block-order": [ + "custom-properties", + "declarations" + ], + "order/declaration-block-properties-alphabetical-order": true, "font-family-name-quotes": "always-where-recommended", "string-quotes": "single", "selector-pseudo-class-no-unknown": [ diff --git a/components/__mocks__/react-css-themr.js b/components/__mocks__/react-css-themr.js new file mode 100644 index 00000000..0db02aaf --- /dev/null +++ b/components/__mocks__/react-css-themr.js @@ -0,0 +1,7 @@ +export function themr() { + return (Component) => { + Component.defaultProps = Component.defaultProps || {}; // eslint-disable-line no-param-reassign + Component.defaultProps.theme = {}; // eslint-disable-line no-param-reassign + return Component; + }; +} diff --git a/components/button/__test__/index.spec.js b/components/button/__test__/index.spec.js index 1e83db91..21fb1154 100644 --- a/components/button/__test__/index.spec.js +++ b/components/button/__test__/index.spec.js @@ -1,43 +1,35 @@ -/* eslint-disable */ -import expect from 'expect'; import React from 'react'; -import ReactDOM from 'react-dom'; -import TestUtils from 'react-addons-test-utils'; +import { mount } from 'enzyme'; +import { Button } from '../Button'; import theme from '../theme.css'; -import Button, { Button as RawButton } from '../Button'; - -const getRenderedClassName = (tree, Component) => { - const rendered = TestUtils.findRenderedComponentWithType(tree, Component); - return ReactDOM.findDOMNode(rendered).getAttribute('class'); -}; describe('Button', () => { describe('#render', () => { it('uses flat and neutral styles by default', () => { - const tree = TestUtils.renderIntoDocument(