test: fix flow errors

Author: eddyerburgh

flow/options.flow.js

@@ -18,6 +18,25 @@ declare type Options = {
   shouldProxy?: boolean
 }
 
+declare type NormalizedOptions = {
+  attachToDocument?: boolean,
+  propsData?: Object,
+  mocks: Object,
+  methods: { [key: string]: Function },
+  slots?: SlotsObject,
+  scopedSlots?: { [key: string]: string | Function },
+  localVue?: Component,
+  provide?: Object | Function,
+  stubs: { [name: string]: Component | true | string },
+  context?: Object,
+  attrs?: { [key: string]: string },
+  listeners?: { [key: string]: Function | Array<Function> },
+  parentComponent?: Object,
+  logModifiedComponents?: boolean,
+  sync: boolean,
+  shouldProxy?: boolean
+}
+
 declare type SlotValue = Component | string | Array<Component | string>
 
 declare type SlotsObject = { [name: string]: SlotValue }

packages/create-instance/create-instance.js

@@ -41,7 +41,7 @@ function createChildren(vm, h, { slots, context }) {
 
 export default function createInstance(
   component: Component,
-  options: Options,
+  options: NormalizedOptions,
   _Vue: Component
 ): Component {
   const componentOptions = isConstructor(component)

packages/shared/merge-options.js

@@ -1,5 +1,6 @@
 // @flow
 import { normalizeStubs, normalizeProvide } from './normalize'
+import { isPlainObject } from './validators'
 
 function getOption(option, config?: Object): any {
   if (option === false) {
@@ -19,16 +20,27 @@ function getOption(option, config?: Object): any {
   }
 }
 
-export function mergeOptions(options: Options, config: Config): Options {
+function getStubs(stubs, configStubs): Object {
+  const normalizedStubs = normalizeStubs(stubs)
+  const mergedStubs = getOption(normalizedStubs, configStubs)
+  return isPlainObject(mergedStubs) ? mergedStubs : {}
+}
+
+export function mergeOptions(
+  options: Options,
+  config: Config
+): NormalizedOptions {
   const mocks = (getOption(options.mocks, config.mocks): Object)
   const methods = (getOption(options.methods, config.methods): {
     [key: string]: Function
   })
   const provide = (getOption(options.provide, config.provide): Object)
+  const stubs = (getStubs(options.stubs, config.stubs): Object)
+  // $FlowIgnore We know that stubs will be an object
   return {
     ...options,
     provide: normalizeProvide(provide),
-    stubs: getOption(normalizeStubs(options.stubs), config.stubs),
+    stubs,
     mocks,
     methods,
     sync: !!(options.sync || options.sync === undefined)