refactor: tidy up (#2036)

Author: Simon-He95

packages/shared/validators.js

@@ -33,7 +33,7 @@ export function isVueComponent(c: any): boolean {
     return true
   }
 
-  if (c === null || typeof c !== 'object') {
+  if (!isPlainObject(c)) {
     return false
   }
 
@@ -63,7 +63,7 @@ export function componentNeedsCompiling(component: Component): boolean {
 
 export function isRefSelector(refOptionsObject: any): boolean {
   if (
-    typeof refOptionsObject !== 'object' ||
+    !isPlainObject(refOptionsObject) ||
     Object.keys(refOptionsObject || {}).length !== 1
   ) {
     return false
@@ -73,7 +73,7 @@ export function isRefSelector(refOptionsObject: any): boolean {
 }
 
 export function isNameSelector(nameOptionsObject: any): boolean {
-  if (typeof nameOptionsObject !== 'object' || nameOptionsObject === null) {
+  if (!isPlainObject(nameOptionsObject)) {
     return false
   }
 
@@ -89,7 +89,7 @@ export function isDynamicComponent(c: any) {
 }
 
 export function isComponentOptions(c: any) {
-  return c !== null && typeof c === 'object' && (c.template || c.render)
+  return isPlainObject(c) && (c.template || c.render)
 }
 
 export function isFunctionalComponent(c: any) {

packages/test-utils/src/wrapper.js

@@ -19,6 +19,7 @@ import {
   warnDeprecated,
   isVueWrapper
 } from 'shared/util'
+import { isPlainObject } from 'shared/validators'
 import { isElementVisible } from 'shared/is-visible'
 import find from './find'
 import createWrapper from './create-wrapper'
@@ -719,8 +720,7 @@ export default class Wrapper implements BaseWrapper {
     Object.keys(data).forEach(key => {
       // Don't let people set entire objects, because reactivity won't work
       if (
-        typeof data[key] === 'object' &&
-        data[key] !== null &&
+        isPlainObject(data[key]) &&
         // $FlowIgnore : Problem with possibly null this.vm
         data[key] === this.vm[key]
       ) {