coverage

Author: yyx990803

src/core/instance/init.js

@@ -14,6 +14,7 @@ let uid = 0
 
 export function initMixin (Vue: Class<Component>) {
   Vue.prototype._init = function (options?: Object) {
+    /* istanbul ignore if */
     if (process.env.NODE_ENV !== 'production' && config.performance && perf) {
       perf.mark('init')
     }
@@ -52,6 +53,7 @@ export function initMixin (Vue: Class<Component>) {
     initInjections(vm)
     callHook(vm, 'created')
 
+    /* istanbul ignore if */
     if (process.env.NODE_ENV !== 'production' && config.performance && perf) {
       vm._name = formatComponentName(vm, false)
       perf.mark('init end')

src/core/instance/lifecycle.js

@@ -161,6 +161,7 @@ export function mountComponent (
   callHook(vm, 'beforeMount')
 
   let updateComponent
+  /* istanbul ignore if */
   if (process.env.NODE_ENV !== 'production' && config.performance && perf) {
     updateComponent = () => {
       const name = vm._name

src/core/instance/render.js

@@ -80,6 +80,7 @@ export function renderMixin (Vue: Class<Component>) {
       handleError(e, vm, `render function`)
       // return error render result,
       // or previous vnode to prevent render error causing blank component
+      /* istanbul ignore else */
       if (process.env.NODE_ENV !== 'production') {
         vnode = vm.$options.renderError
           ? vm.$options.renderError.call(vm._renderProxy, vm.$createElement, e)

src/core/util/debug.js

@@ -6,10 +6,10 @@ let formatComponentName
 
 if (process.env.NODE_ENV !== 'production') {
   const hasConsole = typeof console !== 'undefined'
-  const classifyRE = /(?:^|[-_/])(\w)/g
+  const classifyRE = /(?:^|[-_])(\w)/g
   const classify = str => str
     .replace(classifyRE, c => c.toUpperCase())
-    .replace(/-/g, '')
+    .replace(/[-_]/g, '')
 
   warn = (msg, vm) => {
     if (hasConsole && (!config.silent)) {
@@ -35,7 +35,7 @@ if (process.env.NODE_ENV !== 'production') {
 
     return (
       (name ? `<${classify(name)}>` : `<Anonymous>`) +
-      (file && includeFile !== false ? file : '')
+      (file && includeFile !== false ? ` at ${file}` : '')
     )
   }
 

src/core/util/error.js

@@ -9,6 +9,7 @@ export function handleError (err, vm, type) {
     if (process.env.NODE_ENV !== 'production') {
       warn(`Error in ${type}:`, vm)
     }
+    /* istanbul ignore else */
     if (inBrowser && typeof console !== 'undefined') {
       console.error(err)
     } else {

src/entries/web-runtime-with-compiler.js

@@ -56,6 +56,7 @@ Vue.prototype.$mount = function (
       template = getOuterHTML(el)
     }
     if (template) {
+      /* istanbul ignore if */
       if (process.env.NODE_ENV !== 'production' && config.performance && perf) {
         perf.mark('compile')
       }
@@ -68,6 +69,7 @@ Vue.prototype.$mount = function (
       options.render = render
       options.staticRenderFns = staticRenderFns
 
+      /* istanbul ignore if */
       if (process.env.NODE_ENV !== 'production' && config.performance && perf) {
         perf.mark('compile end')
         perf.measure(`${this._name} compile`, 'compile', 'compile end')

test/unit/features/error-handling.spec.js

@@ -100,6 +100,29 @@ describe('Error handling', () => {
       Vue.config.errorHandler = null
     }).then(done)
   })
+
+  it('properly format component names', () => {
+    const format = Vue.util.formatComponentName
+    const vm = new Vue()
+    expect(format(vm)).toBe('<Root>')
+
+    vm.$root = null
+    vm.$options.name = 'hello-there'
+    expect(format(vm)).toBe('<HelloThere>')
+
+    vm.$options.name = null
+    vm.$options._componentTag = 'foo-bar-1'
+    expect(format(vm)).toBe('<FooBar1>')
+
+    vm.$options._componentTag = null
+    vm.$options.__file = '/foo/bar/baz/SomeThing.vue'
+    expect(format(vm)).toBe(`<SomeThing> at ${vm.$options.__file}`)
+    expect(format(vm, false)).toBe('<SomeThing>')
+
+    vm.$options.__file = 'C:\\foo\\bar\\baz\\windows_file.vue'
+    expect(format(vm)).toBe(`<WindowsFile> at ${vm.$options.__file}`)
+    expect(format(vm, false)).toBe('<WindowsFile>')
+  })
 })
 
 function createErrorTestComponents () {