fix: improve slots mounting option

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

@@ -2,7 +2,7 @@
 
 import { throwError } from 'shared/util'
 import { validateSlots } from './validate-slots'
-import { createSlotVNodes } from './add-slots'
+import { createSlotVNodes } from './create-slot-vnodes'
 
 export default function createFunctionalComponent (
   component: Component,

packages/create-instance/create-instance.js

@@ -1,9 +1,9 @@
 // @flow
 
-import { createSlotVNodes } from './add-slots'
 import addMocks from './add-mocks'
 import { addEventLogger } from './log-events'
 import { createComponentStubs } from 'shared/stub-components'
+import { createSlotVNodes } from './create-slot-vnodes'
 import { throwError, warn, vueVersion } from 'shared/util'
 import { compileTemplate } from 'shared/compile-template'
 import extractInstanceOptions from './extract-instance-options'

packages/create-instance/create-render-slot.js

@@ -0,0 +1,62 @@
+// @flow
+
+import Vue from 'vue'
+import { compileToFunctions } from 'vue-template-compiler'
+
+const _renderSlot = Vue.prototype._t
+
+function createVNodes (
+  vm: Component,
+  slotValue: Component | string
+): ?Array<VNode> {
+  if (typeof slotValue === 'string') {
+    const compiledResult = compileToFunctions(`<div>${slotValue}{{ }}</div>`)
+    const _staticRenderFns = vm._renderProxy.$options.staticRenderFns
+    vm._renderProxy.$options.staticRenderFns = compiledResult.staticRenderFns
+    const vnodes = compiledResult.render.call(
+      vm._renderProxy, vm.$createElement
+    ).children
+    vm._renderProxy.$options.staticRenderFns = _staticRenderFns
+    return vnodes
+  }
+  return [vm.$createElement(slotValue)]
+}
+
+export default function createRenderSlot (
+  options: Object
+): (
+  name: string,
+  fallback: ?Array<VNode>,
+  props: ?Object,
+  bindObject: ?Object
+) => ?Array<VNode> {
+  return function renderSlot (
+    name: string,
+    fallback: ?Array<VNode>,
+    props: ?Object,
+    bindObject: ?Object
+  ): ?Array<VNode> {
+    if (options.slots && options.slots[name]) {
+      this.$slots[name] = []
+      const slotsValue = options.slots[name]
+      if (Array.isArray(slotsValue)) {
+        slotsValue.forEach((value) => {
+          if (typeof value === 'string') {
+            const slots = createVNodes(this, value)
+            if (Array.isArray(slots)) {
+              this.$slots[name].push(...slots)
+            }
+          } else {
+            this.$slots[name].push(this.$createElement(value))
+          }
+        })
+      } else {
+        const slots = createVNodes(this, slotsValue)
+        if (Array.isArray(slots)) {
+          this.$slots[name] = slots
+        }
+      }
+    }
+    return _renderSlot.call(this, name, fallback, props, bindObject)
+  }
+}

packages/create-instance/index.js

@@ -0,0 +1,6 @@
+// @flow
+
+import createInstance from './create-instance'
+import createRenderSlot from './create-render-slot'
+
+export { createInstance, createRenderSlot }

packages/create-instance/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-instance",
   "version": "1.0.0-beta.20",
-  "main": "create-instance.js",
+  "main": "index.js",
   "private": true
 }

packages/server-test-utils/src/renderToString.js

@@ -1,7 +1,7 @@
 // @flow
 
 import Vue from 'vue'
-import createInstance from 'create-instance'
+import { createInstance, createRenderSlot } from 'create-instance'
 import { throwError } from 'shared/util'
 import { createRenderer } from 'vue-server-renderer'
 import testUtils from '@vue/test-utils'
@@ -29,6 +29,8 @@ export default function renderToString (
     throwError(`you cannot use attachToDocument with ` + `renderToString`)
   }
   const vueConstructor = testUtils.createLocalVue(options.localVue)
