From 6a52c03d92fd0d72919cb44e3fa9b8edc57e91e0 Mon Sep 17 00:00:00 2001 From: Jimmy Jia Date: Mon, 10 Apr 2017 15:38:33 -0400 Subject: [PATCH] Update dependencies --- examples/basic-jsx/package.json | 7 +++-- examples/basic-jsx/src/index.js | 5 +-- examples/basic/package.json | 7 +++-- examples/basic/src/index.js | 3 +- examples/global-pending/package.json | 7 +++-- examples/global-pending/src/index.js | 3 +- examples/redux/package.json | 9 +++--- examples/redux/src/index.js | 7 +++-- examples/transition-hook/package.json | 7 +++-- examples/transition-hook/src/index.js | 3 +- examples/universal-redux/package.json | 21 +++++++------ examples/universal-redux/src/App.js | 5 +-- examples/universal/package.json | 19 +++++------ examples/universal/src/routeConfig.js | 5 +-- package.json | 45 ++++++++++++++------------- src/BaseLink.js | 23 +++++++------- src/ElementsRenderer.js | 5 +-- src/PropTypes.js | 38 +++++++++++----------- src/createBaseRouter.js | 13 ++++---- src/server/RouterProvider.js | 3 +- test/BaseLink.test.js | 26 ++++++++-------- test/ElementsRenderer.test.js | 9 +++--- test/jsx/Redirect.test.js | 4 +-- test/jsx/Route.test.js | 4 +-- test/server/RouterProvider.test.js | 6 ++-- 25 files changed, 152 insertions(+), 132 deletions(-) diff --git a/examples/basic-jsx/package.json b/examples/basic-jsx/package.json index 23849c36..79b2bf91 100644 --- a/examples/basic-jsx/package.json +++ b/examples/basic-jsx/package.json @@ -3,12 +3,13 @@ "version": "0.1.0", "private": true, "devDependencies": { - "react-scripts": "0.7.0" + "react-scripts": "0.9.5" }, "dependencies": { "found": "../..", - "react": "^15.3.2", - "react-dom": "^15.3.2" + "prop-types": "^15.5.6", + "react": "^15.5.3", + "react-dom": "^15.5.3" }, "scripts": { "start": "react-scripts start" diff --git a/examples/basic-jsx/src/index.js b/examples/basic-jsx/src/index.js index 309cfbf5..af6d7e87 100644 --- a/examples/basic-jsx/src/index.js +++ b/examples/basic-jsx/src/index.js @@ -3,6 +3,7 @@ import Link from 'found/lib/Link'; import makeRouteConfig from 'found/lib/jsx/makeRouteConfig'; import Redirect from 'found/lib/jsx/Redirect'; import Route from 'found/lib/jsx/Route'; +import PropTypes from 'prop-types'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -19,7 +20,7 @@ function LinkItem(props) { } const propTypes = { - children: React.PropTypes.node, + children: PropTypes.node, }; function App({ children }) { @@ -85,7 +86,7 @@ const BrowserRouter = createBrowserRouter({ from="baz" to="/foo" /> - + , ), renderError: ({ error }) => ( // eslint-disable-line react/prop-types diff --git a/examples/basic/package.json b/examples/basic/package.json index 254a085b..3fd55f5c 100644 --- a/examples/basic/package.json +++ b/examples/basic/package.json @@ -3,12 +3,13 @@ "version": "0.1.0", "private": true, "devDependencies": { - "react-scripts": "0.7.0" + "react-scripts": "0.9.5" }, "dependencies": { "found": "../..", - "react": "^15.3.2", - "react-dom": "^15.3.2" + "prop-types": "^15.5.6", + "react": "^15.5.3", + "react-dom": "^15.5.3" }, "scripts": { "start": "react-scripts start" diff --git a/examples/basic/src/index.js b/examples/basic/src/index.js index a9a276db..bd01dfad 100644 --- a/examples/basic/src/index.js +++ b/examples/basic/src/index.js @@ -1,6 +1,7 @@ import createBrowserRouter from 'found/lib/createBrowserRouter'; import Link from 'found/lib/Link'; import Redirect from 'found/lib/Redirect'; +import PropTypes from 'prop-types'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -17,7 +18,7 @@ function LinkItem(props) { } const propTypes = { - children: React.PropTypes.node, + children: PropTypes.node, }; function App({ children }) { diff --git a/examples/global-pending/package.json b/examples/global-pending/package.json index 198a49bc..babc3979 100644 --- a/examples/global-pending/package.json +++ b/examples/global-pending/package.json @@ -3,12 +3,13 @@ "version": "0.1.0", "private": true, "devDependencies": { - "react-scripts": "0.7.0" + "react-scripts": "0.9.5" }, "dependencies": { "found": "../..", - "react": "^15.3.2", - "react-dom": "^15.3.2", + "prop-types": "^15.5.6", + "react": "^15.5.3", + "react-dom": "^15.5.3", "react-static-container": "^1.0.1" }, "scripts": { diff --git a/examples/global-pending/src/index.js b/examples/global-pending/src/index.js index ee8c47cd..dd518761 100644 --- a/examples/global-pending/src/index.js +++ b/examples/global-pending/src/index.js @@ -1,6 +1,7 @@ import createBrowserRouter from 'found/lib/createBrowserRouter'; import ElementsRenderer from 'found/lib/ElementsRenderer'; import Link from 'found/lib/Link'; +import PropTypes from 'prop-types'; import React from 'react'; import ReactDOM from 'react-dom'; import StaticContainer from 'react-static-container'; @@ -18,7 +19,7 @@ function LinkItem(props) { } const propTypes = { - children: React.PropTypes.node, + children: PropTypes.node, }; function App({ children }) { diff --git a/examples/redux/package.json b/examples/redux/package.json index 5c83a822..40471bf8 100644 --- a/examples/redux/package.json +++ b/examples/redux/package.json @@ -3,14 +3,15 @@ "version": "0.1.0", "private": true, "devDependencies": { - "react-scripts": "0.9.0" + "react-scripts": "0.9.5" }, "dependencies": { "farce": "^0.2.1", "found": "../..", - "react": "^15.4.2", - "react-dom": "^15.4.2", - "react-redux": "^5.0.2", + "prop-types": "^15.5.6", + "react": "^15.5.3", + "react-dom": "^15.5.3", + "react-redux": "^5.0.4", "redux": "^3.6.0" }, "scripts": { diff --git a/examples/redux/src/index.js b/examples/redux/src/index.js index 785729bd..3c498da5 100644 --- a/examples/redux/src/index.js +++ b/examples/redux/src/index.js @@ -1,5 +1,3 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; import FarceActions from 'farce/lib/Actions'; import BrowserProtocol from 'farce/lib/BrowserProtocol'; import createHistoryEnhancer from 'farce/lib/createHistoryEnhancer'; @@ -12,6 +10,9 @@ import Matcher from 'found/lib/Matcher'; import resolveElements from 'found/lib/resolveElements'; import Redirect from 'found/lib/Redirect'; import Link from 'found/lib/Link'; +import PropTypes from 'prop-types'; +import React from 'react'; +import ReactDOM from 'react-dom'; import { Provider } from 'react-redux'; import { combineReducers, compose, createStore } from 'redux'; @@ -28,7 +29,7 @@ function LinkItem(props) { } const propTypes = { - children: React.PropTypes.node, + children: PropTypes.node, }; function App({ children }) { diff --git a/examples/transition-hook/package.json b/examples/transition-hook/package.json index 308961a7..69759b60 100644 --- a/examples/transition-hook/package.json +++ b/examples/transition-hook/package.json @@ -3,12 +3,13 @@ "version": "0.1.0", "private": true, "devDependencies": { - "react-scripts": "0.7.0" + "react-scripts": "0.9.5" }, "dependencies": { "found": "../..", - "react": "^15.3.2", - "react-dom": "^15.3.2" + "prop-types": "^15.5.6", + "react": "^15.5.3", + "react-dom": "^15.5.3" }, "scripts": { "start": "react-scripts start" diff --git a/examples/transition-hook/src/index.js b/examples/transition-hook/src/index.js index eeafe29f..4de19515 100644 --- a/examples/transition-hook/src/index.js +++ b/examples/transition-hook/src/index.js @@ -1,6 +1,7 @@ import createBrowserRouter from 'found/lib/createBrowserRouter'; import { routerShape } from 'found/lib/PropTypes'; import Link from 'found/lib/Link'; +import PropTypes from 'prop-types'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -17,7 +18,7 @@ function LinkItem(props) { } const appPropTypes = { - children: React.PropTypes.node, + children: PropTypes.node, }; function App({ children }) { diff --git a/examples/universal-redux/package.json b/examples/universal-redux/package.json index 5fd53502..6aa837ee 100644 --- a/examples/universal-redux/package.json +++ b/examples/universal-redux/package.json @@ -6,19 +6,20 @@ "start": "babel-node src/server" }, "dependencies": { - "babel-cli": "^6.23.0", - "babel-loader": "^6.3.0", - "babel-preset-latest": "^6.22.0", - "babel-preset-react": "^6.23.0", - "express": "^4.14.1", + "babel-cli": "^6.24.1", + "babel-loader": "^6.4.1", + "babel-preset-latest": "^6.24.1", + "babel-preset-react": "^6.24.1", + "express": "^4.15.2", "farce": "^0.2.1", "found": "../..", - "react": "^15.4.2", - "react-dom": "^15.4.2", - "react-redux": "^5.0.2", + "prop-types": "^15.5.6", + "react": "^15.5.3", + "react-dom": "^15.5.3", + "react-redux": "^5.0.4", "redux": "^3.6.0", "serialize-javascript": "^1.3.0", - "webpack": "^2.2.1", - "webpack-dev-middleware": "^1.10.0" + "webpack": "^2.3.3", + "webpack-dev-middleware": "^1.10.1" } } diff --git a/examples/universal-redux/src/App.js b/examples/universal-redux/src/App.js index 2a6cc53e..44225085 100644 --- a/examples/universal-redux/src/App.js +++ b/examples/universal-redux/src/App.js @@ -1,5 +1,6 @@ -import React from 'react'; import Link from 'found/lib/Link'; +import PropTypes from 'prop-types'; +import React from 'react'; function LinkItem(props) { // TODO: Remove the pragma once evcohen/eslint-plugin-jsx-a11y#81 ships. @@ -14,7 +15,7 @@ function LinkItem(props) { } const propTypes = { - children: React.PropTypes.node, + children: PropTypes.node, }; function App({ children }) { diff --git a/examples/universal/package.json b/examples/universal/package.json index 3d34ec3b..fcd0cbb8 100644 --- a/examples/universal/package.json +++ b/examples/universal/package.json @@ -6,15 +6,16 @@ "start": "babel-node src/server" }, "dependencies": { - "babel-cli": "^6.18.0", - "babel-loader": "^6.2.8", - "babel-preset-latest": "^6.16.0", - "babel-preset-react": "^6.16.0", - "express": "^4.14.0", + "babel-cli": "^6.24.1", + "babel-loader": "^6.4.1", + "babel-preset-latest": "^6.24.1", + "babel-preset-react": "^6.24.1", + "express": "^4.15.2", "found": "../..", - "react": "^15.4.1", - "react-dom": "^15.4.1", - "webpack": "^2.1.0-beta.27", - "webpack-dev-middleware": "^1.8.4" + "prop-types": "^15.5.6", + "react": "^15.5.3", + "react-dom": "^15.5.3", + "webpack": "^2.3.3", + "webpack-dev-middleware": "^1.10.1" } } diff --git a/examples/universal/src/routeConfig.js b/examples/universal/src/routeConfig.js index f7ea9952..7c7d58f0 100644 --- a/examples/universal/src/routeConfig.js +++ b/examples/universal/src/routeConfig.js @@ -2,6 +2,7 @@ import Link from 'found/lib/Link'; import makeRouteConfig from 'found/lib/jsx/makeRouteConfig'; import Redirect from 'found/lib/jsx/Redirect'; import Route from 'found/lib/jsx/Route'; +import PropTypes from 'prop-types'; import React from 'react'; function LinkItem(props) { @@ -17,7 +18,7 @@ function LinkItem(props) { } const propTypes = { - children: React.PropTypes.node, + children: PropTypes.node, }; function App({ children }) { @@ -82,5 +83,5 @@ export default makeRouteConfig( from="baz" to="/foo" /> - + , ); diff --git a/package.json b/package.json index d7aec747..41ee47a7 100644 --- a/package.json +++ b/package.json @@ -31,14 +31,15 @@ }, "homepage": "https://github.com/4Catalyzer/found#readme", "dependencies": { - "babel-runtime": "^6.18.0", + "babel-runtime": "^6.23.0", "farce": "^0.2.1", - "invariant": "^2.2.1", + "invariant": "^2.2.2", "is-promise": "^2.1.0", - "lodash": "^4.16.6", - "path-to-regexp": "^1.6.0", + "lodash": "^4.17.4", + "path-to-regexp": "^1.7.0", + "prop-types": "^15.5.6", "react-prop-types": "^0.4.0", - "react-redux": "^5.0.0-beta.3", + "react-redux": "^5.0.4", "react-static-container": "^1.0.1", "redux": "^3.6.0", "warning": "^3.0.0" @@ -47,25 +48,25 @@ "react": ">=0.14.0" }, "devDependencies": { - "babel-cli": "^6.18.0", - "babel-eslint": "^7.1.0", - "babel-jest": "^17.0.2", + "babel-cli": "^6.24.1", + "babel-eslint": "^7.2.1", + "babel-jest": "^19.0.0", "babel-plugin-add-module-exports": "^0.2.1", "babel-plugin-dev-expression": "^0.2.1", - "babel-plugin-transform-runtime": "^6.15.0", - "babel-preset-latest": "^6.16.0", - "babel-preset-react": "^6.16.0", - "babel-preset-stage-1": "^6.16.0", - "enzyme": "^2.6.0", - "eslint": "^3.9.1", - "eslint-config-4catalyzer-react": "^0.1.3", - "eslint-plugin-import": "^1.16.0", + "babel-plugin-transform-runtime": "^6.23.0", + "babel-preset-latest": "^6.24.1", + "babel-preset-react": "^6.24.1", + "babel-preset-stage-1": "^6.24.1", + "enzyme": "^2.8.0", + "eslint": "^3.19.0", + "eslint-config-4catalyzer-react": "^0.2.0", + "eslint-plugin-import": "^2.2.0", "eslint-plugin-jsx-a11y": "^2.2.3", - "eslint-plugin-react": "^6.5.0", - "jest": "^17.0.3", - "react": "^15.4.1", - "react-addons-test-utils": "^15.4.1", - "react-dom": "^15.4.1", - "rimraf": "^2.5.4" + "eslint-plugin-react": "^6.10.3", + "jest": "^19.0.2", + "react": "^15.5.3", + "react-addons-test-utils": "^15.5.1", + "react-dom": "^15.5.3", + "rimraf": "^2.6.1" } } diff --git a/src/BaseLink.js b/src/BaseLink.js index 001c5a3e..f94ce5dc 100644 --- a/src/BaseLink.js +++ b/src/BaseLink.js @@ -1,3 +1,4 @@ +import PropTypes from 'prop-types'; import React from 'react'; import elementType from 'react-prop-types/lib/elementType'; @@ -5,19 +6,19 @@ import { routerShape } from './PropTypes'; const propTypes = { Component: elementType.isRequired, - to: React.PropTypes.oneOfType([ - React.PropTypes.string, - React.PropTypes.object, + to: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.object, ]), - match: React.PropTypes.object.isRequired, - activeClassName: React.PropTypes.string, - activeStyle: React.PropTypes.object, - activePropName: React.PropTypes.string, + match: PropTypes.object.isRequired, + activeClassName: PropTypes.string, + activeStyle: PropTypes.object, + activePropName: PropTypes.string, router: routerShape.isRequired, - exact: React.PropTypes.bool.isRequired, - target: React.PropTypes.string, - onClick: React.PropTypes.func, - childProps: React.PropTypes.object, // In case of name conflicts here. + exact: PropTypes.bool.isRequired, + target: PropTypes.string, + onClick: PropTypes.func, + childProps: PropTypes.object, // In case of name conflicts here. }; const defaultProps = { diff --git a/src/ElementsRenderer.js b/src/ElementsRenderer.js index 2a5ebdfe..07b9b8f0 100644 --- a/src/ElementsRenderer.js +++ b/src/ElementsRenderer.js @@ -1,8 +1,9 @@ +import PropTypes from 'prop-types'; import React from 'react'; const propTypes = { - elements: React.PropTypes.arrayOf( - React.PropTypes.element, + elements: PropTypes.arrayOf( + PropTypes.element, ).isRequired, }; diff --git a/src/PropTypes.js b/src/PropTypes.js index a981eef2..05a7e74e 100644 --- a/src/PropTypes.js +++ b/src/PropTypes.js @@ -1,34 +1,34 @@ -import React from 'react'; +import PropTypes from 'prop-types'; // The shape might be different with a custom matcher or history enhancer, but // the default matcher assumes and provides this shape. As such, this validator // is purely for user convenience and should not be used internally. -export const matchShape = React.PropTypes.shape({ - location: React.PropTypes.shape({ - pathname: React.PropTypes.string.isRequired, - query: React.PropTypes.object.isRequired, +export const matchShape = PropTypes.shape({ + location: PropTypes.shape({ + pathname: PropTypes.string.isRequired, + query: PropTypes.object.isRequired, }).isRequired, - params: React.PropTypes.object.isRequired, + params: PropTypes.object.isRequired, }); // User code generally shouldn't need this, but it doesn't hurt to export here, // since we use it for routerShape below. -export const matcherShape = React.PropTypes.shape({ - match: React.PropTypes.func.isRequired, - getRoutes: React.PropTypes.func.isRequired, - isActive: React.PropTypes.func.isRequired, - format: React.PropTypes.func.isRequired, +export const matcherShape = PropTypes.shape({ + match: PropTypes.func.isRequired, + getRoutes: PropTypes.func.isRequired, + isActive: PropTypes.func.isRequired, + format: PropTypes.func.isRequired, }); -export const routerShape = React.PropTypes.shape({ - push: React.PropTypes.func.isRequired, - replace: React.PropTypes.func.isRequired, - go: React.PropTypes.func.isRequired, +export const routerShape = PropTypes.shape({ + push: PropTypes.func.isRequired, + replace: PropTypes.func.isRequired, + go: PropTypes.func.isRequired, - createHref: React.PropTypes.func.isRequired, - createLocation: React.PropTypes.func.isRequired, - isActive: React.PropTypes.func.isRequired, + createHref: PropTypes.func.isRequired, + createLocation: PropTypes.func.isRequired, + isActive: PropTypes.func.isRequired, matcher: matcherShape.isRequired, - addTransitionHook: React.PropTypes.func.isRequired, + addTransitionHook: PropTypes.func.isRequired, }); diff --git a/src/createBaseRouter.js b/src/createBaseRouter.js index f584901d..a91d2dd2 100644 --- a/src/createBaseRouter.js +++ b/src/createBaseRouter.js @@ -1,4 +1,5 @@ import isEqual from 'lodash/isEqual'; +import PropTypes from 'prop-types'; import React from 'react'; import StaticContainer from 'react-static-container'; import warning from 'warning'; @@ -9,13 +10,13 @@ import resolveRenderArgs from './utils/resolveRenderArgs'; export default function createBaseRouter({ render }) { const propTypes = { - match: React.PropTypes.object.isRequired, - resolvedMatch: React.PropTypes.object.isRequired, - matchContext: React.PropTypes.any, - resolveElements: React.PropTypes.func.isRequired, + match: PropTypes.object.isRequired, + resolvedMatch: PropTypes.object.isRequired, + matchContext: PropTypes.any, + resolveElements: PropTypes.func.isRequired, router: routerShape.isRequired, - onResolveMatch: React.PropTypes.func.isRequired, - initialRenderArgs: React.PropTypes.object, + onResolveMatch: PropTypes.func.isRequired, + initialRenderArgs: PropTypes.object, }; const childContextTypes = { diff --git a/src/server/RouterProvider.js b/src/server/RouterProvider.js index e5e05dc4..2f39434c 100644 --- a/src/server/RouterProvider.js +++ b/src/server/RouterProvider.js @@ -1,10 +1,11 @@ +import PropTypes from 'prop-types'; import React from 'react'; import { routerShape } from '../PropTypes'; const propTypes = { router: routerShape.isRequired, - children: React.PropTypes.element.isRequired, + children: PropTypes.element.isRequired, }; const childContextTypes = { diff --git a/test/BaseLink.test.js b/test/BaseLink.test.js index 3de11ac8..b7b86930 100644 --- a/test/BaseLink.test.js +++ b/test/BaseLink.test.js @@ -31,7 +31,7 @@ describe('', () => { + />, ); expect(link.find('a')).toHaveLength(1); @@ -43,7 +43,7 @@ describe('', () => { match={{}} router={router} Component={CustomComponent} - /> + />, ); expect(link.find('a')).toHaveLength(0); @@ -58,7 +58,7 @@ describe('', () => { match={{}} router={router} onClick={handleClick} - /> + />, ); link.find('a').simulate('click'); @@ -71,7 +71,7 @@ describe('', () => { to="/path-to-another-page" match={{}} router={router} - /> + />, ); link.find('a').simulate('click', { button: 0 }); @@ -84,7 +84,7 @@ describe('', () => { match={{}} router={router} onClick={(event) => { event.preventDefault(); }} - /> + />, ); link.find('a').simulate('click', { button: 0 }); @@ -96,7 +96,7 @@ describe('', () => { + />, ); const a = link.find('a'); @@ -119,7 +119,7 @@ describe('', () => { + />, ); link.find('a').simulate('click', { button: 2 }); @@ -132,7 +132,7 @@ describe('', () => { match={{}} router={router} target="_blank" - /> + />, ); link.find('a').simulate('click', { button: 0 }); @@ -146,7 +146,7 @@ describe('', () => { + />, ); expect(router.isActive).not.toBeCalled(); @@ -159,7 +159,7 @@ describe('', () => { match={{}} router={router} activeClassName="active" - /> + />, ); expect(link.find('a').prop('className')).toMatch(/active/); @@ -172,7 +172,7 @@ describe('', () => { match={{}} router={router} activeStyle={{ color: '#fff' }} - /> + />, ); expect(link.find('a').prop('style').color).toBe('#fff'); @@ -186,7 +186,7 @@ describe('', () => { router={router} Component={CustomComponent} activePropName="active" - /> + />, ); expect(link.find(CustomComponent).prop('active')).toBe(true); @@ -200,7 +200,7 @@ describe('', () => { router={router} Component={CustomComponent} activePropName="active" - /> + />, ); expect(link.find(CustomComponent).prop('active')).toBe(false); diff --git a/test/ElementsRenderer.test.js b/test/ElementsRenderer.test.js index 4e1d1209..6f6222e2 100644 --- a/test/ElementsRenderer.test.js +++ b/test/ElementsRenderer.test.js @@ -1,4 +1,5 @@ import { mount } from 'enzyme'; +import PropTypes from 'prop-types'; import React from 'react'; import ElementsRenderer from '../src/ElementsRenderer'; @@ -7,7 +8,7 @@ describe('', () => { it('should render null when no item in elements', () => { const elements = []; const wrapper = mount( - + , ); expect(wrapper.html()).toBe(null); }); @@ -15,20 +16,20 @@ describe('', () => { it('should render element', () => { const elements = [
]; const wrapper = mount( - + , ); expect(wrapper.find('div')).toHaveLength(1); }); it('should render elements with nested structure', () => { const Parent = ({ children }) =>
{children}
; - Parent.propTypes = { children: React.PropTypes.element }; + Parent.propTypes = { children: PropTypes.element }; const Child = () =>
; const elements = [, ]; const wrapper = mount( - + , ); const parent = wrapper.find(Parent); diff --git a/test/jsx/Redirect.test.js b/test/jsx/Redirect.test.js index af6dc7d5..97361642 100644 --- a/test/jsx/Redirect.test.js +++ b/test/jsx/Redirect.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import { renderIntoDocument } from 'react-addons-test-utils'; +import { renderIntoDocument } from 'react-dom/test-utils'; import Redirect from '../../src/jsx/Redirect'; import RedirectObject from '../../src/Redirect'; @@ -14,7 +14,7 @@ describe('', () => { it('should throw when endered', () => { expect( - () => renderIntoDocument() + () => renderIntoDocument(), ).toThrowError(/should not be rendered/); }); }); diff --git a/test/jsx/Route.test.js b/test/jsx/Route.test.js index 78b7cf93..6d28389e 100644 --- a/test/jsx/Route.test.js +++ b/test/jsx/Route.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import { renderIntoDocument } from 'react-addons-test-utils'; +import { renderIntoDocument } from 'react-dom/test-utils'; import Route from '../../src/jsx/Route'; @@ -18,7 +18,7 @@ describe('', () => { it('should throw when rendered', () => { expect( - () => renderIntoDocument() + () => renderIntoDocument(), ).toThrowError(/should not be rendered/); }); }); diff --git a/test/server/RouterProvider.test.js b/test/server/RouterProvider.test.js index 881ea6ad..f85a03bc 100644 --- a/test/server/RouterProvider.test.js +++ b/test/server/RouterProvider.test.js @@ -27,7 +27,7 @@ describe('', () => { wrapper = mount(
- + , ); expect(wrapper.find('div')).toHaveLength(1); @@ -35,7 +35,7 @@ describe('', () => { wrapper = mount( - + , ); expect(wrapper.find(CustomCompoment)).toHaveLength(1); }); @@ -56,7 +56,7 @@ describe('', () => { mount( - + , ); expect(routerInContext).toBeDefined(); });