Merge remote-tracking branch 'origin/master'

Author: mjackson

docs/api/components/Redirect.md

@@ -15,6 +15,16 @@ to `*` so you can redirect anything not found to somewhere else.
 
 The `name` of the route you want to redirect to.
 
+### `params`
+
+By default, the parameters will just pass through to the new route, but
+you can specify them if you need to (usually you shouldn't).
+
+### `query`
+
+By default, the query parameters will just pass through to the new
+route, but you can specify them if you need to (usually you shouldn't).
+
 Example
 -------
 
@@ -40,8 +50,12 @@ Example
 
   <!-- `/get-in-touch` -> `/contact` -->
   <Redirect from="get-in-touch" to="contact" />
+
   <!-- `/profile/123` -> `/about/123` -->
   <Redirect from="profile/:userId" to="about-user" />
+
+  <!-- `/profile/jasmin` -> `/about-user/123` -->
+  <Redirect from="profile/jasmin" to="about-user" params={{userId: 123}} />
 </Routes>
 ```
 

modules/components/Redirect.js

@@ -1,11 +1,11 @@
 var React = require('react');
 var Route = require('./Route');
 
-function createRedirectHandler(to) {
+function createRedirectHandler(to, _params, _query) {
   return React.createClass({
     statics: {
       willTransitionTo: function (transition, params, query) {
-        transition.redirect(to, params, query);
+        transition.redirect(to, _params || params, _query || query);
       }
     },
 
@@ -23,7 +23,7 @@ function Redirect(props) {
   return Route({
     name: props.name,
     path: props.from || props.path || '*',
-    handler: createRedirectHandler(props.to)
+    handler: createRedirectHandler(props.to, props.params, props.query)
   });
 }
 

modules/components/__tests__/Redirect-test.js

@@ -0,0 +1,66 @@
+var assert = require('assert');
+var expect = require('expect');
+var React = require('react/addons');
+var Route = require('../Route');
+var Redirect = require('../Redirect');
+var Routes = require('../Routes');
+
+describe('a Redirect', function () {
+
+  it('redirects from old to new', function (done) {
+    var descriptor = Redirect({ from: 'old', to: 'new' });
+
+    expect(descriptor.props.path).toEqual('old');
+
+    var fakeTransition = {
+      redirect: function(to) {
+        expect(to).toEqual('new');
+        done();
+      }
+    };
+
+    descriptor.props.handler.willTransitionTo(fakeTransition);
+  });
+
+  it('uses params and query from current path', function (done) {
+    var descriptor = Redirect({ from: 'old', to: 'new' });
+    var expectedParams = { foo: 'bar' };
+    var expectedQuery = { baz: 'qux' };
+
+    var fakeTransition = {
+      redirect: function(to, params, query) {
+        expect(params).toEqual(expectedParams);
+        expect(query).toEqual(expectedQuery);
+        done();
+      }
+    };
+
+    descriptor.props.handler.willTransitionTo(fakeTransition, expectedParams, expectedQuery);
+  });
+
+  it('uses params and query from the Redirect definition', function (done) {
+    var expectedParams = { foo: 'bar' };
+    var expectedQuery = { baz: 'qux' };
+    var fakePathParams = { hooba: 'scooba' };
+    var fakePathQuery = { doobie: 'scoobie' };
+
+    var descriptor = Redirect({
+      from: 'old',
+      to: 'new',
+      params: expectedParams,
+      query: expectedQuery
+    });
+
+    var fakeTransition = {
+      redirect: function(to, params, query) {
+        expect(params).toEqual(expectedParams);
+        expect(query).toEqual(expectedQuery);
+        done();
+      }
+    };
+
+    descriptor.props.handler.willTransitionTo(fakeTransition, fakePathParams, fakePathQuery);
+  });
+
+});
+

modules/utils/Path.js

@@ -112,7 +112,7 @@ var Path = {
    * in the given path, null if the path contains no query string.
    */
   extractQuery: function (path) {
-    var match = decodeURL(path).match(queryMatcher);
+    var match = path.match(queryMatcher);
     return match && qs.parse(match[1]);
   },
 

modules/utils/__tests__/Path-test.js

@@ -229,6 +229,10 @@ describe('Path.extractQuery', function () {
     it('properly handles arrays', function () {
       expect(Path.extractQuery('/?id%5B%5D=a&id%5B%5D=b')).toEqual({ id: [ 'a', 'b' ] });
     });
+
+    it('properly handles encoded ampersands', function () {
+      expect(Path.extractQuery('/?id=a%26b')).toEqual({ id: 'a&b' });
+    });
   });
 
   describe('when the path does not contain a query string', function () {

tests.js

@@ -2,6 +2,7 @@ require('./modules/components/__tests__/DefaultRoute-test');
 require('./modules/components/__tests__/Link-test');
 require('./modules/components/__tests__/NotFoundRoute-test');
 require('./modules/components/__tests__/Routes-test');
+require('./modules/components/__tests__/Redirect-test');
 
 require('./modules/mixins/__tests__/ActiveContext-test');
 require('./modules/mixins/__tests__/LocationContext-test');