Skip to content

[fixed] Ignore falsy routes #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2015
Merged

[fixed] Ignore falsy routes #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions tests/Router-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,20 @@ describe('Router.run', function () {
});
});

it('does not break on falsy routes', function (done) {
var routes = [
<Route handler={Foo} path="/foo"/>,
null,
<Route handler={Bar} path="/bar"/>,
undefined
];
Router.run(routes, '/foo', function (Handler, state) {
var html = React.renderToString(<Handler/>);
expect(html).toMatch(/Foo/);
done();
});
});

it('matches nested routes', function (done) {
var routes = (
<Route handler={Nested} path='/'>
Expand Down
4 changes: 2 additions & 2 deletions utils/createRoutesFromChildren.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ function createRoutesFromChildren(children, parentRoute, namedRoutes) {
var routes = [];

React.Children.forEach(children, function (child) {
// Exclude <DefaultRoute>s and <NotFoundRoute>s.
if (child = createRoute(child, parentRoute, namedRoutes))
// Exclude null values, <DefaultRoute>s and <NotFoundRoute>s.
if (child && (child = createRoute(child, parentRoute, namedRoutes)))
routes.push(child);
});

Expand Down