fix: fix matching with strictTrailingSlash option

troch · Mar 26, 2018 · 353ecc0 · 353ecc0
1 parent 470b2a5
commit 353ecc0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/modules/Path.ts b/modules/Path.ts
@@ -11,7 +11,11 @@ const identity = (_: any): any => _
 const exists = val => val !== undefined && val !== null
 
 const optTrailingSlash = (source, strictTrailingSlash) => {
-    if (!strictTrailingSlash) {
+    if (strictTrailingSlash) {
+        return source
+    }
+
+    if (source === '\\/') {
         return source
     }
 

diff --git a/test/main.js b/test/main.js
@@ -222,20 +222,17 @@ describe('Path', function() {
 
     it('should match paths with optional trailing slashes', function() {
         let path = new Path('/my-path')
-        should.not.exist(path.test('/my-path/'))
-        path.test('/my-path/', { strictTrailingSlash: true }).should.eql({})
-        path.test('/my-path/', { strictTrailingSlash: 1 }).should.eql({})
+        should.not.exist(path.test('/my-path/', { strictTrailingSlash: true }))
+        path.test('/my-path/', { strictTrailingSlash: false }).should.eql({})
 
         path = new Path('/my-path/')
-        should.not.exist(path.test('/my-path'))
-        path.test('/my-path', { strictTrailingSlash: true }).should.eql({})
-        path.test('/my-path', { strictTrailingSlash: 1 }).should.eql({})
+        should.not.exist(path.test('/my-path', { strictTrailingSlash: true }))
+        path.test('/my-path', { strictTrailingSlash: false }).should.eql({})
 
         path = new Path('/')
-        should.not.exist(path.test(''))
-        should.not.exist(path.partialTest(''))
+        should.not.exist(path.test('', { strictTrailingSlash: true }))
+        should.not.exist(path.test('', { strictTrailingSlash: false }))
         path.test('/', { strictTrailingSlash: true }).should.eql({})
-        path.test('', { strictTrailingSlash: 1 }).should.eql({})
     })
 
     it('should match paths with encoded values', function() {