Update test tools and proptypes

docs/components/Base.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { Card } from 'belle';
 import { Link } from 'react-router';
 import Column from './Column';

docs/components/Code.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import highlightJs from 'highlight.js';
 import { isEqual, omit, extend } from 'underscore';

docs/components/Column.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { omit } from 'underscore';
 
 export default React.createClass({

docs/theme/ThemeSwitch.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { Button } from 'belle';
 
 export default React.createClass({

package.json

@@ -23,7 +23,8 @@
   ],
   "peerDependencies": {
     "react": ">=15.4.0",
-    "react-dom": ">=15.4.0"
+    "react-dom": ">=15.4.0",
+    "prop-types": ">=15.4.0"
   },
   "scripts": {
     "build": "BABEL_ENV=production node_modules/.bin/babel --out-dir='lib' --ignore='__tests__/*' src",
@@ -53,9 +54,10 @@
     "eslint-config-airbnb": "6.2.0",
     "eslint-plugin-react": "^4.2.3",
     "jest-cli": "^15.1.1",
+    "prop-types": "^15.5.10",
     "react": "^15.4.1",
-    "react-addons-test-utils": "^15.4.1",
     "react-dom": "^15.4.1",
+    "react-test-renderer": "^15.6.1",
     "react-transform-catch-errors": "^1.0.2",
     "react-transform-hmr": "^1.0.4",
     "redbox-react": "^1.2.2",
@@ -70,7 +72,7 @@
       "<rootDir>/node_modules/react",
       "<rootDir>/node_modules/fbjs",
       "<rootDir>/node_modules/react-dom",
-      "<rootDir>/node_modules/react-addons-test-utils",
+      "<rootDir>/node_modules/prop-types",
       "../utils/helpers",
       "../utils/union-class-names",
       "../utils/is-component-of-type"

src/__tests__/Button-test.js

@@ -6,7 +6,7 @@ jest.dontMock('../utils/union-class-names');
 jest.dontMock('../style/button');
 
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/__tests__/Card-test.js

@@ -5,7 +5,7 @@ jest.dontMock('../style/card');
 jest.dontMock('../utils/inject-style');
 
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/__tests__/ComboBox-test.js

@@ -5,7 +5,7 @@ jest.dontMock('../components/ComboBoxItem');
 jest.dontMock('../components/Option');
 
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/__tests__/DatePicker-test.js

@@ -11,7 +11,7 @@ jest.dontMock('../style/date-picker');
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/__tests__/Option-test.js

@@ -4,7 +4,7 @@ jest.dontMock('../components/Option');
 jest.dontMock('../style/option');
 
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import Shallow from 'react-test-renderer/shallow';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.
@@ -14,7 +14,7 @@ describe('Option', () => {
   let shallowRenderer;
 
   beforeEach(() => {
-    shallowRenderer = TestUtils.createRenderer();
+    shallowRenderer = new Shallow();
   });
 
   it('should initialise _isDisplayedAsSelected during construction', () => {

src/__tests__/Placeholder-test.js

@@ -4,7 +4,7 @@ jest.dontMock('../components/Placeholder');
 jest.dontMock('../style/placeholder');
 
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/__tests__/Rating-test.js

@@ -5,7 +5,7 @@ jest.dontMock('../utils/inject-style');
 jest.dontMock('../utils/union-class-names');
 
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/__tests__/Select-test.js

@@ -8,7 +8,7 @@ jest.dontMock('../components/Separator');
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/__tests__/Separator-test.js

@@ -4,7 +4,7 @@ jest.dontMock('../components/Separator');
 jest.dontMock('../style/separator');
 
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/__tests__/Spinner-test.js

@@ -4,7 +4,7 @@ jest.dontMock('../components/Spinner');
 jest.dontMock('../style/spinner');
 
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/__tests__/TextInput-test.js

@@ -6,7 +6,7 @@ jest.dontMock('../utils/calculate-textarea-height');
 jest.dontMock('../style/text-input');
 
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 
 // Babel would move an import in front of the jest.dontMock. That's why require
 // is used instead of import.

src/components/ActionArea.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import actionAreaStyle from '../style/actionArea';
 import { omit } from '../utils/helpers';
 

src/components/Button.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'; // eslint-disable-line no-unused-vars
+import React, { Component } from 'react';
+import PropTypes from 'prop-types'; // eslint-disable-line no-unused-vars
 import { has, omit, uniqueId } from '../utils/helpers';
 import buttonStyle from '../style/button';
 import unionClassNames from '../utils/union-class-names';

src/components/Card.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'; // eslint-disable-line no-unused-vars
+import React, { Component } from 'react';
+import PropTypes from 'prop-types'; // eslint-disable-line no-unused-vars
 import cardStyle from '../style/card';
 
 /**

src/components/Choice.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * Choice component

src/components/ComboBox.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { injectStyles, removeAllStyles } from '../utils/inject-style';
 import unionClassNames from '../utils/union-class-names';
 import { omit, filterReactChildren, has, isEmpty, find, getArrayForReactChildren, uniqueId } from '../utils/helpers';

src/components/ComboBoxItem.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * Belle internal component to wrap an Option in a ComboBox.

src/components/DatePicker.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { injectStyles, removeAllStyles } from '../utils/inject-style';
 import unionClassNames from '../utils/union-class-names';
 import { has, map, shift, reverse, omit, uniqueId } from '../utils/helpers';

src/components/Day.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * Belle internal component to wrap a Day in a DatePicker.

src/components/DisabledDay.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * Belle internal component to wrap a DisabledDay in a DatePicker.

src/components/Option.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { omit } from '../utils/helpers';
 import style from '../style/option';
 

src/components/Placeholder.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { omit } from '../utils/helpers';
 import style from '../style/placeholder';
 

src/components/Rating.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { canUseDOM } from 'exenv';
 import { omit, has, uniqueId } from '../utils/helpers';
 import style from '../style/rating.js';

src/components/Select.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import {
   omit,

src/components/SelectItem.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * Belle internal component to wrap an Option in a Select.

src/components/Separator.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { omit } from '../utils/helpers';
 import style from '../style/separator';
 

src/components/Spinner.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import spinnerStyle from '../style/spinner';
 
 const animationDelay = (delay) => ({

src/components/TextInput.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import calculateTextareaHeight from '../utils/calculate-textarea-height';
 import { injectStyles, removeStyle } from '../utils/inject-style';

src/components/Toggle.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import { injectStyles, removeStyle } from '../utils/inject-style';
 import { omit, has, last, first, uniqueId } from '../utils/helpers';