[fixed] DefaultRoute/NotFoundRoute name regression

Also, added tests so we don't regress again.

I believe this was introduced in c5a24a5

Fixes #870

Author: mjackson

modules/Route.js

@@ -63,7 +63,7 @@ class Route {
     var name = options.name;
     var path = options.path || name;
 
-    if (path) {
+    if (path && !(options.isDefault || options.isNotFound)) {
       if (PathUtils.isAbsolute(path)) {
         if (parentRoute) {
           invariant(

modules/components/__tests__/DefaultRoute-test.js

@@ -32,24 +32,24 @@ describe('DefaultRoute', function () {
 
     Router.run(routes, '/foo', function (App) {
       var html = React.renderToString(<App/>);
+      expect(html).toMatch(/Nested/);
       expect(html).toMatch(/Foo/);
     });
   });
 
-  it('renders when no siblings match', function () {
-    var routes = (
-      <Route path='/' handler={Nested}>
-        <Route path='/foo' handler={Nested}>
-          <DefaultRoute handler={Foo} />
-          <Route path="/bar" handler={Bar} />
+  describe('with a name', function () {
+    it('renders when the parent route path matches', function () {
+      var routes = (
+        <Route path='/' handler={Nested}>
+          <DefaultRoute name="root" handler={Foo} />
         </Route>
-      </Route>
-    );
+      );
 
-    Router.run(routes, '/foo', function (App) {
-      var html = React.renderToString(<App/>);
-      expect(html).toMatch(/Foo/);
-      expect(html.match(/Bar/)).toEqual(null);
+      Router.run(routes, '/', function (App) {
+        var html = React.renderToString(<App/>);
+        expect(html).toMatch(/Nested/);
+        expect(html).toMatch(/Foo/);
+      });
     });
   });
 

modules/components/__tests__/NotFoundRoute-test.js

@@ -8,7 +8,7 @@ var { Nested, Foo, Bar } = require('../../TestUtils');
 describe('NotFoundRoute', function () {
 
   describe('at the root of the config', function () {
-    it('renders when no routes match', function () {
+    it('renders when no other routes match', function () {
       var routes = <NotFoundRoute handler={Bar}/>;
       Router.run(routes, '/ryans-patience', function (Handler) {
         var html = React.renderToString(<Handler />);
@@ -18,7 +18,7 @@ describe('NotFoundRoute', function () {
   });
 
   describe('nested in the config', function () {
-    it('renders', function () {
+    it('renders when none of its siblings match', function () {
       var routes = (
         <Route path='/' handler={Nested}>
           <Route path='/foo' handler={Foo}/>
@@ -61,4 +61,20 @@ describe('NotFoundRoute', function () {
     });
   });
 
+  describe('with a name', function () {
+    it('renders when none of its siblings match', function () {
+      var routes = (
+        <Route path='/' handler={Nested}>
+          <Route path='/foo' handler={Foo}/>
+          <NotFoundRoute name="not-found" handler={Bar} />
+        </Route>
+      );
+
+      Router.run(routes, '/ryans-mind', function (Handler) {
+        var html = React.renderToString(<Handler/>);
+        expect(html).toMatch(/Bar/);
+      });
+    });
+  });
+
 });