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

Fixing custom instance defaults

closes #341
This commit is contained in:
Matt Zabriskie
2016-06-23 15:19:10 -06:00
parent 10eb238651
commit 46eee269da
3 changed files with 11 additions and 3 deletions
+1 -2
View File
@@ -1,11 +1,10 @@
'use strict';
var defaults = require('./defaults');
var utils = require('./utils');
var bind = require('./helpers/bind');
var Axios = require('./core/Axios');
var defaultInstance = new Axios(defaults);
var defaultInstance = new Axios();
var axios = module.exports = bind(Axios.prototype.request, defaultInstance);
// Copy Axios.prototype to axios instance
+1 -1
View File
@@ -13,7 +13,7 @@ var combineURLs = require('./../helpers/combineURLs');
* @param {Object} defaultConfig The default config for the instance
*/
function Axios(defaultConfig) {
this.defaults = utils.merge({}, defaultConfig);
this.defaults = utils.merge(defaults, defaultConfig);
this.interceptors = {
request: new InterceptorManager(),
response: new InterceptorManager()
+9
View File
@@ -29,6 +29,15 @@ describe('instance', function () {
});
});
it('should have defaults.headers', function () {
var instance = axios.create({
baseURL: 'https://api.example.com'
});
expect(typeof instance.defaults.headers, 'object');
expect(typeof instance.defaults.headers.common, 'object');
});
it('should have interceptors on the instance', function (done) {
axios.interceptors.request.use(function (config) {
config.foo = true;