fix: add support for proper props update in async mode

xanf · xanf · commit ec99da1d6bc1 · 2019-09-02T18:53:40.000+03:00
Since we're already wrapping a component into a parent one
we can get rid of explicitly setting props on component, instead
modifying them being passed from parent component instead
diff --git a/packages/create-instance/create-instance.js b/packages/create-instance/create-instance.js
@@ -11,7 +11,7 @@ import createScopedSlots from './create-scoped-slots'
 import { createStubsFromStubsObject } from './create-component-stubs'
 import { patchCreateElement } from './patch-create-element'
 
-function createContext(options, scopedSlots) {
+function createContext(options, scopedSlots, currentProps) {
   const on = {
     ...(options.context && options.context.on),
     ...options.listeners
@@ -21,7 +21,7 @@ function createContext(options, scopedSlots) {
       ...options.attrs,
       // pass as attrs so that inheritAttrs works correctly
       // propsData should take precedence over attrs
-      ...options.propsData
+      ...currentProps
     },
     ...(options.context || {}),
     on,
@@ -84,10 +84,16 @@ export default function createInstance(
   parentComponentOptions.provide = options.provide
   parentComponentOptions.$_doNotStubChildren = true
   parentComponentOptions._isFunctionalContainer = componentOptions.functional
+  const originalDataFn = parentComponentOptions.data
+  parentComponentOptions.data = function() {
+    const originalData = originalDataFn ? originalDataFn() : {}
+    originalData.vueTestUtils_childProps = { ...options.propsData }
+    return originalData
+  }
   parentComponentOptions.render = function(h) {
     return h(
       Constructor,
-      createContext(options, scopedSlots),
+      createContext(options, scopedSlots, this.vueTestUtils_childProps),
       createChildren(this, h, options)
     )
   }
diff --git a/packages/test-utils/src/wrapper.js b/packages/test-utils/src/wrapper.js
@@ -1,10 +1,7 @@
 // @flow
-
-import Vue from 'vue'
 import pretty from 'pretty'
 import getSelector from './get-selector'
 import { REF_SELECTOR, FUNCTIONAL_OPTIONS, VUE_VERSION } from 'shared/consts'
-import config from './config'
 import WrapperArray from './wrapper-array'
 import ErrorWrapper from './error-wrapper'
 import { throwError, getCheckedEvent, isPhantomJS } from 'shared/util'
@@ -455,8 +452,6 @@ export default class Wrapper implements BaseWrapper {
    * Sets vm props
    */
   setProps(data: Object): void {
-    const originalConfig = Vue.config.silent
-    Vue.config.silent = config.silent
     if (this.isFunctionalComponent) {
       throwError(
         `wrapper.setProps() cannot be called on a functional component`
@@ -480,38 +475,26 @@ export default class Wrapper implements BaseWrapper {
         )
       }
       if (
-        !this.vm ||
-        !this.vm.$options._propKeys ||
-        !this.vm.$options._propKeys.some(prop => prop === key)
+        VUE_VERSION <= 2.3 &&
+        // $FlowIgnore : Problem with possibly null this.vm
+        (!this.vm.$options._propKeys ||
+          !this.vm.$options._propKeys.some(prop => prop === key))
       ) {
-        if (VUE_VERSION > 2.3) {
-          // $FlowIgnore : Problem with possibly null this.vm
-          this.vm.$attrs[key] = data[key]
-          return
-        }
         throwError(
           `wrapper.setProps() called with ${key} property which ` +
             `is not defined on the component`
         )
       }
 
-      if (this.vm && this.vm._props) {
-        // Set actual props value
-        this.vm._props[key] = data[key]
-        // $FlowIgnore : Problem with possibly null this.vm
-        this.vm[key] = data[key]
-      } else {
-        // $FlowIgnore : Problem with possibly null this.vm.$options
-        this.vm.$options.propsData[key] = data[key]
-        // $FlowIgnore : Problem with possibly null this.vm
-        this.vm[key] = data[key]
-        // $FlowIgnore : Need to call this twice to fix watcher bug in 2.0.x
-        this.vm[key] = data[key]
+      if (this.vm && this.vm.$parent) {
+        this.vm.$parent.vueTestUtils_childProps[key] = data[key]
       }
     })
     // $FlowIgnore : Problem with possibly null this.vm
     this.vm.$forceUpdate()
-    Vue.config.silent = originalConfig
+    // We need to explicitly trigger parent watcher to support sync scenarios
+    // $FlowIgnore : Problem with possibly null this.vm
+    this.vm.$parent._watcher.run()
   }
 
   /**
