Zengtudor
/
Nuxt
mirror of https://github.com/nuxt/nuxt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2127 from clarkdo/fix_split_error 

refactor: fix [TypeError: Cannot read property split of undefined] in tests
This commit is contained in:
Sébastien Chopin 2017-11-16 12:21:37 +01:00 committed by GitHub
parent de2b0a6d56 2228bf4209
commit 6ef631dee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common/options.js
View File

@ -149,7 +149,7 @@ Options.from = function (_options) {
_.defaultsDeep(options, modePreset) _.defaultsDeep(options, modePreset)
// If no server-side rendering, add appear true transition // If no server-side rendering, add appear true transition
if (options.render.ssr === false) { if (options.render.ssr === false && options.transition) {
options.transition.appear = true options.transition.appear = true
} }

3
test/fixtures/basic/nuxt.config.js vendored
View File

@ -13,5 +13,6 @@ module.exports = {
}, },
bad: null, bad: null,
'': true '': true
} },
transition: false
} }

3
test/fixtures/spa/nuxt.config.js vendored
View File

@ -1,5 +1,6 @@
module.exports = { module.exports = {
rootDir: __dirname, rootDir: __dirname,
mode: 'spa', mode: 'spa',
dev: false dev: false,
transition: false
} }