Skip to content

Commit

Permalink
Upgrade to react 16 as well as test dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Zhang committed Oct 2, 2017
1 parent 127966d commit fc5072b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
21 changes: 11 additions & 10 deletions package.json
Expand Up @@ -30,11 +30,11 @@
"babel-preset-react": "6.3.13",
"babel-preset-stage-2": "6.5.0",
"babel-register": "6.7.2",
"chai": "3.4.1",
"chai-as-promised": "6.0.0",
"chai-enzyme": "0.6.1",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"css-loader": "0.26.0",
"enzyme": "2.2.0",
"enzyme": "3.0.0",
"enzyme-adapter-react-16": "1.0.0",
"eslint": "3.10.2",
"eslint-config-airbnb": "13.0.0",
"eslint-loader": "1.2.1",
Expand All @@ -44,13 +44,14 @@
"exports-loader": "0.6.3",
"imports-loader": "0.6.5",
"jsdom": "9.8.3",
"mocha": "3.1.2",
"mocha": "3.5.3",
"node-sass": "3.8.0",
"react-addons-test-utils": "15.6.0",
"react-addons-test-utils": "15.6.2",
"react-hot-loader": "3.0.0-beta.6",
"react-test-renderer": "16.0.0",
"sass-loader": "4.0.2",
"sinon": "1.17.3",
"sinon-chai": "2.8.0",
"sinon": "4.0.0",
"sinon-chai": "2.14.0",
"style-loader": "0.13.0",
"webpack": "1.12.9",
"webpack-dev-server": "1.14.0"
Expand All @@ -62,9 +63,9 @@
"moment": "2.18.1",
"normalizr": "2.0.0",
"prop-types": "15.5.10",
"react": "15.5.4",
"react": "16.0.0",
"react-clipboard.js": "1.1.2",
"react-dom": "15.5.4",
"react-dom": "16.0.0",
"react-rangeslider": "2.1.0",
"react-redux": "5.0.5",
"react-router": "4.1.1",
Expand Down
8 changes: 4 additions & 4 deletions test/setup.js
@@ -1,15 +1,15 @@
import React from 'react'; // eslint-disable-line no-unused-vars
import chai, { expect } from 'chai';
import sinon from 'sinon';
import sinonChai from 'sinon-chai';
import chaiAsPromised from 'chai-as-promised';
import { shallow, mount, render } from 'enzyme';
import chaiEnzyme from 'chai-enzyme';
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import { jsdom } from 'jsdom';

Enzyme.configure({ adapter: new Adapter() });

chai.use(sinonChai);
chai.use(chaiAsPromised);
chai.use(chaiEnzyme());

global.document = jsdom('');
global.window = document.defaultView;
Expand Down

0 comments on commit fc5072b

Please sign in to comment.