chore: Move enableAutoDestroy() to separate module

Author: winniehell

packages/test-utils/src/auto-destroy.js

@@ -0,0 +1,27 @@
+// @flow
+
+import { throwError } from 'shared/util'
+import Wrapper from './wrapper'
+
+let wrapperInstances: Array<Wrapper>
+
+export function enableAutoDestroy(hook: (() => void) => void) {
+  if (wrapperInstances) {
+    throwError('enableAutoDestroy cannot be called more than once')
+  }
+
+  wrapperInstances = []
+
+  hook(() => {
+    wrapperInstances.forEach((wrapper: Wrapper) => {
+      wrapper.destroy()
+    })
+    wrapperInstances = []
+  })
+}
+
+export function trackInstance(wrapper: Wrapper) {
+  if (!wrapperInstances) return
+
+  wrapperInstances.push(wrapper)
+}

packages/test-utils/src/create-wrapper.js

@@ -3,16 +3,22 @@
 import Vue from 'vue'
 import Wrapper from './wrapper'
 import VueWrapper from './vue-wrapper'
+import { trackInstance } from './auto-destroy'
 
 export default function createWrapper(
   node: VNode | Component,
   options: WrapperOptions = {}
 ): VueWrapper | Wrapper {
   const componentInstance = node.child
   if (componentInstance) {
-    return new VueWrapper(componentInstance, options)
+    const wrapper = new VueWrapper(componentInstance, options)
+    trackInstance(wrapper)
+    return wrapper
   }
-  return node instanceof Vue
-    ? new VueWrapper(node, options)
-    : new Wrapper(node, options)
+  const wrapper =
+    node instanceof Vue
+      ? new VueWrapper(node, options)
+      : new Wrapper(node, options)
+  trackInstance(wrapper)
+  return wrapper
 }

packages/test-utils/src/index.js

@@ -1,9 +1,10 @@
 import shallowMount from './shallow-mount'
 import mount from './mount'
+import { enableAutoDestroy } from './auto-destroy'
 import createLocalVue from './create-local-vue'
 import RouterLinkStub from './components/RouterLinkStub'
 import createWrapper from './create-wrapper'
-import Wrapper, { enableAutoDestroy } from './wrapper'
+import Wrapper from './wrapper'
 import WrapperArray from './wrapper-array'
 import config from './config'
 import { warn } from 'shared/util'

packages/test-utils/src/wrapper.js

@@ -25,7 +25,6 @@ export default class Wrapper implements BaseWrapper {
   isFunctionalComponent: boolean
   rootNode: VNode | Element
   selector: Selector | void
-  static _instances: ?Array<Wrapper>
 
   constructor(
     node: VNode | Element,
@@ -69,10 +68,6 @@ export default class Wrapper implements BaseWrapper {
     ) {
       this.isFunctionalComponent = true
     }
-
-    if (Wrapper._instances) {
-      Wrapper._instances.push(this)
-    }
   }
 
   at(): void {
@@ -608,23 +603,3 @@ export default class Wrapper implements BaseWrapper {
     this.element.dispatchEvent(event)
   }
 }
-
-export const enableAutoDestroy = (hook: Function) => {
-  if (Wrapper._instances) {
-    throwError('enableAutoDestroy cannot be called more than once')
-  }
-
-  Wrapper._instances = []
-
-  hook(() => {
-    const { _instances } = Wrapper
-    if (!_instances) {
-      return
-    }
-
-    while (_instances.length > 0) {
-      const wrapper = _instances.pop()
-      wrapper.destroy()
-    }
-  })
-}

test/specs/wrapper.spec.js

@@ -1,5 +1,5 @@
 import { describeWithShallowAndMount } from '~resources/utils'
-import { Wrapper, enableAutoDestroy } from '~vue/test-utils'
+import { enableAutoDestroy } from '~vue/test-utils'
 
 describeWithShallowAndMount('Wrapper', mountingMethod => {
   ;['vnode', 'element', 'vm', 'options'].forEach(property => {
@@ -20,10 +20,6 @@ describeWithShallowAndMount('Wrapper', mountingMethod => {
   describe('enableAutoDestroy', () => {
     const sandbox = sinon.createSandbox()
 
-    beforeEach(() => {
-      Wrapper._instances = undefined
-    })
-
     it('calls the hook function', () => {
       const hookSpy = sandbox.spy()