Clean up tests

Author: mjackson

modules/stores/RouteStore.js

@@ -14,7 +14,28 @@ var _namedRoutes = {};
 var RouteStore = {
 
   /**
-   * Registers a <Route> and all of its children with the RouteStore. Also,
+   * Removes all references to <Route>s from the store. Should only ever
+   * really be used in tests to clear the store between test runs.
+   */
+  unregisterAllRoutes: function () {
+    _namedRoutes = {};
+  },
+
+  /**
+   * Removes the reference to the given <Route> and all of its children
+   * from the store.
+   */
+  unregisterRoute: function (route) {
+    if (route.props.name)
+      delete _namedRoutes[route.props.name];
+
+    React.Children.forEach(route.props.children, function (child) {
+      RouteStore.unregisterRoute(route);
+    });
+  },
+
+  /**
+   * Registers a <Route> and all of its children with the store. Also,
    * does some normalization and validation on route props.
    */
   registerRoute: function (route, _parentRoute) {
@@ -64,19 +85,6 @@ var RouteStore = {
     });
   },
 
-  /**
-   * Removes the reference to the given <Route> and all of its children from
-   * the RouteStore.
-   */
-  unregisterRoute: function (route) {
-    if (route.props.name)
-      delete _namedRoutes[route.props.name];
-
-    React.Children.forEach(route.props.children, function (child) {
-      RouteStore.unregisterRoute(route);
-    });
-  },
-
   /**
    * Returns the Route object with the given name, if one exists.
    */

specs/AsyncState.spec.js

@@ -31,7 +31,7 @@ describe('AsyncState', function () {
         }
       });
 
-      var user = TestUtils.renderIntoDocument(
+      var user = ReactTestUtils.renderIntoDocument(
         User()
       );
 

specs/Route.spec.js

@@ -9,9 +9,9 @@ var App = React.createClass({
   }
 });
 
