Fix bug where multiple paths ending in the same pattern would cause w…

…rong nodes to render.

src/helpers.js

@@ -29,7 +29,7 @@ export function formatPathRegex(basePath, path) {
 }
 
 export function createRegexFromPaths(paths) {
-  return new RegExp(`^${paths.join('|')}$`);
+  return new RegExp(`^(${paths.join('|')})$`);
 }
 
 export function getSwitch(path, {children, basePath}) {

test/Switcher_test.js

@@ -99,6 +99,39 @@ describe('Switcher', function() {
       });
     });
 
+    describe('with multiple paths', function() {
+      beforeEach(function() {
+        this.switcher = ReactDOM.render(
+          <Switcher>
+            <div path={['/', '/other']}>Home</div>
+          </Switcher>,
+          document.getElementById('app')
+        );
+      });
+      afterEach(function() {
+        ReactDOM.unmountComponentAtNode(document.getElementById('app'));
+        helpers.currentPath.restore();
+      });
+      it('renders correct element', function() {
+        sinon.stub(helpers, 'currentPath').returns('/other');
+        this.switcher.handleRouteChange();
+        var node = ReactDOM.findDOMNode(this.switcher);
+        assert.equal(node.innerHTML, 'Home');
+      });
+      it('renders correct element', function() {
+        sinon.stub(helpers, 'currentPath').returns('/');
+        this.switcher.handleRouteChange();
+        var node = ReactDOM.findDOMNode(this.switcher);
+        assert.equal(node.innerHTML, 'Home');
+      });
+      it('renders correct elements', function() {
+        sinon.stub(helpers, 'currentPath').returns('/otherThing');
+        this.switcher.handleRouteChange();
+        var node = ReactDOM.findDOMNode(this.switcher);
+        assert.equal(node, null);
+      });
+    });
+
     describe('with default handler', function() {
       beforeEach(function() {
         this.switcher = ReactDOM.render(

test/helpers_test.js

@@ -171,7 +171,7 @@ describe('helpers', function() {
     it('joins paths and creates a regex', function() {
       var paths = ['/one/b', '/two/a/b', '/three'];
       var regex = createRegexFromPaths(paths);
-      assert.equal(`${regex}`, '/^\\/one\\/b|\\/two\\/a\\/b|\\/three$/');
+      assert.equal(`${regex}`, '/^(\\/one\\/b|\\/two\\/a\\/b|\\/three)$/');
       assert(regex instanceof RegExp);
     });
   });