refactor: cleanup merge logic and fix failing tests

Author: dobromir-hristov

src/utils.ts

@@ -2,30 +2,26 @@ import { GlobalMountOptions } from './types'
 
 const isString = (val: unknown): val is string => typeof val === 'string'
 
+function mergeStubs(target, source) {
+  if (source.stubs) {
+    if (Array.isArray(source.stubs)) {
+      source.stubs.forEach((x) => (target[x] = true))
+    } else {
+      for (const [k, v] of Object.entries(source.stubs)) {
+        target[k] = v
+      }
+    }
+  }
+}
+
 function mergeGlobalProperties(
   configGlobal: GlobalMountOptions = {},
   mountGlobal: GlobalMountOptions = {}
 ): GlobalMountOptions {
   const stubs: Record<string, any> = {}
-  if (configGlobal.stubs) {
-    if (Array.isArray(configGlobal.stubs)) {
-      configGlobal.stubs.forEach((x) => (stubs[x] = true))
-    } else {
-      for (const [k, v] of Object.entries(configGlobal.stubs)) {
-        stubs[k] = v
-      }
-    }
-  }
 
-  if (mountGlobal.stubs) {
-    if (mountGlobal.stubs && Array.isArray(mountGlobal.stubs)) {
-      mountGlobal.stubs.forEach((x) => (stubs[x] = true))
-    } else {
-      for (const [k, v] of Object.entries(mountGlobal.stubs)) {
-        stubs[k] = v
-      }
-    }
-  }
+  mergeStubs(stubs, configGlobal)
+  mergeStubs(stubs, mountGlobal)
 
   return {
     mixins: [...(configGlobal.mixins || []), ...(mountGlobal.mixins || [])],

tests/config.spec.ts

@@ -109,32 +109,22 @@ describe('config', () => {
   })
 
   describe('provide', () => {
-    it('sets a provide everywhere', () => {
-      config.global.provide = {
-        theme: 'dark'
-      }
-      const Comp = {
-        setup() {
-          const theme = inject('theme')
-          return () => h('div', theme)
-        }
+    config.global.provide = {
+      theme: 'dark'
+    }
+    const Comp = {
+      setup() {
+        const theme = inject('theme')
+        return () => h('div', theme)
       }
+    }
 
+    it('sets a provide everywhere', () => {
       const wrapper = mount(Comp)
       expect(wrapper.html()).toContain('dark')
     })
 
     it('overrides with a local provide', () => {
-      config.global.provide = {
-        theme: 'dark'
-      }
-      const Comp = {
-        setup() {
-          const theme = inject('theme')
-          return () => h('div', theme)
-        }
-      }
-
       const wrapper = mount(Comp, {
         global: {
           provide: {
@@ -202,30 +192,25 @@ describe('config', () => {
       }
     }
 
-    it('sets a stub globally', () => {
+    beforeEach(() => {
       config.global.stubs = {
         Foo: {
+          name: 'Foo',
           render() {
-            return h('div', 'foo stub')
+            return h('div', 'config foo stub')
           }
         }
       }
+    })
 
+    it('sets a stub globally', () => {
       const wrapper = mount(Component)
 
       // once on root, once in the mounted component
-      expect(wrapper.html()).toContain('foo stub')
+      expect(wrapper.html()).toContain('config foo stub')
     })
 
-    xit('overrides config stub with locally defined stub', () => {
-      config.global.stubs = {
-        Foo: {
-          render() {
-            return h('div', 'config foo stub')
-          }
-        }
-      }
-
+    it('overrides config stub with locally defined stub', () => {
       const wrapper = mount(Component, {
         global: {
           stubs: {