wip(tests): minor factorization

FranckFreiburger · FranckFreiburger · commit bf8a29bcb5fb · 2021-03-09T21:22:44.000+01:00
diff --git a/tests/basic.test.js b/tests/basic.test.js
@@ -435,9 +435,8 @@ const { defaultFilesVue2, defaultFiles, createPage } = require('./testsTools.js'
 										component.bazComponentProperty = 'baz';
 									}
 								}
-								` +
-							(vueVersion === 2 ? `createApp(options).then(app => mountApp(app))` : `mountApp(createApp(options))`)
-							+ `;
+
+								createApp(options).then(app => mountApp(app));
 							}
 						`
 					}
@@ -484,29 +483,17 @@ const { defaultFilesVue2, defaultFiles, createPage } = require('./testsTools.js'
 									}
 								});
 			
-								` +
-
-							(vueVersion === 2 ? `
-							createApp(options).then((app) => {
-								mountApp(app, 'elt1')
-		
-								options.moduleCache = {
-									vue: Vue
-								};
-		
-								createApp(options).then((app2) => {
-									mountApp(app2, 'elt2');
-								});
-							})` : `
-							mountApp(createApp(options), 'elt1');
-							
-							options.moduleCache = {
-								vue: Vue
-							};
-		
-							mountApp(createApp(options), 'elt2');`)
-							+`
+								createApp(options).then((app) => {
+									mountApp(app, 'elt1')
+			
+									options.moduleCache = {
+										vue: Vue
+									};
 			
+									createApp(options).then((app2) => {
+										mountApp(app2, 'elt2');
+									});
+								})
 							}
 						`
 					}
diff --git a/tests/testsTools.js b/tests/testsTools.js
@@ -152,7 +152,7 @@ const defaultFiles = {
 		export default () => {};
 	`,
 	'/boot.js': `
-		export default ({ options, createApp, mountApp }) => mountApp( createApp(options) );
+		export default ({ options, createApp, mountApp }) => createApp(options).then(app => mountApp(app));
 	`,
 
 	'/index.html': `
@@ -171,7 +171,7 @@ const defaultFiles = {
 
 				function createApp(options) {
 
-					return Vue.createApp(Vue.defineAsyncComponent( () => loadModule('./component.vue', options) ));
+					return loadModule('./component.vue', options).then((component) => Vue.createApp(component));
 				}
 
 				function mountApp(app, eltId = 'app') {
@@ -202,12 +202,8 @@ const defaultFilesVue2 = {
 	'/vue2-sfc-loader.js': Fs.readFileSync(Path.join(__dirname, '../dist/vue2-sfc-loader.js'), { encoding: 'utf-8' }),
 	'/vue': Fs.readFileSync(Path.join(__dirname, '../node_modules/vue2/dist/vue.runtime.js'), { encoding: 'utf-8' }),
 	'/options.js': defaultFiles['/options.js'],
-	'/optionsOverride.js': `
-		export default () => {};
-	`,
-	'/boot.js': `
-		export default ({ options, createApp, mountApp }) => createApp(options).then(app => mountApp(app));
-	`,
+	'/optionsOverride.js': defaultFiles['/optionsOverride.js'],
+	'/boot.js': defaultFiles['/boot.js'],
 	'/index.html': `
 		<!DOCTYPE html>
 		<html><body>

Original file line number	Diff line number	Diff line change
`@@ -435,9 +435,8 @@ const { defaultFilesVue2, defaultFiles, createPage } = require('./testsTools.js'`
`435`	`435`	`component.bazComponentProperty = 'baz';`
`436`	`436`	`}`
`437`	`437`	`}`
`438`		- ` +
`439`		- (vueVersion === 2 ? `createApp(options).then(app => mountApp(app))` : `mountApp(createApp(options))`)
`440`		- + `;
	`438`	`+`
	`439`	`+ createApp(options).then(app => mountApp(app));`
`441`	`440`	`}`
`442`	`441`	`
`443`	`442`	`}`
`@@ -484,29 +483,17 @@ const { defaultFilesVue2, defaultFiles, createPage } = require('./testsTools.js'`
`484`	`483`	`}`
`485`	`484`	`});`
`486`	`485`
`487`		- ` +
`488`		`-`
`489`		- (vueVersion === 2 ? `
`490`		`- createApp(options).then((app) => {`
`491`		`- mountApp(app, 'elt1')`
`492`		`-`
`493`		`- options.moduleCache = {`
`494`		`- vue: Vue`
`495`		`- };`
`496`		`-`
`497`		`- createApp(options).then((app2) => {`
`498`		`- mountApp(app2, 'elt2');`
`499`		`- });`
`500`		- })` : `
`501`		`- mountApp(createApp(options), 'elt1');`
`502`		`-`
`503`		`- options.moduleCache = {`
`504`		`- vue: Vue`
`505`		`- };`
`506`		`-`
`507`		- mountApp(createApp(options), 'elt2');`)
`508`		- +`
	`486`	`+ createApp(options).then((app) => {`
	`487`	`+ mountApp(app, 'elt1')`
	`488`	`+`
	`489`	`+ options.moduleCache = {`
	`490`	`+ vue: Vue`
	`491`	`+ };`
`509`	`492`
	`493`	`+ createApp(options).then((app2) => {`
	`494`	`+ mountApp(app2, 'elt2');`
	`495`	`+ });`
	`496`	`+ })`
`510`	`497`	`}`
`511`	`498`	`
`512`	`499`	`}`