+  vueConstructor.prototype._t = createRenderSlot(options)
+
   const vm = createInstance(
     component,
     mergeOptions(options, config),

packages/test-utils/src/mount.js

@@ -4,14 +4,14 @@ import './matches-polyfill'
 import './object-assign-polyfill'
 import Vue from 'vue'
 import VueWrapper from './vue-wrapper'
-import createInstance from 'create-instance'
 import createElement from './create-element'
 import createLocalVue from './create-local-vue'
 import errorHandler from './error-handler'
 import { findAllVueComponentsFromVm } from './find-vue-components'
 import { mergeOptions } from 'shared/merge-options'
 import config from './config'
 import warnIfNoWindow from './warn-if-no-window'
+import { createInstance, createRenderSlot } from 'create-instance'
 
 Vue.config.productionTip = false
 Vue.config.devtools = false
@@ -28,6 +28,7 @@ export default function mount (
   // Remove cached constructor
   delete component._Ctor
   const vueConstructor = createLocalVue(options.localVue)
+  vueConstructor.prototype._t = createRenderSlot(options)
 
   const elm = options.attachToDocument ? createElement() : undefined
 

test/resources/components/component-with-parent-name.vue

@@ -0,0 +1,17 @@
+i<template>
+  <div foo="bar"><span baz="qux">{{ quux }}</span></div>
+</template>
+
+<script>
+export default{
+  name: 'component-with-parent-name',
+  data () {
+    return {
+      quux: 'quux'
+    }
+  },
+  mounted () {
+    this.$parent.childName = this.$options.name
+  }
+}
+</script>

test/specs/mounting-options/slots.spec.js

@@ -2,8 +2,10 @@ import { compileToFunctions } from 'vue-template-compiler'
 import Component from '~resources/components/component.vue'
 import ComponentWithSlots from '~resources/components/component-with-slots.vue'
 import ComponentAsAClass from '~resources/components/component-as-a-class.vue'
+import ComponentWithParentName from '~resources/components/component-with-parent-name.vue'
 import { describeWithMountingMethods, vueVersion } from '~resources/utils'
 import { itSkipIf, itDoNotRunIf } from 'conditional-specs'
+import { mount, createLocalVue } from '~vue/test-utils'
 
 describeWithMountingMethods('options.slots', mountingMethod => {
   it('mounts component with default slot if passed component in slot object', () => {
@@ -224,14 +226,16 @@ describeWithMountingMethods('options.slots', mountingMethod => {
   it('mounts component with text slot', () => {
     const wrapper = mountingMethod(ComponentWithSlots, {
       slots: {
-        default: 'hello,',
-        header: 'world'
+        header: 'hello,',
+        default: 'world'
       }
     })
     if (mountingMethod.name === 'renderToString') {
-      expect(wrapper).contains('hello,world')
+      expect(wrapper).contains('hello,')
+      expect(wrapper).contains('world')
     } else {
-      expect(wrapper.text()).to.contain('hello,world')
+      expect(wrapper.find('header').text()).to.equal('hello,')
+      expect(wrapper.find('main').text()).to.equal('world')
     }
   })
 
@@ -546,4 +550,58 @@ describeWithMountingMethods('options.slots', mountingMethod => {
       wrapper.find('div').trigger('click')
     }
   )
+
+  itDoNotRunIf(
+    mountingMethod.name === 'renderToString',
+    'mounts component with default slot if passed string in slot object',
+    () => {
+      const wrapper1 = mount(ComponentWithSlots, { slots: { default: 'foo<span>123</span>{{ foo }}' }})
+      expect(wrapper1.find('main').html()).to.equal('<main>foo<span>123</span>bar</main>')
+      const wrapper2 = mount(ComponentWithSlots, { slots: { default: '<p>1</p>{{ foo }}2' }})
+      expect(wrapper2.find('main').html()).to.equal('<main><p>1</p>bar2</main>')
+      const wrapper3 = mount(ComponentWithSlots, { slots: { default: '<p>1</p>{{ foo }}<p>2</p>' }})
+      expect(wrapper3.find('main').html()).to.equal('<main><p>1</p>bar<p>2</p></main>')
+      const wrapper4 = mount(ComponentWithSlots, { slots: { default: '123' }})
+      expect(wrapper4.find('main').html()).to.equal('<main>123</main>')
+      const wrapper5 = mount(ComponentWithSlots, { slots: { default: '1{{ foo }}2' }})
+      expect(wrapper5.find('main').html()).to.equal('<main>1bar2</main>')
+      wrapper5.trigger('keydown')
+      expect(wrapper5.find('main').html()).to.equal('<main>1BAR2</main>')
+      const wrapper6 = mount(ComponentWithSlots, { slots: { default: '<p>1</p><p>2</p>' }})
+      expect(wrapper6.find('main').html()).to.equal('<main><p>1</p><p>2</p></main>')
+      const wrapper7 = mount(ComponentWithSlots, { slots: { default: '1<p>2</p>3' }})
+      expect(wrapper7.find('main').html()).to.equal('<main>1<p>2</p>3</main>')
+    }
+  )
+
+  itDoNotRunIf(
+    mountingMethod.name === 'renderToString',
+    'sets a component which can access the parent component',
+    () => {
+      const localVue = createLocalVue()
+      localVue.prototype.bar = 'FOO'
+      const wrapperComponent = mount(
+        {
+          name: 'parentComponent',
+          template: '<div><slot /></div>',
+          data () {
+            return {
+              childName: ''
+            }
+          }
+        },
+        {
+          components: {
+            ComponentWithParentName
+          },
+          slots: {
+            default: '<component-with-parent-name :foo="bar" />'
+          },
+          localVue
+        }
+      )
+      expect(wrapperComponent.vm.childName).to.equal('component-with-parent-name')
+      expect(wrapperComponent.html()).to.equal('<div><div foo="FOO"><span baz="qux">quux</span></div></div>')
+    }
+  )
 })