Fix bug when path is "/" and regex is "/.*"

src/components/Switcher.js

@@ -1,5 +1,5 @@
 import React, {Component} from 'react';
-import {ensureTrailingSlash} from 'helpers';
+import {removeTrailingSlash} from 'helpers';
 
 export default class Switcher extends Component {
   static displayName = 'Switcher';
@@ -80,13 +80,13 @@ export default class Switcher extends Component {
 
   getSwitch = (path) => {
     var children = [].concat(this.props.children);
-    var consistentPath = ensureTrailingSlash(path);
+    var consistentPath = removeTrailingSlash(path);
     return children.filter(child => {
       var childPaths = [].concat(child.props.path).map(childPath => {
-        return ensureTrailingSlash(this.props.basePath + childPath);
+        return `${removeTrailingSlash(this.props.basePath + childPath)}/?`;
       });
       var regex = new RegExp(`^${childPaths.join('|')}$`);
-      return consistentPath.match(regex);
+      return regex.test(consistentPath);
     })[0] || null;
   }
 

src/helpers.js

@@ -1,3 +1,7 @@
-export function ensureTrailingSlash(path) {
-  return path.slice(-1) !== '/' ? `${path}/` : path;
+export function removeTrailingSlash(path) {
+  if (path === '/') {
+    return path;
+  } else {
+    return path.slice(-1) !== '/' ? path : path.slice(0, -1);
+  }
 }

test/components/Switcher_test.js

@@ -261,6 +261,13 @@ describe('Switcher', function() {
         assert.equal(node.innerHTML, 'Default Handler');
       });
 
+      it('default handle can match /', function() {
+        window.location.hash = '/';
+        this.switcher.handleRouteChange();
+        var node = ReactDOM.findDOMNode(this.switcher);
+        assert.equal(node.innerHTML, 'Default Handler');
+      });
+
       it('renders matching component', function() {
         window.location.hash = '/home';
         this.switcher.handleRouteChange();

test/helpers_test.js

@@ -1,17 +1,23 @@
 import {assert} from 'chai';
-import {ensureTrailingSlash} from 'helpers';
+import {removeTrailingSlash} from 'helpers';
 
 describe('helpers', function() {
-  describe('ensureTrailingSlash', function() {
-    it('adds trailing slash to path without it', function() {
+  describe('removeTrailingSlash', function() {
+    it('removes trailing slash to path with it', function() {
       var path = '/test/something/more';
-      var newPath = ensureTrailingSlash(path);
-      assert.equal(newPath, `${path}/`);
+      var newPath = removeTrailingSlash(`${path}/`);
+      assert.equal(newPath, path);
+    });
+
+    it('returns unmodified path if it does not have a trailing slash', function() {
+      var path = '/test/something/more';
+      var newPath = removeTrailingSlash(path);
+      assert.equal(newPath, path);
     });
 
-    it('returns unmodified path if it already has trailing slash', function() {
-      var path = '/test/something/more/';
-      var newPath = ensureTrailingSlash(path);
+    it('returns unmodified path if path is /', function() {
+      var path = '/';
+      var newPath = removeTrailingSlash(path);
       assert.equal(newPath, path);
     });
   });