Merge branch 'master' into dependabot/npm_and_yarn/acorn-6.4.1

Author: lmiller1990

src/dom-wrapper.ts

@@ -50,14 +50,23 @@ export class DOMWrapper<ElementType extends Element> implements WrapperAPI {
     return new ErrorWrapper({ selector })
   }
 
+  get<T extends Element>(selector: string): DOMWrapper<T> {
+    const result = this.find<T>(selector)
+    if (result instanceof ErrorWrapper) {
+      throw new Error(`Unable to find ${selector} within: ${this.html()}`)
+    }
+
+    return result
+  }
+
   findAll<T extends Element>(selector: string): DOMWrapper<T>[] {
     return Array.from(this.element.querySelectorAll<T>(selector)).map(
       (x) => new DOMWrapper(x)
     )
   }
 
   private async setChecked(checked: boolean = true) {
-    // typecast so we get typesafety
+    // typecast so we get type safety
     const element = (this.element as unknown) as HTMLInputElement
     const type = this.attributes().type
 
@@ -69,7 +78,7 @@ export class DOMWrapper<ElementType extends Element> implements WrapperAPI {
 
     // we do not want to trigger an event if the user
     // attempting set the same value twice
-    // this is beacuse in a browser setting checked = true when it is
+    // this is because in a browser setting checked = true when it is
     // already true is a no-op; no change event is triggered
     if (checked === element.checked) {
       return

src/emitMixin.ts

@@ -5,13 +5,12 @@ export const createEmitMixin = () => {
 
   const emitMixin = {
     beforeCreate() {
-      const originalEmit = getCurrentInstance().emit
       getCurrentInstance().emit = (event: string, ...args: unknown[]) => {
         events[event]
           ? (events[event] = [...events[event], [...args]])
           : (events[event] = [[...args]])
 
-        return originalEmit.call(getCurrentInstance(), event, ...args)
+        return [event, ...args]
       }
     }
   }

src/vue-wrapper.ts

@@ -79,6 +79,15 @@ export class VueWrapper implements WrapperAPI {
     return new ErrorWrapper({ selector })
   }
 
+  get<T extends Element>(selector: string): DOMWrapper<T> {
+    const result = this.find<T>(selector)
+    if (result instanceof ErrorWrapper) {
+      throw new Error(`Unable to find ${selector} within: ${this.html()}`)
+    }
+
+    return result
+  }
+
   findAll<T extends Element>(selector: string): DOMWrapper<T>[] {
     const results = this.appRootNode.querySelectorAll<T>(selector)
     return Array.from(results).map((x) => new DOMWrapper(x))

tests/emit.spec.ts

@@ -44,7 +44,7 @@ describe('emitted', () => {
     expect(wrapper.emitted().hello[1]).toEqual(['foo', 'bar'])
   })
 
-  it.only('captures events emitted via destructured emit', () => {
+  it.skip('captures events emitted via destructured emit', () => {
     const Component = defineComponent({
       name: 'ContextEmit',
 

tests/get.spec.ts

@@ -0,0 +1,29 @@
+import { defineComponent, h } from 'vue'
+
+import { mount } from '../src'
+
+describe('get', () => {
+  test('returns the element if it exists', () => {
+    const Component = defineComponent({
+      render() {
+        return h('div', {}, [h('span', { id: 'my-span' })])
+      }
+    })
+
+    const wrapper = mount(Component)
+    expect(wrapper.get('#my-span')).not.toBeNull()
+  })
+
+  test('throws if it does not exist', () => {
+    const Component = defineComponent({
+      render() {
+        return h('div', {}, [h('span', { id: 'my-span' })])
+      }
+    })
+
+    const wrapper = mount(Component)
+    expect(() => wrapper.get('#other-span')).toThrowError(
+      'Unable to find #other-span within: <div><span id="my-span"></span></div>'
+    )
+  })
+})