fix(join): keep trailing slash

aurelia · Apr 30, 2015 · 3e7ed20 · 3e7ed20
1 parent 5a0adbb
commit 3e7ed20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -57,6 +57,7 @@ export function join(path1, path2) {
 
   urlPrefix = path1.indexOf('//') === 0 ? '//' :
               path1.indexOf('/') === 0 ? '/' : '';
+  trailingSlash = path2.slice(-1) == '/' ? '/' : '';
 
   url1 = path1.split('/');
   url2 = path2.split('/');
@@ -82,7 +83,7 @@ export function join(path1, path2) {
     }
   }
 
-  return urlPrefix + url3.join('/').replace(/\:\//g, '://');;
+  return urlPrefix + url3.join('/').replace(/\:\//g, '://') + trailingSlash;
 }
 
 var r20 = /%20/g,

diff --git a/test/path.spec.js b/test/path.spec.js
@@ -170,4 +170,11 @@ describe('join', () => {
 
     expect(join(path1, path2)).toBe('one');
   });
-});
+  it('should respect a trailing slash', () => {
+    var path1 = 'one/';
+    var path2 = 'two/';
+
+    expect(join(path1, path2)).toBe('one/two/');
+  });
+});
+