Pass router via context in component tests

modules/__tests__/MatchWithRoutes-test.js

@@ -2,6 +2,7 @@
 import MatchWithRoutes from '../MatchWithRoutes'
 import React from 'react'
 import renderer from 'react-test-renderer'
+import { MemoryRouter as Router } from 'react-router'
 
 test('passes routes in as a prop', () => {
   const location = { pathname: '/foo' }
@@ -14,7 +15,11 @@ test('passes routes in as a prop', () => {
       <div>{routes[0].pattern}</div>
     )
   }
-  const el = <MatchWithRoutes location={location} {...route} />
+  const el = (
+    <Router initialEntries={[location]}>
+      <MatchWithRoutes {...route} />
+    </Router>
+  )
   const tree = renderer.create(el).toJSON()
   expect(tree.children[0]).toBe(route.routes[0].pattern)
 })

modules/__tests__/NamedLink-test.js

@@ -3,6 +3,7 @@ import NamedLink from '../NamedLink'
 import RoutesProvider from '../RoutesProvider'
 import React from 'react'
 import renderer from 'react-test-renderer'
+import { MemoryRouter as Router } from 'react-router'
 
 const location = { pathname: '/foo' }
 
@@ -23,29 +24,35 @@ const routes = [
 
 test('renders correct href for a root route', () => {
   const el = (
-    <RoutesProvider routes={routes}>
-      <NamedLink to="parent" location={location} />
-    </RoutesProvider>
+    <Router initialEntries={[location]}>
+      <RoutesProvider routes={routes}>
+        <NamedLink to="parent" />
+      </RoutesProvider>
+    </Router>
   )
   const tree = renderer.create(el).toJSON()
   expect(tree.props.href).toBe('/')
 })
 
 test('renders correct href for a nested route', () => {
   const el = (
-    <RoutesProvider routes={routes}>
-      <NamedLink to="child1" location={location} />
-    </RoutesProvider>
+    <Router initialEntries={[location]}>
+      <RoutesProvider routes={routes}>
+        <NamedLink to="child1" />
+      </RoutesProvider>
+    </Router>
   )
   const tree = renderer.create(el).toJSON()
   expect(tree.props.href).toBe('/child1')
 })
 
 test('renders correct href for a nested route with params', () => {
   const el = (
-    <RoutesProvider routes={routes}>
-      <NamedLink to="child2" params={{ id: 'test' }} location={location} />
-    </RoutesProvider>
+    <Router initialEntries={[location]}>
+      <RoutesProvider routes={routes}>
+        <NamedLink to="child2" params={{ id: 'test' }} />
+      </RoutesProvider>
+    </Router>
   )
   const tree = renderer.create(el).toJSON()
   expect(tree.props.href).toBe('/child2/test')