2
0
mirror of https://github.com/tenrok/axios.git synced 2026-05-15 11:59:42 +03:00

Axios create url bug (#2290)

* Fix #2234 

* added spacing --eslint

* added test cases

* removed unexpected cases after updating the code
This commit is contained in:
DIO
2019-09-06 21:15:18 +05:30
committed by Felipe Martins
parent b9931e0a95
commit 89bd3abe9a
3 changed files with 14 additions and 3 deletions
+1 -1
View File
@@ -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',
-2
View File
@@ -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);
+13
View File
@@ -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();