refactor: move stub logic to addStubs function

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 (
-  mockedProperties: Object,
+  mockedProperties: Object = {},
   Vue: Component
 ): void {
   Object.keys(mockedProperties).forEach(key => {

packages/create-instance/create-instance.js

@@ -3,7 +3,7 @@
 import { createSlotVNodes } from './create-slot-vnodes'
 import addMocks from './add-mocks'
 import { addEventLogger } from './log-events'
-import { createComponentStubs } from 'shared/stub-components'
+import { addStubs } from './add-stubs'
 import { throwError, vueVersion } from 'shared/util'
 import { compileTemplate } from 'shared/compile-template'
 import { isRequiredComponent } from 'shared/validators'
@@ -34,18 +34,15 @@ export default function createInstance (
   // Remove cached constructor
   delete component._Ctor
 
-  // mounting options are vue-test-utils specific
-  //
+
   // instance options are options that are passed to the
   // root instance when it's instantiated
-  //
-  // component options are the root components options
+ const instanceOptions = extractInstanceOptions(options)
 
-  const instanceOptions = extractInstanceOptions(options)
+  addEventLogger(_Vue)
+  addMocks(options.mocks, _Vue)
+  addStubs(component, options.stubs, _Vue)
 
-  if (options.mocks) {
-    addMocks(options.mocks, _Vue)
-  }
   if (
     (component.options && component.options.functional) ||
     component.functional
@@ -61,7 +58,6 @@ export default function createInstance (
     compileTemplate(component)
   }
 
-  addEventLogger(_Vue)
 
   // Replace globally registered components with components extended
   // from localVue. This makes sure the beforeMount mixins to add stubs
@@ -76,68 +72,22 @@ export default function createInstance (
     }
   }
 
-  const stubComponents = createComponentStubs(
-    component.components,
-    // $FlowIgnore
-    options.stubs
-  )
-
   extendExtendedComponents(
     component,
     _Vue,
     options.logModifiedComponents,
     instanceOptions.components
   )
 
-  // stub components should override every component defined in a component
-  if (options.stubs) {
-    instanceOptions.components = {
-      ...instanceOptions.components,
-      ...stubComponents
-    }
-  }
-  function addStubComponentsMixin () {
-    Object.assign(
-      this.$options.components,
-      stubComponents
-    )
-  }
-  _Vue.mixin({
-    beforeMount: addStubComponentsMixin,
-    // beforeCreate is for components created in node, which
-    // never mount
-    beforeCreate: addStubComponentsMixin
-  })
-
   if (component.options) {
     component.options._base = _Vue
   }
 
-  function getExtendedComponent (component, instanceOptions) {
-    const extendedComponent = component.extend(instanceOptions)
-    // to keep the possible overridden prototype and _Vue mixins,
-    // we need change the proto chains manually
-    // @see https://github.com/vuejs/vue-test-utils/pull/856
-    // code below equals to
-    // `extendedComponent.prototype.__proto__.__proto__ = _Vue.prototype`
-    const extendedComponentProto =
-      Object.getPrototypeOf(extendedComponent.prototype)
-    Object.setPrototypeOf(extendedComponentProto, _Vue.prototype)
-
-    return extendedComponent
-  }
-
   // extend component from _Vue to add properties and mixins
-  const Constructor = typeof component === 'function'
-    ? getExtendedComponent(component, instanceOptions)
-    : _Vue.extend(component).extend(instanceOptions)
+  const Constructor = _Vue.extend(component).extend(instanceOptions)
 
   Constructor._vueTestUtilsRoot = component
 
-  Object.keys(instanceOptions.components || {}).forEach(c => {
-    Constructor.component(c, instanceOptions.components[c])
-  })
-
   if (options.slots) {
     compileTemplateForSlots(options.slots)
     // $FlowIgnore

packages/shared/stub-components.js

@@ -90,7 +90,7 @@ function createClassString (staticClass, dynamicClass) {
   return staticClass || dynamicClass
 }
 
-function createBlankStub (
+export function createBlankStub (
   originalComponent: Component,
   name: string
 ): Component {
@@ -242,8 +242,6 @@ export function createComponentStubsForAll (component: Component): Components {
     stubComponents(component.components, stubbedComponents)
   }
 
-  stubbedComponents[component.name] = createBlankStub(component, component.name)
-
   let extended = component.extends
 
   // Loop through extended component chains to stub all child components

packages/test-utils/src/shallow-mount.js

@@ -6,7 +6,8 @@ import mount from './mount'
 import type VueWrapper from './vue-wrapper'
 import {
   createComponentStubsForAll,
-  createComponentStubsForGlobals
+  createComponentStubsForGlobals,
+  createBlankStub
 } from 'shared/stub-components'
 import { camelize, capitalize, hyphenate } from 'shared/util'
 
@@ -23,6 +24,16 @@ export default function shallowMount (
     delete component.components[hyphenate(component.name)]
   }
 
+  if(!options.stubs) {
+    options.stubs = {}
+  }
+
+  // In Vue.extends, Vue adds a recursive component to the options
+  // This stub will override the component added by Vue
+  if (!options.stubs[component.name]) {
+    options.stubs[component.name] = createBlankStub(component, component.name)
+  }
+
   return mount(component, {
     ...options,
     components: {

test/specs/shallow-mount.spec.js

@@ -389,8 +389,7 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'shallowMount', () => {
           AsyncComponent: () => import('~resources/components/component.vue')
         }
       }
-      const wrapper = shallowMount(TestComponent)
-      expect(wrapper.find({ name: 'AsyncComponent' }).exists()).to.equal(true)
+      shallowMount(TestComponent)
     })
 
   it('stubs components registered on localVue after multiple installs', () => {