mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-20 20:00:40 +03:00
Code Activity

Fixing combineURLs to support an empty relativeURL (#581)

Browse Source 
* Fixing combineURLs to support an empty relativeURL

When combining the base and relative URLs, we should forego force
appending a slash to the base when the relative URL is empty.
This leads to a semantic url.

* Fixing combineURLs, allowing single slash relatives
This commit is contained in:
Lochlan Bunn
2016-12-08 15:23:45 +10:00
committed by Nick Uraltsev
parent cfe33d4fd3
commit fe7d09bb08
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/helpers/combineURLs.js
+3 -1
View File
@@ -8,5 +8,7 @@
* @returns {string} The combined URL * @returns {string} The combined URL
*/ */
module.exports = function combineURLs(baseURL, relativeURL) { module.exports = function combineURLs(baseURL, relativeURL) {
return baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, ''); return relativeURL
? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
: baseURL;
}; };
test/specs/helpers/combineURLs.spec.js
+8
View File
@@ -12,4 +12,12 @@ describe('helpers::combineURLs', function () {
it('should insert missing slash', function () { it('should insert missing slash', function () {
expect(combineURLs('https://api.github.com', 'users')).toBe('https://api.github.com/users'); expect(combineURLs('https://api.github.com', 'users')).toBe('https://api.github.com/users');
}); });
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/');
});
}); });