Ensure matchKeys are passed directly, add test in actual markup

Author: STRML

Diff for: lib/Route.js

@@ -15,16 +15,19 @@ function createRoute(spec, defaults) {
   var handler = spec.handler;
   var path = spec.path;
   var ref = spec.ref;
+  var matchKeys = spec.matchKeys;
   var props = merge({}, spec);
 
   delete props.path;
   delete props.handler;
   delete props.ref;
+  delete props.matchKeys;
 
   var route = {
     path: path,
     handler: handler,
     props: props,
+    matchKeys: matchKeys,
     ref: ref
   };
 

Diff for: tests/server.js

@@ -21,6 +21,11 @@ describe('react-router-component (on server)', function() {
           path: /\/y(.*)/,
           handler: function(props) { return React.DOM.div(null, props._[0]);}
         }),
+        Router.Location({
+          path: /\/z\/(.*)\/(.*)/,
+          matchKeys: ['match1', 'match2'],
+          handler: function(props) { return React.DOM.div(null, props.match1 + props.match2);}
+        }),
         Router.NotFound({
           handler: function(props) { return React.DOM.div(null, 'not_found'); }
         })
@@ -46,6 +51,12 @@ describe('react-router-component (on server)', function() {
     assert(markup.match(/ohhai/));
   })
 
+  it('renders with regex and matchKeys', function() {
+    var markup = React.renderComponentToString(App({path: '/z/one/two'}));
+    assert(markup.match(/class="App"/));
+    assert(markup.match(/onetwo/));
+  })
+
   it('renders to empty on notfound', function() {
     var markup = React.renderComponentToString(App({path: '/notfound'}));
     assert(markup.match(/class="App"/));