Merge pull request #21 from Mattomanka/react-16-upgrade

Update react and enzyme.

.eslintrc

@@ -25,7 +25,11 @@
       ],
       "rules": {
         "react/prop-types": "off",
-        "no-underscore-dangle": "off"
+        "no-underscore-dangle": "off",
+        "react/prefer-stateless-function": [
+          1, 
+          { "ignorePureComponents": true }
+        ]
       }
     }
   ]

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - node
+  - 8.10.0
 script:
   - npm run lint
   - npm run coverage

jsdom.spec.js

@@ -1,6 +1,6 @@
 import jsdom from 'jsdom';
 
-const window = new jsdom.JSDOM().window;
+const { window } = new jsdom.JSDOM('', { url: 'http://localhost/' });
 
 Object.keys(window).forEach((property) => {
   if (typeof global[property] === 'undefined') {

package.json

@@ -95,12 +95,12 @@
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.24.0",
     "babili-webpack-plugin": "^0.1.2",
-    "coveralls": "^2.11.16",
+    "coveralls": "^3.0.2",
     "cross-env": "^5.0.5",
     "css-loader": "^0.28.4",
     "david": "^11.0.0",
     "editorconfig": "^0.14.1",
-    "enzyme": "^2.8.2",
+    "enzyme": "^3.3.0",
     "eslint": "^4.3.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-plugin-import": "^2.7.0",
@@ -109,34 +109,40 @@
     "expect": "^1.20.2",
     "extract-text-webpack-plugin": "^3.0.0",
     "jsdom": "^11.1.0",
-    "less": "^2.7.1",
+    "less": "^3.9.0",
     "less-loader": "^4.0.5",
     "markdown-toc": "^1.1.0",
-    "mocha": "^3.2.0",
+    "mocha": "^5.2.0",
     "nyc": "^11.1.0",
     "optimize-css-assets-webpack-plugin": "^3.0.0",
     "postcss-loader": "^2.0.6",
     "pre-commit": "^1.2.2",
     "proxyquire": "^1.8.0",
-    "react-addons-test-utils": "^15.4.1",
-    "react-dom": "^15.0.0",
-    "react-redux": "^5.0.2",
-    "react-test-renderer": "^15.5.4",
+    "react-dom": "^16.4.0",
+    "react-redux": "^5.0.6",
+    "react-test-renderer": "^16.2.0",
     "redux": "^3.6.0",
     "redux-mock-store": "^1.2.3",
     "rimraf": "^2.6.1",
     "style-loader": "^0.18.2",
     "webpack": "^3.5.4",
-    "webpack-dev-server": "^2.4.1"
+    "webpack-dev-server": "^3.1.10"
   },
   "dependencies": {
     "classnames": "^2.2.5",
+    "enzyme-adapter-react-16": "^1.1.1",
     "lodash.merge": "^4.6.0",
-    "prop-types": "^15.5.8",
-    "react": "^15.4.1",
+    "progressive-web-sdk": "^1.6.1-preview.7",
+    "prop-types": "^15.6.2",
+    "raf": "^3.4.0",
+    "react": "^16.4.0",
     "react-jplayer-utils": "latest",
     "react-motion": "^0.5.0",
+    "react-transition-group": "^2.5.1",
     "recompose": "^0.24.0",
-    "screenfull": "^3.0.2"
+    "screenfull": "^4.0.0"
+  },
+  "engines": {
+    "node": "8.x || 9.x"
   }
 }

src/components/bar.spec.jsx

@@ -5,7 +5,7 @@ import Bar from './bar';
 import componentSetup from '../util/specHelpers/componentSetup.spec';
 
 const setup = props => componentSetup(Bar, {
-  children: <div className="@@bar" />,
+  children: <div className="bar" />,
   onClick: expect.createSpy(),
   onMouseDown: expect.createSpy(),
   onTouchStart: expect.createSpy(),
@@ -41,6 +41,6 @@ describe('Bar', () => {
   it('children are rendered', () => {
     const { wrapper } = setup();
 
-    expect(wrapper.find('.@@bar').exists()).toBe(true);
+    expect(wrapper.find('.bar').exists()).toBe(true);
   });
 });

src/components/media/mediaContainer.spec.jsx

@@ -140,29 +140,29 @@ describe('MediaContainer', () => {
     describe('updateMediaTimeAfterSeeking', () => {
       it(`when the media is seekable it updates currentTime 
           and currentPercentRelative`, () => {
-          const { store } = setup(jPlayers);
+        const { store } = setup(jPlayers);
 
-          store.dispatch(setPlayHead(id, 22));
+        store.dispatch(setPlayHead(id, 22));
 
-          const jPlayer = store.getState().jPlayers[id];
+        const jPlayer = store.getState().jPlayers[id];
 
-          expect(mockCurrentMedia.currentTime).toBe(22);
-          expect(jPlayer.currentPercentRelative).toBe(22);
-        });
+        expect(mockCurrentMedia.currentTime).toBe(22);
+        expect(jPlayer.currentPercentRelative).toBe(22);
+      });
 
       it(`when the media has an infinitly seekable 
           it does not update the currentTime and currentPercentRelative`, () => {
-          const { store } = setup(jPlayers);
+        const { store } = setup(jPlayers);
 
-          mockCurrentMedia.seekable.end = expect.createSpy().andReturn(Infinity);
+        mockCurrentMedia.seekable.end = expect.createSpy().andReturn(Infinity);
 
-          store.dispatch(setPlayHead(id, 22));
+        store.dispatch(setPlayHead(id, 22));
 
-          const jPlayer = store.getState().jPlayers[id];
+        const jPlayer = store.getState().jPlayers[id];
 
-          expect(mockCurrentMedia.currentTime).toNotBe(22);
-          expect(jPlayer.currentPercentRelative).toNotBe(22);
-        });
+        expect(mockCurrentMedia.currentTime).toNotBe(22);
+        expect(jPlayer.currentPercentRelative).toNotBe(22);
+      });
     });
 
     describe('updateMediaPlayState', () => {

src/util/index.spec.js

@@ -1,8 +1,12 @@
 import expect from 'expect';
 import { convertTime } from 'react-jplayer-utils';
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
 
 import { defaultOptions } from './constants';
 
+Enzyme.configure({ adapter: new Adapter() });
+
 describe('convertTime', () => {
   it('sets timeText to empty if time is NaN', () => {
     const timeText = convertTime('test');