Merge pull request remix-run#774 from kentor/master

[fixed] Double slash in href when parent route has optional trailing sla...
adamjv90 · Feb 6, 2015 · 19c7bd7 · 19c7bd7
2 parents 32d24a5 + 5bcf653
commit 19c7bd7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/modules/utils/Path.js b/modules/utils/Path.js
@@ -4,7 +4,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 paramInjectTrailingSlashMatcher = /\/\/\?|\/\?\/|\/\?/g;
 var queryMatcher = /\?(.+)/;
 
 var _compiledPatterns = {};

diff --git a/modules/utils/__tests__/Path-test.js b/modules/utils/__tests__/Path-test.js
@@ -274,6 +274,12 @@ describe('Path.injectParams', function () {
       expect(Path.injectParams('/foo.bar.baz')).toEqual('/foo.bar.baz');
     });
   });
+
+  describe('when a pattern has optional slashes', function () {
+    it('returns the correct path', function () {
+      expect(Path.injectParams('/foo/?/bar/?/baz/?')).toEqual('/foo/bar/baz/');
+    });
+  });
 });
 
 describe('Path.extractQuery', function () {