From 7debc306d67dcc6b2f63712f3e9c48834d0494d9 Mon Sep 17 00:00:00 2001
From: pimlie <pimlie@hotmail.com>
Date: Tue, 8 Oct 2019 16:47:01 +0200
Subject: [PATCH 1/2] chore: ignore isServer for coverage

---
 src/shared/mixin.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/shared/mixin.js b/src/shared/mixin.js
index 517ce570..255693c3 100644
--- a/src/shared/mixin.js
+++ b/src/shared/mixin.js
@@ -135,6 +135,7 @@ export default function createMixin (Vue, options) {
 
       // do not trigger refresh on the server side
       if (this.$isServer) {
+        /* istanbul ignore next */
         return
       }
 

From c466065b3e752e90bbecea67b7dfff0d69492a36 Mon Sep 17 00:00:00 2001
From: pimlie <pimlie@hotmail.com>
Date: Tue, 8 Oct 2019 16:48:14 +0200
Subject: [PATCH 2/2] fix: still traverse children when metainfo doesnt return
 object

---
 src/shared/getComponentOption.js      | 11 ++++-----
 test/unit/getComponentOptions.test.js | 33 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/shared/getComponentOption.js b/src/shared/getComponentOption.js
index 631cd76e..b874f5b6 100644
--- a/src/shared/getComponentOption.js
+++ b/src/shared/getComponentOption.js
@@ -40,13 +40,12 @@ export function getComponentOption (options, component, result) {
     // because Vue caches those internally
     const data = $metaInfo || $options[keyName]
 
-    // ignore data if its not an object, then we keep our previous result
-    if (!isObject(data)) {
-      return result
+    // only merge data with result when its an object
+    // eg it could be a function when metaInfo() returns undefined
+    // dueo to the or statement above
+    if (isObject(data)) {
+      result = merge(result, data, options)
     }
-
-    // merge with existing options
-    result = merge(result, data, options)
   }
 
   // collect & aggregate child options if deep = true
diff --git a/test/unit/getComponentOptions.test.js b/test/unit/getComponentOptions.test.js
index d902d0d9..57816c84 100644
--- a/test/unit/getComponentOptions.test.js
+++ b/test/unit/getComponentOptions.test.js
@@ -130,4 +130,37 @@ describe('getComponentOption', () => {
     expect(inMetaInfoBranch(wrapper.vm.$children[1].$children[0])).toBe(true)
     expect(inMetaInfoBranch(wrapper.vm.$children[2])).toBe(false)
   })
+
+  test('retrieves child options even if parent returns null', () => {
+    const localVue = loadVueMetaPlugin({ keyName: 'foo' })
+
+    localVue.component('meta-child', {
+      foo: { bar: 'baz' },
+      render (h) {
+        return h('div', this.$slots.default)
+      }
+    })
+
+    localVue.component('nometa-child', {
+      render (h) {
+        return h('div', this.$slots.default)
+      }
+    })
+
+    const component = localVue.component('parent', {
+      foo: () => {},
+      render: h => h('div', null, [
+        h('meta-child')
+      ])
+    })
+
+    const wrapper = mount(component, { localVue })
+
+    const mergedOption = getComponentOption({ keyName: 'foo' }, wrapper.vm)
+
+    expect(mergedOption).toEqual({ bar: 'baz' })
+    expect(wrapper.vm.$children[0]._vueMeta).toBe(true)
+
+    expect(inMetaInfoBranch(wrapper.vm.$children[0])).toBe(true)
+  })
 })