react-router-redux/createMatchSelector: handle null case when router state is not yet initialized (#5653)

* react-router-redux/createMatchSelector: handle null case when router state is not yet initialized

* react-router-redux/createMatchSelector: test coverage for 4a826fa

* tests/createMatchSelector: fixed assertion in test

* Made test assertion a little more useful/semantic

Author: Brendan Stromberger

packages/react-router-redux/modules/__tests__/selectors-test.js

@@ -25,7 +25,7 @@ describe('selectors', () => {
   })
 
   describe('createMatchSelector', () => {
-    it('matches correctly', () => {
+    it('matches correctly if the router is initialized', () => {
       const matchSelector = createMatchSelector('/')
       store.dispatch({
         type: LOCATION_CHANGE,
@@ -39,6 +39,12 @@ describe('selectors', () => {
         url: '/'
       })
     })
+    
+    it('does not throw error if router has not yet initialized', () => {
+      const matchSelector = createMatchSelector('/')
+      const state = store.getState()
+      expect(() => matchSelector(state)).not.toThrow()
+    })
 
     it('does not update if the match is the same', () => {
       const matchSelector = createMatchSelector('/')

packages/react-router-redux/modules/selectors.js

@@ -6,7 +6,7 @@ export const createMatchSelector = (path) => {
   let lastPathname = null
   let lastMatch = null
   return (state) => {
-    const { pathname } = getLocation(state)
+    const { pathname } = getLocation(state) || {}
     if (pathname === lastPathname) {
       return lastMatch
     }