Merge pull request #2428 from taion/matching-test

Add more route matching tests

Author: knowbody

modules/__tests__/isActive-test.js

@@ -122,6 +122,24 @@ describe('isActive', function () {
     })
   })
 
+  describe('a pathname that matches a nested absolute path', function () {
+    describe('with no query', function () {
+      it('is active', function (done) {
+        render((
+          <Router history={createHistory('/absolute')}>
+            <Route path="/home">
+              <Route path="/absolute" />
+            </Route>
+          </Router>
+        ), node, function () {
+          expect(this.history.isActive('/absolute')).toBe(true)
+          expect(this.history.isActive('/absolute', null, true)).toBe(true)
+          done()
+        })
+      })
+    })
+  })
+
   describe('a pathname that matches an index URL', function () {
     describe('with no query', function () {
       it('is active', function (done) {

modules/__tests__/matchRoutes-test.js

@@ -7,20 +7,28 @@ import Route from '../Route'
 
 describe('matchRoutes', function () {
 
-  let routes, RootRoute, UsersRoute, UsersIndexRoute, UserRoute, PostRoute, FilesRoute, AboutRoute, TeamRoute, ProfileRoute, GreedyRoute, CatchAllRoute
+  let routes
+  let
+    RootRoute, UsersRoute, UsersIndexRoute, UserRoute, PostRoute, FilesRoute,
+    AboutRoute, TeamRoute, ProfileRoute, GreedyRoute, OptionalRoute,
+    OptionalRouteChild, CatchAllRoute
   let createLocation = createMemoryHistory().createLocation
+
   beforeEach(function () {
     /*
     <Route>
       <Route path="users">
-        <Index />
+        <IndexRoute />
         <Route path=":userID">
           <Route path="/profile" />
         </Route>
         <Route path="/team" />
       </Route>
     </Route>
     <Route path="/about" />
+    <Route path="/(optional)">
+      <Route path="child" />
+    </Route>
     <Route path="*" />
     */
     routes = [
@@ -57,6 +65,14 @@ describe('matchRoutes', function () {
       GreedyRoute = {
         path: '/**/f'
       },
+      OptionalRoute = {
+        path: '/(optional)',
+        childRoutes: [
+          OptionalRouteChild = {
+            path: 'child'
+          }
+        ]
+      },
       CatchAllRoute = {
         path: '*'
       }
@@ -149,6 +165,42 @@ describe('matchRoutes', function () {
       })
     })
 
+    describe('when the location matches an optional route', function () {
+      it('matches when the optional pattern is missing', function (done) {
+        matchRoutes(routes, createLocation('/'), function (error, match) {
+          expect(match).toExist()
+          expect(match.routes).toEqual([ OptionalRoute ])
+          done()
+        })
+      })
+
+      it('matches when the optional pattern is present', function (done) {
+        matchRoutes(routes, createLocation('/optional'), function (error, match) {
+          expect(match).toExist()
+          expect(match.routes).toEqual([ OptionalRoute ])
+          done()
+        })
+      })
+    })
+
+    describe('when the location matches the child of an optional route', function () {
+      it('matches when the optional pattern is missing', function (done) {
+        matchRoutes(routes, createLocation('/child'), function (error, match) {
+          expect(match).toExist()
+          expect(match.routes).toEqual([ OptionalRoute, OptionalRouteChild ])
+          done()
+        })
+      })
+
+      it('matches when the optional pattern is present', function (done) {
+        matchRoutes(routes, createLocation('/optional/child'), function (error, match) {
+          expect(match).toExist()
+          expect(match.routes).toEqual([ OptionalRoute, OptionalRouteChild ])
+          done()
+        })
+      })
+    })
+
     describe('when the location does not match any routes', function () {
       it('matches the "catch-all" route', function (done) {
         matchRoutes(routes, createLocation('/not-found'), function (error, match) {
@@ -157,6 +209,22 @@ describe('matchRoutes', function () {
           done()
         })
       })
+
+      it('matches the "catch-all" route on a deep miss', function (done) {
+        matchRoutes(routes, createLocation('/not-found/foo'), function (error, match) {
+          expect(match).toExist()
+          expect(match.routes).toEqual([ CatchAllRoute ])
+          done()
+        })
+      })
+
+      it('matches the "catch-all" route on missing path separators', function (done) {
+        matchRoutes(routes, createLocation('/optionalchild'), function (error, match) {
+          expect(match).toExist()
+          expect(match.routes).toEqual([ CatchAllRoute ])
+          done()
+        })
+      })
     })
   }