Fix more specs

Author: mjackson

modules/stores/URLStore.js

@@ -1,7 +1,6 @@
+var ExecutionEnvironment = require('react/lib/ExecutionEnvironment');
 var invariant = require('react/lib/invariant');
 var warning = require('react/lib/warning');
-var ExecutionEnvironment = require('react/lib/ExecutionEnvironment');
-var normalizePath = require('../helpers/Path').normalize;
 
 var CHANGE_EVENTS = {
   hash: 'hashchange',
@@ -61,7 +60,7 @@ var URLStore = {
       window.location.hash = path;
     } else {
       _lastPath = _currentPath;
-      _currentPath = normalizePath(path);
+      _currentPath = path;
       notifyChange();
     }
   },
@@ -77,7 +76,7 @@ var URLStore = {
     } else if (_location === 'hash') {
       window.location.replace(getWindowPath() + '#' + path);
     } else {
-      _currentPath = normalizePath(path);
+      _currentPath = path;
       notifyChange();
     }
   },

specs/Route.spec.js

@@ -1,6 +1,5 @@
 require('./helper');
-var Route = require('../modules/Route');
-var RouteComponent = require('../modules/components/Route');
+var Route = require('../modules/components/Route');
 
 var App = React.createClass({
   displayName: 'App',
@@ -9,53 +8,129 @@ var App = React.createClass({
   }
 });
 
-describe('a Route with a named handler', function () {
-  var route;
-  beforeEach(function () {
-    route = new Route({ handler: App });
-  });
+describe('a Route that matches the URL', function () {
+  it('returns an array', function () {
+    var route = Route({ path: '/a/b/c', handler: App });
+
+    var matches = route.match('/a/b/c');
+    assert(matches);
+    expect(matches.length).toEqual(1);
 
-  it('has the correct displayName', function () {
-    expect(route.displayName).toEqual('AppRoute');
+    var rootMatch = getRootMatch(matches);
+    expect(rootMatch.params).toEqual({});
   });
 
-  it('has the correct toString representation', function () {
-    expect(route + '').toEqual('<AppRoute>');
+  describe('that contains dynamic segments', function () {
+    it('returns an array with the correct params', function () {
+      var route = Route({ path: '/posts/:id/edit', handler: App });
+
+      var matches = route.match('/posts/abc/edit');
+      assert(matches);
+      expect(matches.length).toEqual(1);
+
+      var rootMatch = getRootMatch(matches);
+      expect(rootMatch.params).toEqual({ id: 'abc' });
+    });
   });
 });
 
-describe('a Route without a handler component', function () {
-  it('throws an Error', function () {
-    expect(function () {
-      new Route({ handler: null });
-    }).toThrow(Error);
+describe('a Route that does not match the URL', function () {
+  it('returns null', function () {
+    var route = Route({ path: '/a/b/c', handler: App });
+    expect(route.match('/not-found')).toBe(null);
   });
 });
 
-describe('a Route with no path', function () {
-  describe('or a name', function () {
-    it('uses / as its path', function () {
-      var route = new Route({ handler: App });
-      expect(route.path).toEqual('/');
-    });
+describe('a nested Route that matches the URL', function () {
+  it('returns the appropriate params for each match', function () {
+    var route = Route({ name: 'posts', path: '/posts/:id', handler: App },
+      Route({ name: 'comment', path: '/posts/:id/comments/:commentId', handler: App })
+    );
+
+    var matches = route.match('/posts/abc/comments/123');
+    assert(matches);
+    expect(matches.length).toEqual(2);
+
+    var rootMatch = getRootMatch(matches);
+    expect(rootMatch.route.props.name).toEqual('comment');
+    expect(rootMatch.params).toEqual({ id: 'abc', commentId: '123' });
+
+    var firstMatch = matches[0];
+    expect(firstMatch.route.props.name).toEqual('posts');
+    expect(firstMatch.params).toEqual({ id: 'abc' });
   });
+});
 
-  describe('and a name', function () {
-    it('uses its name as its path', function () {
-      var route = new Route({ name: 'users', handler: App });
-      expect(route.path).toEqual('/users');
-    });
+describe('multiple nested Router that match the URL', function () {
+  it('returns the first one in the subtree, depth-first', function () {
+    var route = Route({ path: '/', handler: App },
+      Route({ path: '/a', handler: App },
+        Route({ path: '/a/b', name: 'expected', handler: App })
+      ),
+      Route({ path: '/a/b', handler: App })
+    );
+
+    var matches = route.match('/a/b');
+    assert(matches);
+    expect(matches.length).toEqual(3);
+
+    var rootMatch = getRootMatch(matches);
+    expect(rootMatch.route.props.name).toEqual('expected');
   });
 });
 
-describe('a Route that is missing a parameter that its parent Route needs', function () {
-  it('throws an Error', function () {
-    expect(function () {
-      Route.fromComponent(
-        RouteComponent({ path: '/users/:userId', handler: App },
-          RouteComponent({ path: '/users/:id/comments', handler: App })
-        )
-      );
-    }).toThrow(/missing the "userId" parameter/);
+describe('a Route with custom props', function() {
+  it('receives props', function (done) {
+    var route = Route({ handler: App, customProp: 'prop' });
+    var component = TestUtils.renderIntoDocument(route);
+
+    route.dispatch('/').then(function () {
+      assert(component.props.customProp);
+      expect(component.props.customProp).toEqual('prop');
+      done();
+    });
   });
 });
+
+// describe('a Router that renders on the server', function() {
+//   it('works with async willTransitionTo()', function(done) {
+//     var dataStore = 'goodbye';
+//     var Layout = React.createClass({
+//       render: function() {
+//         return React.DOM.article(null, this.props.activeRoute);
+//       }
+//     });
+//     var AsyncApp = React.createClass({
+//       displayName: 'AsyncApp',
+//       statics: {
+//         willTransitionTo: function() {
+//           return new Promise(function(resolve) {
+//             setTimeout(function() {
+//               dataStore = 'hello';
+//               resolve();
+//             }, 0);
+//           });
+//         }
+//       },
+//       render: function() {
+//         return React.DOM.div(null, dataStore);
+//       }
+//     });
+
+//     var router = Router(
+//       RouteComponent({ path: '/', handler: Layout},
+//         RouteComponent({ path: '/a', handler: AsyncApp }))
+//     );
+
+//     router.renderComponentToString('/a').then(function(result) {
+//       expect(result.indexOf('div') > -1).toBe(true);
+//       expect(result.indexOf('hello') > -1).toBe(true);
+
+//       done();
+//     });
+//   });
+// });
+
+function getRootMatch(matches) {
+  return matches[matches.length - 1];
+}

specs/RouteStore.spec.js

@@ -30,3 +30,43 @@ describe('when a route is looked up by name', function () {
     expect(RouteStore.getRouteByName('products')).toEqual(route);
   });
 });
+
+describe('when registering a route', function () {
+  describe('with no handler', function () {
+    it('throws an Error', function () {
+      expect(function () {
+        RouteStore.registerRoute(Route());
+      }).toThrow(Error);
+    });
+  });
+
+  describe('with no path or name', function () {
+    it('uses / as its path', function () {
+      var route = Route({ handler: App });
+      RouteStore.registerRoute(route);
+      expect(route.props.path).toEqual('/');
+      RouteStore.unregisterRoute(route);
+    });
+  });
+
+  describe('with a name but no path', function () {
+    it('uses its name as its path', function () {
+      var route = Route({ name: 'users', handler: App });
+      RouteStore.registerRoute(route);
+      expect(route.props.path).toEqual('/users');
+      RouteStore.unregisterRoute(route);
+    });
+  });
+
+  describe('that is missing a parameter its parent route needs', function () {
+    it('throws an error', function () {
+      expect(function () {
+        var childRoute;
+        var route = Route({ path: '/users/:userID' },
+          childRoute = Route({ path: '/users/:id/comments '})
+        );
+        RouteStore.registerRoute(childRoute);
+      }).toThrow(Error);
+    });
+  });
+});