remove replaceBindingComponent()

Author: 38elements

Diff for: packages/test-utils/src/find-vue-components.js

@@ -90,20 +90,7 @@ export function vmFunctionalCtorMatchesSelector (
   return Ctors.some(c => Ctor[c] === component[FUNCTIONAL_OPTIONS]._Ctor[c])
 }
 
-export function findVueComponentByElement (
-  vm: Component,
-  elem: Element
-): ?Component {
-  const components = findAllVueComponentsFromVm(vm)
-  for (let i = 0, max = components.length; i < max; i++) {
-    const component = components[i]
-    if (component.$el === elem) {
-      return component
-    }
-  }
-}
-
-export function findVueComponents (
+export default function findVueComponents (
   root: Component,
   selectorType: ?string,
   selector: Object

Diff for: packages/test-utils/src/find.js

@@ -1,28 +1,13 @@
 // @flow
 
 import findVnodes from './find-vnodes'
-import {
-  findVueComponents,
-  findVueComponentByElement
-} from './find-vue-components'
+import findVueComponents from './find-vue-components'
 import findDOMNodes from './find-dom-nodes'
 import { COMPONENT_SELECTOR, NAME_SELECTOR, DOM_SELECTOR } from './consts'
 import Vue from 'vue'
 import getSelectorTypeOrThrow from './get-selector-type'
 import { throwError } from 'shared/util'
 
-// Returns a component if the element binds a Vue instance.
-function replaceBindingComponent (vnode: VNode): VNode | Component {
-  if (vnode.elm && vnode.elm.__vue__) {
-    const component =
-      findVueComponentByElement(vnode.elm.__vue__.$root, vnode.elm)
-    if (component) {
-      return component
-    }
-  }
-  return vnode
-}
-
 export default function find (
   vm: Component | null,
   vnode: VNode | null,
@@ -58,14 +43,11 @@ export default function find (
 
   if (vnode) {
     const nodes = findVnodes(vnode, vm, selectorType, selector)
-      .map(replaceBindingComponent)
     if (selectorType !== DOM_SELECTOR) {
       return nodes
     }
     return nodes.length > 0 ? nodes : findDOMNodes(element, selector)
-      .map(replaceBindingComponent)
   }
 
   return findDOMNodes(element, selector)
-    .map(replaceBindingComponent)
 }

Diff for: packages/test-utils/src/wrapper.js

@@ -325,7 +325,7 @@ export default class Wrapper implements BaseWrapper {
     }
     // Using CSS Selector, returns a VueWrapper instance if the root element
     // binds a Vue instance.
-    if (nodes[0].$el === this.element && nodes[0].$parent === undefined) {
+    if (nodes[0].elm === this.element) {
       return this
     }
     return createWrapper(nodes[0], this.options)
@@ -341,7 +341,7 @@ export default class Wrapper implements BaseWrapper {
     const wrappers = nodes.map(node => {
       // Using CSS Selector, returns a VueWrapper instance if the root element
       // binds a Vue instance.
-      return node.$el === this.element && node.$parent === undefined
+      return node.elm === this.element
         ? this
         : createWrapper(node, this.options)
     })

Diff for: test/specs/wrapper/trigger.spec.js

@@ -164,7 +164,9 @@ describeWithShallowAndMount('trigger', mountingMethod => {
     const fn = () => p.trigger('click')
     const message =
       '[vue-test-utils]: cannot call wrapper.trigger() on a wrapper without an element'
-    expect(fn).to.throw().with.property('message', message)
+    expect(fn)
+      .to.throw()
+      .with.property('message', message)
   })
 
   it('throws an error if type is not a string', () => {