Merge pull request #2813 from rackt/match-history

Add passing custom histories to match

modules/__tests__/serverRendering-test.js

@@ -1,7 +1,8 @@
-import expect from 'expect'
+import expect, { spyOn } from 'expect'
 import React, { Component } from 'react'
 import { renderToString } from 'react-dom/server'
 import match from '../match'
+import createMemoryHistory from '../createMemoryHistory'
 import RouterContext from '../RouterContext'
 import Link from '../Link'
 
@@ -75,6 +76,21 @@ describe('server rendering', function () {
     })
   })
 
+  it('accepts a custom history', function (done) {
+    const history = createMemoryHistory()
+    const spy = spyOn(history, 'createLocation').andCallThrough()
+
+    match({ history, routes, location: '/dashboard' }, function (error, redirectLocation, renderProps) {
+      const string = renderToString(
+        <RouterContext {...renderProps} />
+      )
+      expect(string).toMatch(/The Dashboard/)
+      expect(spy).toHaveBeenCalled()
+      done()
+    })
+  })
+
+
   it('renders active Links as active', function (done) {
     match({ routes, location: '/about' }, function (error, redirectLocation, renderProps) {
       const string = renderToString(

modules/match.js

@@ -14,13 +14,13 @@ import { createRouterObject, createRoutingHistory } from './RouterUtils'
  * Note: You probably don't want to use this in a browser. Use
  * the history.listen API instead.
  */
-function match({ routes, location, ...options }, callback) {
+function match({ history, routes, location, ...options }, callback) {
   invariant(
     location,
     'match needs a location'
   )
 
-  let history = createMemoryHistory(options)
+  history = history ? history : createMemoryHistory(options)
   const transitionManager = createTransitionManager(
     history,
     createRoutes(routes)