Fix issues after cherry-picking withRouter() to the next branch

Author: gaearon

modules/__tests__/withRouter-test.js

@@ -4,20 +4,21 @@ import { render, unmountComponentAtNode } from 'react-dom'
 import createHistory from '../createMemoryHistory'
 import Route from '../Route'
 import Router from '../Router'
-import routerShape from '../PropTypes'
+import { routerShape } from '../PropTypes'
 import withRouter from '../withRouter'
 
 describe('withRouter', function () {
   class App extends Component {
-    propTypes: {
-      router: routerShape.isRequired
-    }
     render() {
       expect(this.props.router).toExist()
       return <h1>App</h1>
     }
   }
 
+  App.propTypes = {
+    router: routerShape.isRequired
+  }
+
   let node
   beforeEach(function () {
     node = document.createElement('div')