Fix failing tests

Author: mjackson

modules/components/__tests__/DefaultRoute-test.js

@@ -65,17 +65,19 @@ describe('A DefaultRoute', function () {
 describe('when no child routes match a URL, but the parent\'s path matches', function () {
 
   var component, rootRoute, defaultRoute;
-  beforeEach(function () {
+  beforeEach(function (done) {
     component = ReactTestUtils.renderIntoDocument(
-      Routes({ location: 'none', initialPath: '/users/5' },
+      Routes({ location: 'none' },
         rootRoute = Route({ name: 'user', path: '/users/:id', handler: NullHandler },
           Route({ name: 'home', path: '/users/:id/home', handler: NullHandler }),
           // Make it the middle sibling to test order independence.
           defaultRoute = DefaultRoute({ handler: NullHandler }),
           Route({ name: 'news', path: '/users/:id/news', handler: NullHandler })
         )
       )
-    )
+    );
+
+    component.dispatch('/users/5', done);
   });
 
   afterEach(function () {

modules/components/__tests__/Link-test.js

@@ -19,12 +19,14 @@ describe('A Link', function () {
     });
 
     var component;
-    beforeEach(function () {
+    beforeEach(function (done) {
       component = ReactTestUtils.renderIntoDocument(
-        Routes({ location: 'none', initialPath: '/mjackson/home' },
+        Routes({ location: 'none' },
           Route({ name: 'home', path: '/:username/home', handler: HomeHandler })
         )
       );
+
+      component.dispatch('/mjackson/home', done);
     });
 
     afterEach(function () {
@@ -45,12 +47,14 @@ describe('A Link', function () {
     });
 
     var component;
-    beforeEach(function () {
+    beforeEach(function (done) {
       component = ReactTestUtils.renderIntoDocument(
-        Routes({ location: 'none', initialPath: '/' },
+        Routes({ location: 'none' },
           DefaultRoute({ name: 'home', handler: HomeHandler })
         )
       );
+
+      component.dispatch('/', done);
     });
 
     afterEach(function () {

modules/components/__tests__/NotFoundRoute-test.js

@@ -63,17 +63,19 @@ describe('A NotFoundRoute', function () {
 describe('when no child routes match a URL, but the beginning of the parent\'s path matches', function () {
 
   var component, rootRoute, notFoundRoute;
-  beforeEach(function () {
+  beforeEach(function (done) {
     component = ReactTestUtils.renderIntoDocument(
-      Routes({ location: 'none', initialPath: '/users/5' },
+      Routes({ location: 'none' },
         rootRoute = Route({ name: 'user', path: '/users/:id', handler: NullHandler },
           Route({ name: 'home', path: '/users/:id/home', handler: NullHandler }),
           // Make it the middle sibling to test order independence.
           notFoundRoute = NotFoundRoute({ handler: NullHandler }),
           Route({ name: 'news', path: '/users/:id/news', handler: NullHandler })
         )
       )
-    )
+    );
+
+    component.dispatch('/users/5', done);
   });
 
   afterEach(function () {

modules/mixins/__tests__/Navigation-test.js

@@ -20,12 +20,14 @@ describe('Navigation', function () {
   describe('makePath', function () {
     describe('when there is a route with the given name', function () {
       var component;
-      beforeEach(function () {
+      beforeEach(function (done) {
         component = ReactTestUtils.renderIntoDocument(
-          Routes({ initialPath: '/anybody/home' }, 
+          Routes({ location: 'none' }, 
             Route({ name: 'home', path: '/:username/home', handler: NavigationHandler })
           )
         );
+
+        component.dispatch('/anybody/home', done);
       });
 
       afterEach(function () {
@@ -41,12 +43,14 @@ describe('Navigation', function () {
 
     describe('when there is no route with the given name', function () {
       var component;
-      beforeEach(function () {
+      beforeEach(function (done) {
         component = ReactTestUtils.renderIntoDocument(
-          Routes({ initialPath: '/home' },
+          Routes({ location: 'none' },
             Route({ name: 'home', handler: NavigationHandler })
           )
         );
+
+        component.dispatch('/home', done);
       });
 
       afterEach(function () {
@@ -67,12 +71,14 @@ describe('Navigation', function () {
   describe('makeHref', function () {
     describe('when using "hash" location', function () {
       var component;
-      beforeEach(function () {
+      beforeEach(function (done) {
         component = ReactTestUtils.renderIntoDocument(
-          Routes({ location: 'hash', initialPath: '/home' }, 
+          Routes({ location: 'hash' }, 
             Route({ name: 'home', handler: NavigationHandler })
           )
         );
+
+        component.dispatch('/home', done);
       });
 
       afterEach(function () {
@@ -88,12 +94,14 @@ describe('Navigation', function () {
 
     describe('when using "history" location', function () {
       var component;
-      beforeEach(function () {
+      beforeEach(function (done) {
         component = ReactTestUtils.renderIntoDocument(
-          Routes({ location: 'history', initialPath: '/home' }, 
+          Routes({ location: 'history' }, 
             Route({ name: 'home', handler: NavigationHandler })
           )
         );
+
+        component.dispatch('/home', done);
       });
 
       afterEach(function () {