set errorHandler to be a default export and set Vue.config.errorHandler = errorHandler in mount

Author: Austio

src/lib/error-handler.js

@@ -3,26 +3,17 @@ function errorMessage(msg, info) {
     return `${msg} : additional info ${info}`
   }
 
-  return msg;
+  return msg
 }
 
-function setVueErrorHandler(vue) {
-  vue.config.errorHandler = errorHandler
-}
-
-function errorHandler(err, _vm, info) {
+export default function errorHandler(err, _vm, info) {
   if ((typeof err === 'object') && err.message) {
     if (info) {
       err.message = errorMessage(err.message, info);
     }
 
-    throw err;
+    throw err
   }
 
-  throw new Error(errorMessage(err, info));
-}
-
-export {
-  errorHandler,
-  setVueErrorHandler
+  throw new Error(errorMessage(err, info))
 }

src/mount.js

@@ -7,10 +7,10 @@ import createInstance from './lib/create-instance'
 import cloneDeep from 'lodash/cloneDeep'
 import createElement from './lib/create-element'
 import './lib/matches-polyfill'
-import { setVueErrorHandler } from './lib/error-handler'
+import errorHandler from './lib/error-handler'
 
 Vue.config.productionTip = false
-setVueErrorHandler(Vue)
+Vue.config.errorHandler = errorHandler
 
 export default function mount (component: Component, options: Options = {}): VueWrapper {
   const componentToMount = options.clone === false ? component : cloneDeep(component.extend ? component.options : component)

test/unit/specs/lib/error-handler.spec.js

@@ -1,38 +1,31 @@
-import { errorHandler } from '../../../../src/lib/error-handler'
+import errorHandler from '../../../../src/lib/error-handler'
 
 describe('errorHandler', () => {
   const errorString = 'errorString'
   const info = 'additional info provided by vue'
+  const errorObject = new Error(errorString)
 
-  describe('with Error thrown', () => {
-    const error = new Error(errorString)
-
-    it('rethrows error', () => {
-      expect(() => errorHandler(error)).to.throw().with.property('message', errorString)
-    })
+  it('when error object: rethrows error', () => {
+    expect(() => errorHandler(errorObject)).to.throw().with.property('message', errorString)
+  })
 
-    it('rethrown error contains vue info when provided', () => {
-      expect(() => errorHandler(error, {}, info)).to.throw().that.satisfies(function(err) {
-        const errorMessage = err.message
+  it('when error object: rethrown error contains vue info when provided', () => {
+    expect(() => errorHandler(errorObject, {}, info)).to.throw().that.satisfies(function(err) {
+      const errorMessage = err.message
 
-        return errorMessage.includes(errorString) && errorMessage.includes(info)
-      });
-    })
+      return errorMessage.includes(errorString) && errorMessage.includes(info)
+    });
   })
 
-  describe('with not Error object thrown', () => {
-    const error = errorString
-
-    it('throws error with string', () => {
-      expect(() => errorHandler(error)).to.throw().with.property('message', errorString)
-    })
+  it('when error string: throws error with string', () => {
+    expect(() => errorHandler(errorString)).to.throw().with.property('message', errorString)
+  })
 
-    it('throws error with string and appends info when provided', () => {
-      expect(() => errorHandler(error, {}, info)).to.throw().that.satisfies(function(err) {
-        const errorMessage = err.message;
+  it('throws error with string and appends info when provided', () => {
+    expect(() => errorHandler(errorString, {}, info)).to.throw().that.satisfies(function(err) {
+      const errorMessage = err.message;
 
-        return errorMessage.includes(errorString) && errorMessage.includes(info)
-      });
-    })
+      return errorMessage.includes(errorString) && errorMessage.includes(info)
+    });
   })
 })

test/unit/specs/mount.spec.js

@@ -92,7 +92,6 @@ describe('mount', () => {
         mounted: function() {
           throw(new Error('Error'))
         }
-      })).to.throw();
-
-    })
+    })).to.throw();
+  })
 })