Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion modules/PathUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var qs = require('qs');
var paramCompileMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$]*)|[*.()\[\]\\+|{}^$]/g;
var paramInjectMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$?]*[?]?)|[*]/g;
var paramInjectTrailingSlashMatcher = /\/\/\?|\/\?\/|\/\?/g;
var queryMatcher = /\?(.+)/;
var queryMatcher = /\?(.*)$/;

var _compiledPatterns = {};

Expand Down
9 changes: 9 additions & 0 deletions modules/__tests__/Router-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,15 @@ describe('Router', function () {
});
});

it('renders with empty query string', function (done) {
var routes = <Route handler={Foo} path='/'/>;
Router.run(routes, '/?', function (Handler, state) {
var html = React.renderToString(<Handler />);
expect(html).toMatch(/Foo/);
done();
});
});

it('executes transition hooks when only the query changes', function (done) {
var fromKnifeCalled = false;
var fromSpoonCalled = false;
Expand Down