test: update mount specs

Author: lmiller1990

test/specs/create-wrapper.spec.js

@@ -9,8 +9,8 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'mount', () => {
     const vm = new Constructor().$mount()
     const wrapper = createWrapper(vm)
     expect(wrapper.is(Component)).toEqual(true)
-    expect(wrapper).instanceof(Wrapper)
-    expect(wrapper.findAll('div')).instanceof(WrapperArray)
+    expect(wrapper).toBeInstanceOf(Wrapper)
+    expect(wrapper.findAll('div')).toBeInstanceOf(WrapperArray)
   })
 
   it('handles HTMLElement', () => {

test/specs/mount.spec.js

@@ -122,13 +122,12 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'mount', () => {
   )
 
   it('does not use cached component', () => {
-    jest.fn()(ComponentWithMixin.methods, 'someMethod')
+    ComponentWithMixin.methods.someMethod = jest.fn()
     mount(ComponentWithMixin)
-    expect(ComponentWithMixin.methods.someMethod.callCount).toEqual(1)
-    ComponentWithMixin.methods.someMethod.restore()
-    jest.fn()(ComponentWithMixin.methods, 'someMethod')
+    expect(ComponentWithMixin.methods.someMethod).toHaveBeenCalledTimes(1)
+    ComponentWithMixin.methods.someMethod = jest.fn()
     mount(ComponentWithMixin)
-    expect(ComponentWithMixin.methods.someMethod.callCount).toEqual(1)
+    expect(ComponentWithMixin.methods.someMethod).toHaveBeenCalledTimes(1)
   })
 
   it('throws an error if window is undefined', () => {
@@ -188,32 +187,7 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'mount', () => {
       }
     }).vm.callStub()
 
-    expect(stub).not.called
-  })
-
-  it.skip('overrides component prototype', () => {
-    const mountSpy = sandbox.spy()
-    const destroySpy = sandbox.spy()
-    const Component = Vue.extend({})
-    const {
-      $mount: originalMount,
-      $destroy: originalDestroy
-    } = Component.prototype
-    Component.prototype.$mount = function(...args) {
-      originalMount.apply(this, args)
-      mountSpy()
-      return this
-    }
-    Component.prototype.$destroy = function() {
-      originalDestroy.apply(this)
-      destroySpy()
-    }
-
-    const wrapper = mount(Component)
-    expect(mountSpy).called
-    expect(destroySpy).not.called
-    wrapper.destroy()
-    expect(destroySpy).called
+    expect(stub).not.toHaveBeenCalled()
   })
 
   // Problems accessing options of twice extended components in Vue < 2.3

test/specs/shallow-mount.spec.js

@@ -15,6 +15,21 @@ import { vueVersion } from '~resources/utils'
 import { describeRunIf, itDoNotRunIf } from 'conditional-specs'
 
 describeRunIf(process.env.TEST_ENV !== 'node', 'shallowMount', () => {
+  let consoleInfoSave = console.info
+  let consoleErrorSave = console.error
+
+  beforeEach(() => {
+    consoleInfoSave = console.info
+    consoleErrorSave = console.error
+    console.info = jest.fn()
+    console.error = jest.fn()
+  })
+
+  afterEach(() => {
+    console.info = consoleInfoSave
+    console.error = consoleErrorSave
+  })
+
   it('renders dynamic class of functional child', () => {
     const wrapper = shallowMount(ComponentWithFunctionalChild)
     expect(wrapper.find('functional-component-stub').classes()).toContain(
@@ -58,7 +73,7 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'shallowMount', () => {
     localVue.component('registered-component', ComponentWithLifecycleHooks)
     mount(TestComponent, { localVue })
 
-    expect(console.info.callCount).toEqual(4)
+    expect(console.info).toHaveBeenCalledTimes(4)
   })
 
   it('renders children', () => {
@@ -167,7 +182,7 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'shallowMount', () => {
     shallowMount(Component)
     mount(Component)
 
-    expect(console.info.callCount).toEqual(4)
+    expect(console.info).toHaveBeenCalledTimes(4)
   })
 
   itDoNotRunIf(
@@ -192,7 +207,9 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'shallowMount', () => {
         }
       }
       shallowMount(TestComponent)
-      expect(console.error).not.calledWith(sandbox.match('[Vue warn]'))
+      expect(console.error).not.toHaveBeenCalledWith(
+        expect.stringMatching('[Vue warn]')
+      )
     }
   )
 
@@ -297,12 +314,14 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'shallowMount', () => {
     }
     const wrapper = shallowMount(TestComponent)
     expect(wrapper.html()).toContain('<test-component-stub>')
-    expect(console.error).not.calledWith('[Vue warn]')
+    expect(console.error).not.toHaveBeenCalledWith(
+      expect.stringMatching('[Vue warn]')
+    )
   })
 
   it('does not call stubbed children lifecycle hooks', () => {
     shallowMount(ComponentWithNestedChildren)
-    expect(console.info.called).toEqual(false)
+    expect(console.info).not.toHaveBeenCalled()
   })
 
   it('stubs extended components', () => {
@@ -591,8 +610,8 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'shallowMount', () => {
       }
       shallowMount(TestComponent)
       mount(TestComponent)
-      expect(console.error).not.calledWith(
-        sandbox.match('Unknown custom element')
+      expect(console.error).not.toHaveBeenCalledWith(
+        expect.stringMatching('Unknown custom element')
       )
     }
   )