Skip to content

Commit 91a6426

Browse files
committed
chore: bump vue
1 parent dffe2a0 commit 91a6426

File tree

3 files changed

+60
-64
lines changed

3 files changed

+60
-64
lines changed

package-lock.json

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@
9494
"stylus-loader": "^3.0.1",
9595
"sugarss": "^1.0.0",
9696
"url-loader": "^0.6.2",
97-
"vue": "^2.4.4",
98-
"vue-server-renderer": "^2.4.4",
99-
"vue-template-compiler": "^2.4.4",
100-
"webpack": "^3.4.1"
97+
"vue": "^2.5.0",
98+
"vue-server-renderer": "^2.5.0",
99+
"vue-template-compiler": "^2.5.0",
100+
"webpack": "^3.7.1"
101101
}
102102
}

test/test.js

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -986,48 +986,44 @@ describe('vue-loader', function () {
986986
})
987987
})
988988

989-
// Vue required tests for more complete test cases
990-
// this test case requires Vue >= 2.5
991-
if (Number(Vue.version.split('.')[1]) >= 5) {
992-
it('functional template', done => {
993-
test({
994-
entry: './test/fixtures/functional-root.vue',
995-
vue: {
996-
preserveWhitespace: false
989+
it('functional template', done => {
990+
test({
991+
entry: './test/fixtures/functional-root.vue',
992+
vue: {
993+
preserveWhitespace: false
994+
}
995+
}, (window, module) => {
996+
expect(module.components.Functional._compiled).to.equal(true)
997+
expect(module.components.Functional.functional).to.equal(true)
998+
expect(module.components.Functional.staticRenderFns).to.exist
999+
expect(module.components.Functional.render).to.be.a('function')
1000+
1001+
const vnode = mockRender(module, {
1002+
fn () {
1003+
done()
9971004
}
998-
}, (window, module) => {
999-
expect(module.components.Functional._compiled).to.equal(true)
1000-
expect(module.components.Functional.functional).to.equal(true)
1001-
expect(module.components.Functional.staticRenderFns).to.exist
1002-
expect(module.components.Functional.render).to.be.a('function')
1003-
1004-
const vnode = mockRender(module, {
1005-
fn () {
1006-
done()
1007-
}
1008-
}).children[0]
1009-
1010-
// Basic vnode
1011-
expect(vnode.children[0].data.staticClass).to.equal('red')
1012-
expect(vnode.children[0].children[0].text).to.equal('hello')
1013-
// Default slot vnode
1014-
expect(vnode.children[1].tag).to.equal('span')
1015-
expect(vnode.children[1].children[0].text).to.equal('hello')
1016-
// Named slot vnode
1017-
expect(vnode.children[2].tag).to.equal('div')
1018-
expect(vnode.children[2].children[0].text).to.equal('Second slot')
1019-
// // Scoped slot vnode
1020-
expect(vnode.children[3].text).to.equal('hello')
1021-
// // Static content vnode
1022-
expect(vnode.children[4].tag).to.equal('div')
1023-
expect(vnode.children[4].children[0].text).to.equal('Some ')
1024-
expect(vnode.children[4].children[1].tag).to.equal('span')
1025-
expect(vnode.children[4].children[1].children[0].text).to.equal('text')
1026-
// // v-if vnode
1027-
expect(vnode.children[5].text).to.equal('')
1028-
1029-
vnode.children[6].data.on.click()
1030-
})
1005+
}).children[0]
1006+
1007+
// Basic vnode
1008+
expect(vnode.children[0].data.staticClass).to.equal('red')
1009+
expect(vnode.children[0].children[0].text).to.equal('hello')
1010+
// Default slot vnode
1011+
expect(vnode.children[1].tag).to.equal('span')
1012+
expect(vnode.children[1].children[0].text).to.equal('hello')
1013+
// Named slot vnode
1014+
expect(vnode.children[2].tag).to.equal('div')
1015+
expect(vnode.children[2].children[0].text).to.equal('Second slot')
1016+
// // Scoped slot vnode
1017+
expect(vnode.children[3].text).to.equal('hello')
1018+
// // Static content vnode
1019+
expect(vnode.children[4].tag).to.equal('div')
1020+
expect(vnode.children[4].children[0].text).to.equal('Some ')
1021+
expect(vnode.children[4].children[1].tag).to.equal('span')
1022+
expect(vnode.children[4].children[1].children[0].text).to.equal('text')
1023+
// // v-if vnode
1024+
expect(vnode.children[5].text).to.equal('')
1025+
1026+
vnode.children[6].data.on.click()
10311027
})
1032-
}
1028+
})
10331029
})

0 commit comments

Comments
 (0)