Skip to content

Commit 86fdc58

Browse files
author
Justin Helmer
committed
fix: update to support new @vue/test-utils
1 parent d9f9336 commit 86fdc58

15 files changed

+47
-48
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"author": "Edd Yerburgh",
3131
"license": "MIT",
3232
"devDependencies": {
33+
"@vue/test-utils": "^1.0.0-beta.25",
3334
"babel-core": "^6.25.0",
3435
"babel-jest": "^20.0.3",
3536
"babel-plugin-istanbul": "^4.1.4",
@@ -49,8 +50,7 @@
4950
"stylus": "^0.54.5",
5051
"typescript": "^2.5.2",
5152
"vue": "^2.4.2",
52-
"vue-template-compiler": "^2.4.2",
53-
"vue-test-utils": "git+https://github.com/vuejs/vue-test-utils.git"
53+
"vue-template-compiler": "^2.4.2"
5454
},
5555
"peerDependencies": {
5656
"babel-core": "^6.25.0 || ^7.0.0-0",

test/FunctionalSFC.spec.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { shallow } from 'vue-test-utils'
1+
import { shallowMount } from '@vue/test-utils'
22
import FunctionalSFC from './resources/FunctionalSFC.vue'
33

44
let wrapper
55
const clickSpy = jest.fn()
66
beforeEach(() => {
7-
wrapper = shallow(FunctionalSFC, {
7+
wrapper = shallowMount(FunctionalSFC, {
88
context: {
99
props: { msg: { id: 1, title: 'foo' }, onClick: clickSpy }
1010
}
@@ -22,12 +22,11 @@ describe('Processes .vue file with functional template', () => {
2222
})
2323

2424
it('is functional', () => {
25-
// note: for new version of @vue/vue-utils we can use wrapper.isFunctionalComponent for this
26-
expect(wrapper.vm._vnode.fnOptions.functional).toBe(true)
25+
expect(wrapper.isFunctionalComponent).toBe(true)
2726
})
2827

2928
it('handles slot', () => {
30-
wrapper = shallow(FunctionalSFC, {
29+
wrapper = shallowMount(FunctionalSFC, {
3130
context: {
3231
props: { msg: { id: 1, title: '' }},
3332
children: ['this is a slot']

test/FunctionalSFCParent.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { mount } from 'vue-test-utils'
1+
import { mount } from '@vue/test-utils'
22
import FunctionalSFCParent from './resources/FunctionalSFCParent.vue'
33

44
test('processes .vue file with functional template from parent', () => {

test/NoScript.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { mount } from 'vue-test-utils'
1+
import { mount } from '@vue/test-utils'
22
import NoScript from './resources/NoScript.vue'
33

44
describe('NoScript', () => {

test/RenderFunction.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { shallow } from 'vue-test-utils'
1+
import { shallowMount } from '@vue/test-utils'
22
import RenderFunction from './resources/RenderFunction.vue'
33

44
test('processes .vue file with no template', () => {
5-
const wrapper = shallow(RenderFunction)
5+
const wrapper = shallowMount(RenderFunction)
66

77
expect(wrapper.is('section')).toBe(true)
88
})

test/TypeScript.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { shallow } from 'vue-test-utils'
1+
import { shallowMount } from '@vue/test-utils'
22
import { resolve } from 'path'
33
import TypeScript from './resources/TypeScript.vue'
44
import jestVue from '../vue-jest'
@@ -10,14 +10,14 @@ beforeEach(() => {
1010
})
1111

1212
test('processes .vue files', () => {
13-
shallow(TypeScript)
13+
shallowMount(TypeScript)
1414
})
1515

1616
test('processes .vue files without .babelrc', () => {
1717
const babelRcPath = resolve(__dirname, '../.babelrc')
1818
const tempPath = resolve(__dirname, '../.renamed')
1919
renameSync(babelRcPath, tempPath)
20-
shallow(TypeScript)
20+
shallowMount(TypeScript)
2121
renameSync(tempPath, babelRcPath)
2222
})
2323

test/coffee.spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { shallow, mount } from 'vue-test-utils'
1+
import { shallowMount, mount } from '@vue/test-utils'
22
import Coffee from './resources/Coffee.vue'
33
import CoffeeScript from './resources/CoffeeScript.vue'
44
import CoffeeES6 from './resources/CoffeeES6.vue'
@@ -20,19 +20,19 @@ describe('Test CoffeeScript - coffee.spec.js', () => {
2020
})
2121

2222
test('processes .vue file with lang set to coffee', () => {
23-
shallow(Coffee)
23+
shallowMount(Coffee)
2424
})
2525

2626
test('processes .vue file with lang set to coffeescript', () => {
27-
shallow(CoffeeScript)
27+
shallowMount(CoffeeScript)
2828
})
2929

3030
test('processes .vue file with lang set to coffee (ES6)', () => {
31-
shallow(CoffeeES6)
31+
shallowMount(CoffeeES6)
3232
})
3333

3434
test('processes .vue file with lang set to coffeescript (ES6)', () => {
35-
shallow(CoffeeScriptES6)
35+
shallowMount(CoffeeScriptES6)
3636
})
3737

3838
test('processes .vue file with lang set to coffeescript (ES6)', () => {

test/css.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { shallow } from 'vue-test-utils'
1+
import { shallowMount } from '@vue/test-utils'
22
import Css from './resources/Css.vue'
33

44
describe('processes .vue file with Css style', () => {
55
let wrapper
66
beforeAll(() => {
7-
wrapper = shallow(Css)
7+
wrapper = shallowMount(Css)
88
})
99

1010
it('should bind from style tags with named module', () => {

test/jade.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { shallow } from 'vue-test-utils'
1+
import { shallowMount } from '@vue/test-utils'
22
import Jade from './resources/Jade.vue'
33

44
test('processes .vue file with jade template', () => {
5-
const wrapper = shallow(Jade)
5+
const wrapper = shallowMount(Jade)
66
expect(wrapper.is('div')).toBe(true)
77
expect(wrapper.classes()).toContain('jade')
88
})

test/less.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { shallow } from 'vue-test-utils'
1+
import { shallowMount } from '@vue/test-utils'
22
import Less from './resources/Less.vue'
33
import LessModule from './resources/LessModule.vue'
44

55
describe('processes .vue file with Less style', () => {
66
it('does not error on less', () => {
7-
const wrapper = shallow(Less)
7+
const wrapper = shallowMount(Less)
88
expect(wrapper.classes()).toContain('testLess')
99
})
1010

1111
it('does not error on less module', () => {
12-
expect(() => shallow(LessModule)).not.toThrow()
12+
expect(() => shallowMount(LessModule)).not.toThrow()
1313
})
1414
})

test/postcss.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { shallow } from 'vue-test-utils'
1+
import { shallowMount } from '@vue/test-utils'
22
import PostCss from './resources/PostCss.vue'
33
import PostCssModule from './resources/PostCssModule.vue'
44

55
describe('processes .vue file with PostCSS style', () => {
66
it('does not error on pcss/postcss', () => {
7-
const wrapper = shallow(PostCss)
7+
const wrapper = shallowMount(PostCss)
88
expect(wrapper.classes()).toContain('testPcss')
99
})
1010

1111
it('does not error on pcss/postcss module', () => {
12-
expect(() => shallow(PostCssModule)).not.toThrow()
12+
expect(() => shallowMount(PostCssModule)).not.toThrow()
1313
})
1414
})

test/pug.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { shallow } from 'vue-test-utils'
1+
import { shallowMount } from '@vue/test-utils'
22
import { resolve } from 'path'
33
import Pug from './resources/Pug.vue'
44
import jestVue from '../vue-jest'
55
import { readFileSync } from 'fs'
66

77
test('processes .vue file with pug template', () => {
8-
const wrapper = shallow(Pug)
8+
const wrapper = shallowMount(Pug)
99
expect(wrapper.is('div')).toBe(true)
1010
expect(wrapper.classes()).toContain('pug')
1111
})

test/sass.spec.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { shallow, mount } from 'vue-test-utils'
1+
import { shallowMount, mount } from '@vue/test-utils'
22
import Sass from './resources/Sass.vue'
33
import SassModule from './resources/SassModule.vue'
44
import SassModuleFunctional from './resources/SassModuleFunctional.vue'
55

66
describe('processes .vue file with sass style', () => {
77
it('does not error on sass', () => {
8-
expect(() => shallow(Sass)).not.toThrow()
8+
expect(() => shallowMount(Sass)).not.toThrow()
99
})
1010
it('does not error on sass module', () => {
11-
expect(() => shallow(SassModule)).not.toThrow()
11+
expect(() => shallowMount(SassModule)).not.toThrow()
1212
})
1313
it('does not error on sass module when functional', () => {
1414
expect(() => mount(SassModuleFunctional)).not.toThrow()
@@ -20,7 +20,7 @@ describe('processes .vue files which combine sass and modules', () => {
2020
let functionalWrapper
2121

2222
beforeEach(() => {
23-
wrapper = shallow(SassModule)
23+
wrapper = shallowMount(SassModule)
2424
functionalWrapper = mount(SassModuleFunctional)
2525
})
2626

@@ -42,7 +42,7 @@ describe('processes .vue files which combine sass and modules', () => {
4242
describe('entrypoint: direct import in SFC', () => {
4343
let wrapper
4444
beforeEach(() => {
45-
wrapper = shallow(SassModule)
45+
wrapper = shallowMount(SassModule)
4646
})
4747
it('does inject classes from directly imported files by relative path', () => {
4848
expect(wrapper.vm.$style.directImportClass).toBeDefined()
@@ -69,7 +69,7 @@ describe('processes .vue files which combine sass and modules', () => {
6969
describe('entrypoint: import inside previously imported stylesheet', () => {
7070
let wrapper
7171
beforeEach(() => {
72-
wrapper = shallow(SassModule)
72+
wrapper = shallowMount(SassModule)
7373
})
7474
it('does inject classes from imports within sass files by relative path', () => {
7575
expect(wrapper.vm.$style.sassImportClass).toBeDefined()
@@ -96,7 +96,7 @@ describe('processes .vue files which combine sass and modules', () => {
9696
describe('multiple modules', () => {
9797
let wrapper
9898
beforeEach(() => {
99-
wrapper = shallow(SassModule)
99+
wrapper = shallowMount(SassModule)
100100
})
101101
it('does inject classes from sass if multiple modules are present', () => {
102102
expect(wrapper.vm.$style.directImportSecondClass).toBeDefined()

test/scss.spec.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { shallow, mount } from 'vue-test-utils'
1+
import { shallowMount, mount } from '@vue/test-utils'
22
import Scss from './resources/Scss.vue'
33
import ScssModule from './resources/ScssModule.vue'
44
import ScssModuleFunctional from './resources/ScssModuleFunctional.vue'
55

66
describe('processes .vue file with scss style', () => {
77
it('does not error on scss', () => {
8-
expect(() => shallow(Scss)).not.toThrow()
8+
expect(() => shallowMount(Scss)).not.toThrow()
99
})
1010
it('does not error on scss module', () => {
11-
expect(() => shallow(ScssModule)).not.toThrow()
11+
expect(() => shallowMount(ScssModule)).not.toThrow()
1212
})
1313
it('does not error on scss module when functional', () => {
1414
expect(() => mount(ScssModuleFunctional)).not.toThrow()
@@ -20,7 +20,7 @@ describe('processes .vue files which combine scss and modules', () => {
2020
let functionalWrapper
2121

2222
beforeEach(() => {
23-
wrapper = shallow(ScssModule)
23+
wrapper = shallowMount(ScssModule)
2424
functionalWrapper = mount(ScssModuleFunctional)
2525
})
2626

@@ -42,7 +42,7 @@ describe('processes .vue files which combine scss and modules', () => {
4242
describe('entrypoint: direct import in SFC', () => {
4343
let wrapper
4444
beforeEach(() => {
45-
wrapper = shallow(ScssModule)
45+
wrapper = shallowMount(ScssModule)
4646
})
4747
it('does inject classes from directly imported files by relative path', () => {
4848
expect(wrapper.vm.$style.directImportClass).toBeDefined()
@@ -69,7 +69,7 @@ describe('processes .vue files which combine scss and modules', () => {
6969
describe('entrypoint: import inside previously imported stylesheet', () => {
7070
let wrapper
7171
beforeEach(() => {
72-
wrapper = shallow(ScssModule)
72+
wrapper = shallowMount(ScssModule)
7373
})
7474
it('does inject classes from imports within scss files by relative path', () => {
7575
expect(wrapper.vm.$style.scssImportClass).toBeDefined()
@@ -96,7 +96,7 @@ describe('processes .vue files which combine scss and modules', () => {
9696
describe('multiple modules', () => {
9797
let wrapper
9898
beforeEach(() => {
99-
wrapper = shallow(ScssModule)
99+
wrapper = shallowMount(ScssModule)
100100
})
101101
it('does inject classes from scss if multiple modules are present', () => {
102102
expect(wrapper.vm.$style.directImportSecondClass).toBeDefined()

test/stylus.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { shallow } from 'vue-test-utils'
1+
import { shallowMount } from '@vue/test-utils'
22
import Stylus from './resources/Stylus.vue'
33
import StylusRelative from './resources/StylusRelative.vue'
44
import { resolve } from 'path'
@@ -8,7 +8,7 @@ import jestVue from '../vue-jest'
88
describe('processes .vue file with Stylus style', () => {
99
let wrapper
1010
beforeAll(() => {
11-
wrapper = shallow(Stylus)
11+
wrapper = shallowMount(Stylus)
1212
})
1313

1414
it('should bind from style tags with named module', () => {
@@ -24,7 +24,7 @@ describe('processes .vue file with Stylus style', () => {
2424
})
2525

2626
it('should handle relative imports', () => {
27-
expect(() => shallow(StylusRelative)).not.toThrow()
27+
expect(() => shallowMount(StylusRelative)).not.toThrow()
2828
})
2929

3030
it('does not attempty to compile if experimentalStyles flag is passed', () => {

0 commit comments

Comments
 (0)