From a6791931130611ca93cac1b2431643a8f33105f4 Mon Sep 17 00:00:00 2001 From: Dhrubesh Deb Sharma Date: Wed, 17 Jul 2019 21:32:41 +0530 Subject: [PATCH 1/4] fixing url issue while instance request --- lib/core/mergeConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/mergeConfig.js b/lib/core/mergeConfig.js index 6097a3e587..751e6c4bc2 100644 --- a/lib/core/mergeConfig.js +++ b/lib/core/mergeConfig.js @@ -34,7 +34,7 @@ module.exports = function mergeConfig(config1, config2) { }); utils.forEach([ - 'baseURL', 'transformRequest', 'transformResponse', 'paramsSerializer', + 'baseURL','url', 'transformRequest', 'transformResponse', 'paramsSerializer', 'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName', 'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'maxContentLength', 'validateStatus', 'maxRedirects', 'httpAgent', 'httpsAgent', 'cancelToken', From a7757e915ef1b47d7d04e457da817999565fb27e Mon Sep 17 00:00:00 2001 From: Dhrubesh Deb Sharma Date: Wed, 17 Jul 2019 21:49:18 +0530 Subject: [PATCH 2/4] added spacing --eslint --- lib/core/mergeConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/mergeConfig.js b/lib/core/mergeConfig.js index 751e6c4bc2..bb5e8d5f7f 100644 --- a/lib/core/mergeConfig.js +++ b/lib/core/mergeConfig.js @@ -34,7 +34,7 @@ module.exports = function mergeConfig(config1, config2) { }); utils.forEach([ - 'baseURL','url', 'transformRequest', 'transformResponse', 'paramsSerializer', + 'baseURL', 'url', 'transformRequest', 'transformResponse', 'paramsSerializer', 'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName', 'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'maxContentLength', 'validateStatus', 'maxRedirects', 'httpAgent', 'httpsAgent', 'cancelToken', From b8e81c9fedf5f1d3bafb2ed6689d975a8117e04f Mon Sep 17 00:00:00 2001 From: Dhrubesh Deb Sharma Date: Wed, 17 Jul 2019 21:49:32 +0530 Subject: [PATCH 3/4] added test cases --- test/specs/instance.spec.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/specs/instance.spec.js b/test/specs/instance.spec.js index e97d5ee394..d709c3d28e 100644 --- a/test/specs/instance.spec.js +++ b/test/specs/instance.spec.js @@ -37,6 +37,19 @@ describe('instance', function () { }); }); + it('should make an http request with url instead of baseURL', function () { + var instance = axios.create({ + url: 'https://api.example.com' + }); + + instance('/foo'); + + getAjaxRequest().then(function (request) { + expect(request.url).toBe('/foo'); + done(); + }); + }); + it('should make an http request', function (done) { var instance = axios.create(); From 4f88c237002292e9afc7ea50a2e68c375c2aebaf Mon Sep 17 00:00:00 2001 From: Dhrubesh Deb Sharma Date: Wed, 17 Jul 2019 22:03:22 +0530 Subject: [PATCH 4/4] removed unexpected cases after updating the code --- test/specs/core/mergeConfig.spec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/specs/core/mergeConfig.spec.js b/test/specs/core/mergeConfig.spec.js index bf6d2098c0..c6564ae2bd 100644 --- a/test/specs/core/mergeConfig.spec.js +++ b/test/specs/core/mergeConfig.spec.js @@ -32,13 +32,11 @@ describe('core::mergeConfig', function() { it('should not inherit request options', function() { var localDefaults = { - url: '__sample url__', method: '__sample method__', params: '__sample params__', data: { foo: true } }; var merged = mergeConfig(localDefaults, {}); - expect(merged.url).toEqual(undefined); expect(merged.method).toEqual(undefined); expect(merged.params).toEqual(undefined); expect(merged.data).toEqual(undefined);