fix: make tests pass after rebase

axios · Apr 25, 2018 · 93deda4 · 93deda4
1 parent b4dba31
commit 93deda4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
 test/manual/
+test/typescript/
diff --git a/lib/adapters/http.js b/lib/adapters/http.js
@@ -13,7 +13,7 @@ const createError = require('../core/createError')
 const enhanceError = require('../core/enhanceError')
 const pkginfo = require('pkginfo')(module)
 
-/* eslint consistent-return:0 */
+/* eslint consistent-return:0 promise/param-names:0 */
 module.exports = function httpAdapter (config) {
   return new Promise(function dispatchHttpRequest (resolvePromise, rejectPromise) {
     let timer

diff --git a/lib/core/mergeConfig.js b/lib/core/mergeConfig.js
@@ -23,11 +23,11 @@ module.exports = function mergeConfig (config1, config2) {
 
   utils.forEach(['headers', 'auth', 'proxy'], function mergeDeepProperties (prop) {
     if (utils.isObject(config2[prop])) {
-      config[prop] = utils.deepMerge(config1[prop], config2[prop])
+      config[prop] = utils.deepMerge({}, config1[prop], config2[prop])
     } else if (typeof config2[prop] !== 'undefined') {
       config[prop] = config2[prop]
     } else if (utils.isObject(config1[prop])) {
-      config[prop] = utils.deepMerge(config1[prop])
+      config[prop] = utils.deepMerge({}, config1[prop])
     } else if (typeof config1[prop] !== 'undefined') {
       config[prop] = config1[prop]
     }

diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
   },
   "bundlesize": [
     {
-      "path": "./dist/axios.min.js",
+      "path": "./dist/browser/bundle.min.js",
       "threshold": "5kB"
     }
   ]