refactor: small tweaks

Author: eddyerburgh

packages/create-instance/add-mocks.js

@@ -3,7 +3,7 @@ import $$Vue from 'vue'
 import { warn } from 'shared/util'
 
 export default function addMocks (
-  Vue: Component,
+  _Vue: Component,
   mockedProperties: Object | false = {}
 ): void {
   if (mockedProperties === false) {
@@ -12,7 +12,7 @@ export default function addMocks (
   Object.keys(mockedProperties).forEach(key => {
     try {
       // $FlowIgnore
-      Vue.prototype[key] = mockedProperties[key]
+      _Vue.prototype[key] = mockedProperties[key]
     } catch (e) {
       warn(
         `could not overwrite property ${key}, this is ` +
@@ -21,6 +21,6 @@ export default function addMocks (
       )
     }
     // $FlowIgnore
-    $$Vue.util.defineReactive(Vue, key, mockedProperties[key])
+    $$Vue.util.defineReactive(_Vue, key, mockedProperties[key])
   })
 }

packages/create-instance/create-functional-component.js

@@ -21,7 +21,6 @@ export default function createFunctionalComponent (
   data.scopedSlots = createScopedSlots(mountingOptions.scopedSlots)
 
   return {
-    $_doNotStubChildren: true,
     render (h: Function) {
       return h(
         component,

packages/create-instance/create-instance.js

@@ -136,7 +136,6 @@ export default function createInstance (
       Constructor,
       {
         ref: 'vm',
-        name: 'root',
         on: options.listeners,
         attrs: {
           ...options.attrs,

packages/create-instance/patch-render.js

@@ -49,8 +49,8 @@ export function patchRender (_Vue, stubs, stubAllComponents) {
   // before they are rendered in shallow mode. We also need to ensure that
   // component constructors were created from the _Vue constructor. If not,
   // we must replace them with components created from the _Vue constructor
-  // before calling the original $createElement. This ensures that the component
-  // will have the correct instance properties and stubs when it renders.
+  // before calling the original $createElement. This ensures that components
+  // have the correct instance properties and stubs when they are rendered.
   function patchRenderMixin () {
     const vm = this
 
@@ -69,18 +69,18 @@ export function patchRender (_Vue, stubs, stubAllComponents) {
 
       if (isConstructor(el)) {
         if (stubAllComponents) {
-          const elem = createStubFromComponent(
+          const stub = createStubFromComponent(
             el,
             el.name || 'anonymous'
           )
-          return originalCreateElement(elem, ...args)
+          return originalCreateElement(stub, ...args)
         }
 
-        if (shouldExtend(el, _Vue)) {
-          return originalCreateElement(extend(el, _Vue), ...args)
-        }
+        const Constructor = shouldExtend(el, _Vue)
+          ? extend(el, _Vue)
+          : el
 
-        return originalCreateElement(el, ...args)
+        return originalCreateElement(Constructor, ...args)
       }
 
       if (typeof el === 'string') {

packages/shared/util.js

@@ -39,12 +39,9 @@ function hasOwnProperty (obj, prop) {
 }
 
 export function resolveComponent (id: string, components: Object) {
-  /* istanbul ignore if */
   if (typeof id !== 'string') {
     return
   }
-  // var components = options['components'];
-
   // check local registration variations first
   if (hasOwnProperty(components, id)) {
     return components[id]
@@ -58,7 +55,5 @@ export function resolveComponent (id: string, components: Object) {
     return components[PascalCaseId]
   }
   // fallback to prototype chain
-  var res =
-    components[id] || components[camelizedId] || components[PascalCaseId]
-  return res
+  return components[id] || components[camelizedId] || components[PascalCaseId]
 }

test/resources/utils.js

@@ -29,9 +29,9 @@ export const functionalSFCsSupported = vueVersion > 2.4
 export const scopedSlotsSupported = vueVersion > 2
 
 const shallowAndMount =
-  process.env.TEST_ENV === 'node' ? [] : [shallowMount, mount]
+  process.env.TEST_ENV === 'node' ? [] : [mount, shallowMount]
 const shallowMountAndRender =
-  process.env.TEST_ENV === 'node' ? [renderToString] : [shallowMount, mount]
+  process.env.TEST_ENV === 'node' ? [renderToString] : [mount, shallowMount]
 
 export function describeWithShallowAndMount (spec, cb) {
   if (shallowAndMount.length > 0) {