Removes double slashes, fixes #78

mhkeller · Aug 20, 2019 · 440029a · 440029a
1 parent 32b5b57
commit 440029a
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 8 deletions.
diff --git a/dist/indian-ocean.browser.es6.js b/dist/indian-ocean.browser.es6.js
diff --git a/dist/indian-ocean.browser.es6.js.map b/dist/indian-ocean.browser.es6.js.map
diff --git a/dist/indian-ocean.cjs.js b/dist/indian-ocean.cjs.js
diff --git a/dist/indian-ocean.cjs.js.map b/dist/indian-ocean.cjs.js.map
diff --git a/dist/indian-ocean.js b/dist/indian-ocean.js
diff --git a/dist/indian-ocean.js.map b/dist/indian-ocean.js.map
diff --git a/dist/indian-ocean.min.js b/dist/indian-ocean.min.js
diff --git a/src/utils/path.js b/src/utils/path.js
@@ -24,7 +24,14 @@ export function dirname (path) {
   return dir || '/'
 }
 
+/* --------------------------------------------
+ * Join a path with a slash, removing any stub entries that end in a slash
+ * to avoid a double slash scenario
+ */
 export function joinPath () {
   var args = Array.prototype.slice.call(arguments)
-  return args.join('/') // TODO, windows
+  return args.map((d, i) => {
+    if (i === args.length - 1) return d
+    return d.replace(/\/$/, '')
+  }).join('/') // TODO, windows
 }
diff --git a/test/test.js b/test/test.js
@@ -1662,6 +1662,13 @@ describe('readers', function () {
           done(assert.notEqual(files.indexOf(path.join(dir, 'this_is_not_a_csv.txt')), -1))
         })
       })
+      it('should match expected output stripping trailing slash', function (done) {
+        var dir = path.join(__dirname, 'data', 'other/')
+        io.readdirFilter(dir, {exclude: 'csv', fullPath: true}, function (err, files) {
+          assert.equal(err, null)
+          done(assert.notEqual(files.indexOf(path.join(dir, 'this_is_not_a_csv.txt')), -1))
+        })
+      })
     })
 
     describe('get dirs only', function () {
@@ -1714,6 +1721,11 @@ describe('readers', function () {
         var files = io.readdirFilterSync(dir, {include: 'csv', fullPath: true})
         assert.equal(files.indexOf(path.join(dir, 'basic.csv')), 0)
       })
+      it('should match expected output with trailing slash', function () {
+        var dir = path.join(__dirname, 'data', 'csv/')
+        var files = io.readdirFilterSync(dir, {include: 'csv', fullPath: true})
+        assert.equal(files.indexOf(path.join(dir, 'basic.csv')), 0)
+      })
     })
 
     describe('detailed readdir results', function () {