Fixing combineURLs, allowing single slash relatives

axios · Dec 8, 2016 · 75965ff · 75965ff
1 parent 2bd48d4
commit 75965ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/helpers/combineURLs.js b/lib/helpers/combineURLs.js
@@ -8,8 +8,7 @@
  * @returns {string} The combined URL
  */
 module.exports = function combineURLs(baseURL, relativeURL) {
-  var end = relativeURL.replace(/^\/+/, '');
-  return end
-    ? baseURL.replace(/\/+$/, '') + '/' + end
+  return relativeURL
+    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
     : baseURL;
 };
diff --git a/test/specs/helpers/combineURLs.spec.js b/test/specs/helpers/combineURLs.spec.js
@@ -16,4 +16,8 @@ describe('helpers::combineURLs', function () {
   it('should not insert slash when relative url missing/empty', function () {
     expect(combineURLs('https://api.github.com/users', '')).toBe('https://api.github.com/users');
   });
+
+  it('should allow a single slash for relative url', function () {
+    expect(combineURLs('https://api.github.com/users', '/')).toBe('https://api.github.com/users/');
+  });
 });