From b48c17d1adda744863771fa10dfe8302425f04d3 Mon Sep 17 00:00:00 2001 From: Javi Velasco Date: Mon, 6 Feb 2017 09:53:31 +0100 Subject: [PATCH] =?UTF-8?q?Use=20Jest=20=F0=9F=83=8F=20and=20upgrade=20Web?= =?UTF-8?q?pack=20and=20other=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .stylelintrc | 9 +- components/__mocks__/react-css-themr.js | 7 + components/button/__test__/index.spec.js | 28 +- components/chip/__test__/index.spec.js | 24 +- components/date_picker/DatePicker.js | 1 + components/date_picker/__test__/index.spec.js | 96 +- components/dropdown/__test__/index.spec.js | 44 - components/menu/__test__/index.spec.js | 30 +- .../progress_bar/__test__/index.spec.js | 58 +- components/slider/__tests__/index.spec.js | 181 +- components/tabs/__tests__/index.spec.js | 99 +- karma.conf.js | 21 - package.json | 70 +- server.js | 2 +- tests.webpack.js | 2 - webpack.config.development.js | 59 - webpack.config.test.js | 40 - webpack/webpack.config.dev.js | 83 + yarn.lock | 2008 ++++++++++------- 19 files changed, 1536 insertions(+), 1326 deletions(-) create mode 100644 components/__mocks__/react-css-themr.js delete mode 100644 components/dropdown/__test__/index.spec.js delete mode 100644 karma.conf.js delete mode 100644 tests.webpack.js delete mode 100644 webpack.config.development.js delete mode 100644 webpack.config.test.js create mode 100644 webpack/webpack.config.dev.js 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(