fix: respect provide from parentComponent

Author: xanf

Diff for: packages/create-instance/create-instance.js

@@ -39,6 +39,13 @@ function createChildren(vm, h, { slots, context }) {
   )
 }
 
+function getValuesFromCallableOption(optionValue) {
+  if (typeof optionValue === 'function') {
+    return optionValue.call(this)
+  }
+  return optionValue
+}
+
 export default function createInstance(
   component: Component,
   options: NormalizedOptions,
@@ -81,7 +88,14 @@ export default function createInstance(
 
   const parentComponentOptions = options.parentComponent || {}
 
-  parentComponentOptions.provide = options.provide
+  const originalParentComponentProvide = parentComponentOptions.provide
+  parentComponentOptions.provide = function() {
+    return {
+      ...getValuesFromCallableOption.call(this, originalParentComponentProvide),
+      ...getValuesFromCallableOption.call(this, options.provide)
+    }
+  }
+
   parentComponentOptions.$_doNotStubChildren = true
   parentComponentOptions._isFunctionalContainer = componentOptions.functional
   parentComponentOptions.render = function(h) {

Diff for: test/specs/config.spec.js

@@ -64,6 +64,10 @@ describeWithShallowAndMount('config', mountingMethod => {
   })
 
   it('overrides a method', () => {
+    afterEach(() => {
+      delete config.methods['val']
+    })
+
     const testComponent = {
       template: `
         <div>{{ val() }}</div>

Diff for: test/specs/mounting-options/methods.spec.js

@@ -2,6 +2,17 @@ import { config } from '~vue/test-utils'
 import { describeWithShallowAndMount } from '~resources/utils'
 
 describeWithShallowAndMount('options.methods', mountingMethod => {
+  let configMethodsSave
+
+  beforeEach(() => {
+    configMethodsSave = config.methods
+    config.methods = {}
+  })
+
+  afterEach(() => {
+    config.methods = configMethodsSave
+  })
+
   it('prioritize mounting options over config', () => {
     config.methods['val'] = () => 'methodFromConfig'
 

Diff for: test/specs/mounting-options/provide.spec.js

@@ -29,6 +29,86 @@ describeWithShallowAndMount('options.provide', mountingMethod => {
     }
   )
 
+  itDoNotRunIf(
+    !injectSupported,
+    'respects provide values from parentComponent',
+    () => {
+      const parentComponent = {
+        provide: {
+          val: 'from parent'
+        }
+      }
+
+      const child = {
+        inject: ['val', 'val2'],
+        template: '<div></div>'
+      }
+
+      const wrapper = mountingMethod(child, {
+        parentComponent,
+        provide: {
+          val2: 'from config'
+        }
+      })
+
+      expect(wrapper.vm.val).to.equal('from parent')
+      expect(wrapper.vm.val2).to.equal('from config')
+    }
+  )
+
+  itDoNotRunIf(
+    !injectSupported,
+    'respects provide function from parentComponent',
+    () => {
+      const parentComponent = {
+        provide() {
+          return { val: 'from parent' }
+        }
+      }
+
+      const child = {
+        inject: ['val', 'val2'],
+        template: '<div></div>'
+      }
+
+      const wrapper = mountingMethod(child, {
+        parentComponent,
+        provide: {
+          val2: 'from config'
+        }
+      })
+
+      expect(wrapper.vm.val).to.equal('from parent')
+      expect(wrapper.vm.val2).to.equal('from config')
+    }
+  )
+
+  itDoNotRunIf(
+    !injectSupported,
+    'prioritize mounting options over parentComponent provide',
+    () => {
+      const parentComponent = {
+        provide() {
+          return { val: 'from parent' }
+        }
+      }
+
+      const child = {
+        inject: ['val'],
+        template: '<div></div>'
+      }
+
+      const wrapper = mountingMethod(child, {
+        parentComponent,
+        provide: {
+          val: 'from config'
+        }
+      })
+
+      expect(wrapper.vm.val).to.equal('from config')
+    }
+  )
+
   itDoNotRunIf(
     !injectSupported,
     'provides function which is injected by mounted component',