From 79feb580c860bc85b8e9a46ceac2a7970b895b7b Mon Sep 17 00:00:00 2001
From: eddyerburgh <edward.yerburgh@gmail.com>
Date: Sun, 20 May 2018 20:37:34 +0100
Subject: [PATCH 1/3] feat: support component as slot string

---
 packages/create-instance/add-slots.js     | 16 +-------------
 test/specs/mounting-options/slots.spec.js | 26 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/packages/create-instance/add-slots.js b/packages/create-instance/add-slots.js
index 9b802ceaf..e47a242a4 100644
--- a/packages/create-instance/add-slots.js
+++ b/packages/create-instance/add-slots.js
@@ -4,16 +4,6 @@ import { compileToFunctions } from 'vue-template-compiler'
 import { throwError } from 'shared/util'
 import { validateSlots } from './validate-slots'
 
-function isSingleElement (slotValue: string): boolean {
-  const _slotValue = slotValue.trim()
-  if (_slotValue[0] !== '<' || _slotValue[_slotValue.length - 1] !== '>') {
-    return false
-  }
-  const domParser = new window.DOMParser()
-  const _document = domParser.parseFromString(slotValue, 'text/html')
-  return _document.body.childElementCount === 1
-}
-
 // see https://github.com/vuejs/vue-test-utils/pull/274
 function createVNodes (vm: Component, slotValue: string) {
   const compiledResult = compileToFunctions(`<div>${slotValue}{{ }}</div>`)
@@ -40,11 +30,7 @@ function addSlotToVm (vm: Component, slotName: string, slotValue: SlotValue): vo
   let elem
   if (typeof slotValue === 'string') {
     validateEnvironment()
-    if (isSingleElement(slotValue)) {
-      elem = vm.$createElement(compileToFunctions(slotValue))
-    } else {
-      elem = createVNodes(vm, slotValue)
-    }
+    elem = createVNodes(vm, slotValue)
   } else {
     elem = vm.$createElement(slotValue)
   }
diff --git a/test/specs/mounting-options/slots.spec.js b/test/specs/mounting-options/slots.spec.js
index ab6dab1bc..f60254953 100644
--- a/test/specs/mounting-options/slots.spec.js
+++ b/test/specs/mounting-options/slots.spec.js
@@ -36,6 +36,32 @@ describeWithMountingMethods('options.slots', (mountingMethod) => {
     }
   })
 
+  itDoNotRunIf(mountingMethod.name === 'shallowMount',
+    'mounts component with default slot if passed component as string in slot object', () => {
+      const CustomComponent = {
+        render: h => h('time')
+      }
+      const TestComponent = {
+        template: '<div><slot /></div>',
+        components: {
+          'custom-component': CustomComponent
+        }
+      }
+      const wrapper = mountingMethod(TestComponent, {
+        slots: {
+          default: '<custom-component />'
+        },
+        components: {
+          'custom-component': CustomComponent
+        }
+      })
+      if (mountingMethod.name === 'renderToString') {
+        expect(wrapper).contains('<time>')
+      } else {
+        expect(wrapper.contains('time')).to.equal(true)
+      }
+    })
+
   it('mounts component with default slot if passed component in array in slot object', () => {
     const wrapper = mountingMethod(ComponentWithSlots, { slots: { default: [Component] }})
     if (mountingMethod.name === 'renderToString') {

From f6ac90e2880d25fcd009cdbbe0b993af041da4e0 Mon Sep 17 00:00:00 2001
From: eddyerburgh <edward.yerburgh@gmail.com>
Date: Sun, 20 May 2018 20:44:26 +0100
Subject: [PATCH 2/3] feat: add support for string components in slots

---
 test/specs/mounting-options/slots.spec.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/specs/mounting-options/slots.spec.js b/test/specs/mounting-options/slots.spec.js
index f60254953..cc4335982 100644
--- a/test/specs/mounting-options/slots.spec.js
+++ b/test/specs/mounting-options/slots.spec.js
@@ -36,7 +36,10 @@ describeWithMountingMethods('options.slots', (mountingMethod) => {
     }
   })
 
-  itDoNotRunIf(mountingMethod.name === 'shallowMount',
+  itDoNotRunIf(
+    mountingMethod.name === 'shallowMount' ||
+    isRunningPhantomJS ||
+    process.env.TEST_ENV === 'node',
     'mounts component with default slot if passed component as string in slot object', () => {
       const CustomComponent = {
         render: h => h('time')

From 71fb744a42099f86e6dee7b5e4197e1908072556 Mon Sep 17 00:00:00 2001
From: eddyerburgh <edward.yerburgh@gmail.com>
Date: Sun, 20 May 2018 21:18:48 +0100
Subject: [PATCH 3/3] fix: add staticTrees array

---
 packages/create-instance/create-instance.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/create-instance/create-instance.js b/packages/create-instance/create-instance.js
index 49cc0889b..3b807ab7d 100644
--- a/packages/create-instance/create-instance.js
+++ b/packages/create-instance/create-instance.js
@@ -86,6 +86,9 @@ export default function createInstance (
 
   const vm = new Constructor(instanceOptions)
 
+  // Workaround for Vue < 2.5
+  vm._staticTrees = []
+
   addAttrs(vm, options.attrs)
   addListeners(vm, options.listeners)