Skip to content

Commit

Permalink
Issue #930 (#934)
Browse files Browse the repository at this point in the history
* Bumped react react-dom and html-react-parser version.

* Bumped react and react-dom version.

* Fixed all the tests. Fixes #930.
  • Loading branch information
IanCStewart authored and Sjaak Luthart committed Nov 8, 2017
1 parent c72d196 commit e2eb519
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 9 deletions.
8 changes: 8 additions & 0 deletions .nycrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"reporter": [
"text"
],
"exclude": [
"test/**/*"
]
}
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"prismjs": "^1.8.3",
"prop-types": "^15.5.6",
"radium": "^0.19.1",
"react": "^15.5.3",
"react-dom": "^15.5.3",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-jss": "^5.3.0",
"react-router": "^3.0.2",
"uuid": "^3.0.1"
Expand Down
4 changes: 4 additions & 0 deletions mocha-setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
const Adapter = require('enzyme-adapter-react-16');
const enzyme = require('enzyme');

enzyme.configure({ adapter: new Adapter() });
2 changes: 2 additions & 0 deletions mocha.opts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--require ./mocha-setup
--compilers js:babel-core/register
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"/*"
],
"scripts": {
"test": "NODE_ENV=test nyc mocha --compilers js:babel-core/register test/*",
"test:watch": "NODE_ENV=test mocha --watch --compilers js:babel-core/register test/*",
"test": "NODE_ENV=test nyc mocha --opts ./mocha.opts test/*",
"test:watch": "NODE_ENV=test mocha --opts ./mocha.opts --watch test/*",
"watch": "babel -d dist/ -w src/",
"compile": "rimraf dist && babel -d dist/ src/",
"lint": "eslint '{src,docs/src,test}/**/**/*.{js,jsx}'",
Expand Down Expand Up @@ -43,7 +43,8 @@
"babel-preset-react": "^6.16.0",
"babel-preset-stage-0": "^6.16.0",
"chai": "^3.5.0",
"enzyme": "^2.7.0",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.3",
"eslint": "^3.19.0",
"eslint-config-airbnb": "^15.0.1",
"eslint-plugin-import": "^2.6.1",
Expand All @@ -53,10 +54,9 @@
"mocha": "^3.2.0",
"nyc": "^11.3.0",
"prettier": "^1.7.4",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
"react": "^16.0.0",
"react-docgen": "^2.19.0",
"react-dom": "^15.4.2",
"react-dom": "^16.0.0",
"react-test-renderer": "^15.5.4",
"rimraf": "^2.6.2",
"sinon": "^1.17.7",
Expand All @@ -81,7 +81,7 @@
"date-fns": "^1.27.2",
"emojione": "^3.0.3",
"escape-html": "^1.0.3",
"html-react-parser": "^0.3.4",
"html-react-parser": "^0.4.0",
"lodash": "^4.17.4",
"mobile-detect": "^1.3.6",
"radium": "^0.19.0",
Expand Down

0 comments on commit e2eb519

Please sign in to comment.