-describe('a Route that matches the URL', function () {
+describe('a Route that matches a URL', function () {
   it('returns an array', function () {
-    var routes = TestUtils.renderIntoDocument(
+    var routes = renderComponent(
       Routes(null,
         Route({ handler: App },
           Route({ path: '/a/b/c', handler: App })
@@ -25,11 +25,13 @@ describe('a Route that matches the URL', function () {
 
     var rootMatch = getRootMatch(matches);
     expect(rootMatch.params).toEqual({});
+
+    removeComponent(routes);
   });
 
   describe('that contains dynamic segments', function () {
     it('returns an array with the correct params', function () {
-      var routes = TestUtils.renderIntoDocument(
+      var routes = renderComponent(
         Routes(null,
           Route({ handler: App },
             Route({ path: '/posts/:id/edit', handler: App })
@@ -43,13 +45,15 @@ describe('a Route that matches the URL', function () {
 
       var rootMatch = getRootMatch(matches);
       expect(rootMatch.params).toEqual({ id: 'abc' });
+
+      removeComponent(routes);
     });
   });
 });
 
 describe('a Route that does not match the URL', function () {
   it('returns null', function () {
-    var routes = TestUtils.renderIntoDocument(
+    var routes = renderComponent(
       Routes(null,
         Route({ handler: App },
           Route({ path: '/a/b/c', handler: App })
@@ -58,12 +62,14 @@ describe('a Route that does not match the URL', function () {
     );
 
     expect(routes.match('/not-found')).toBe(null);
+
+    removeComponent(routes);
   });
 });
 
 describe('a nested Route that matches the URL', function () {
   it('returns the appropriate params for each match', function () {
-    var routes = TestUtils.renderIntoDocument(
+    var routes = renderComponent(
       Routes(null,
         Route({ handler: App },
           Route({ name: 'posts', path: '/posts/:id', handler: App },
@@ -84,12 +90,14 @@ describe('a nested Route that matches the URL', function () {
     var postsMatch = matches[1];
     expect(postsMatch.route.props.name).toEqual('posts');
     expect(postsMatch.params).toEqual({ id: 'abc' });
+
+    removeComponent(routes);
   });
 });
 
 describe('multiple nested Router that match the URL', function () {
   it('returns the first one in the subtree, depth-first', function () {
-    var routes = TestUtils.renderIntoDocument(
+    var routes = renderComponent(
       Routes(null,
         Route({ handler: App },
           Route({ path: '/a', handler: App },
@@ -106,52 +114,8 @@ describe('multiple nested Router that match the URL', function () {
 
     var rootMatch = getRootMatch(matches);
     expect(rootMatch.route.props.name).toEqual('expected');
-  });
-});
-
-describe('a route handler', function () {
-  it('may not receive children', function (done) {
-    var InvalidHandler = React.createClass({
-      displayName: 'InvalidHandler',
-      render: function () {
-        try {
-          var result = this.props.activeRouteHandler({}, React.DOM.div());
-          assert(false, 'activeRouteHandler rendered with children');
-          return result;
-        } catch (error) {
-          assert(error);
-        }
-
-        done();
-      }
-    });
-
-    var routes = TestUtils.renderIntoDocument(
-      Routes(null,
-        Route({ handler: InvalidHandler },
-          Route({ path: '/home', handler: App })
-        )
-      )
-    );
-
-    routes.dispatch('/home');
-  });
-});
-
-describe('a Route', function() {
-  it('requires a handler');
-});
-
-describe('a child route', function() {
-  describe('path', function() {
-    it('defaults to /');
-    it('is not required to start with /');
-    it('can be inferred from its name');
-    it('must contain all dynamic segments of its parent route path');
-  });
 
-  describe('name', function() {
-    it('cannot be reused');
+    removeComponent(routes);
   });
 });
 

specs/RouteStore.spec.js

@@ -22,10 +22,6 @@ describe('when a route is looked up by name', function () {
     RouteStore.registerRoute(route);
   });
 
-  afterEach(function () {
-    RouteStore.unregisterRoute(route);
-  });
-
   it('returns that route', function () {
     expect(RouteStore.getRouteByName('products')).toEqual(route);
   });
@@ -58,6 +54,18 @@ describe('when registering a route', function () {
     });
   });
 
+  describe('with the same name as another route', function () {
+    beforeEach(function () {
+      RouteStore.registerRoute(Route({ name: 'users', handler: App }));
+    });
+
+    it('throws an error', function () {
+      expect(function () {
+        RouteStore.registerRoute(Route({ name: 'users', handler: App }));
+      }).toThrow(Error);
+    });
+  });
+
   describe('that is missing a parameter its parent route needs', function () {
     it('throws an error', function () {
       expect(function () {

specs/helper.js

@@ -1,9 +1,32 @@
 assert = require('assert');
 expect = require('expect');
+React = require('react/addons');
+ReactTestUtils = React.addons.TestUtils;
 
 refute = function (condition, message) {
   assert(!condition, message);
 };
 
-React = require('react/addons');
-TestUtils = React.addons.TestUtils;
+var RouteStore = require('../modules/stores/RouteStore');
+
+beforeEach(function () {
+  RouteStore.unregisterAllRoutes();
+});
+
+var ExecutionEnvironment = require('react/lib/ExecutionEnvironment');
+
+// TODO: Use this as a guard for tests that require DOM.
+__DOM__ = ExecutionEnvironment.canUseDOM;
+
+if (__DOM__) {
+  var ROOT_NODE = document.createElement('div');
+  document.body.appendChild(ROOT_NODE);
+
+  renderComponent = function (component) {
+    return React.renderComponent(component, ROOT_NODE);
+  };
+
+  removeComponent = function (component) {
+    React.unmountComponentAtNode(ROOT_NODE);
+  };
+}

specs/main.js

@@ -6,4 +6,3 @@ require('./Path.spec.js');
 require('./Route.spec.js');
 require('./RouteStore.spec.js');
 require('./URLStore.spec.js');
-