fixes tests

danielcherubini · danielcherubini · commit 8cf31e2ec406 · 2017-08-28T15:56:21.000+02:00
diff --git a/src/renderer/render.js b/src/renderer/render.js
@@ -36,7 +36,7 @@ function renderedScript(script: Object, router): string {
     const javaScriptString = `(function () {'use strict';${routerString}var createApp = function () {return new Vue(${scriptString})};if (typeof module !== 'undefined' && module.exports) {module.exports = createApp} else {this.app = createApp()}}).call(this);${debugToolsString}app.$mount('#app');`;
     const finalString = butternut.squash(javaScriptString, buttterNutOptions).code;
 
-    return `<script>\n${finalString}\n</script>`;
+    return `<script>${finalString}</script>`;
 }
 
 type htmlUtilType = {
diff --git a/tests/index.js b/tests/index.js
@@ -21,13 +21,7 @@ const vueOptions = {
 }
 
 const exampleHead = `<head>\n<title>Page Title</title>\n</head>`;
-const exampleScript = `<script>
-(function () {'use strict';var createApp = function () {return new Vue({mixins: [{methods: {hello: function hello() {
-            console.log('Hello');
-        },},},],data: function(){return {"title":"Express Vue","message":"Hello world","uuid":"farts"}},methods: {test: function test() {
-            console.error('test');
-        },},components: {uuid: {props: ["uuid"],data: function(){return {}},template: "<div><h2>Uuid: {{uuid ? uuid : 'no uuid'}}</h2></div>",},uuid2: {props: ["uuid2"],data: function(){return {}},template: "<div><h3>Uuid2: {{uuid2 ? uuid2 : 'no uuid'}}</h3></div>",},},template: "<div><h1>{{title}}</h1><p>Welcome to the {{title}} demo. Click a link:</p><input v-model=\\"message\\" placeholder=\\"edit me\\"><p>{{message}}</p><uuid :uuid=\\"uuid\\"></uuid><uuid2 :uuid2=\\"uuid2\\"></uuid2><button type=\\"button\\" name=\\"button\\" v-on:click=\\"this.hello\\">Test mixin</button> <button type=\\"button\\" name=\\"button\\" v-on:click=\\"this.test\\">Test method</button></div>",})};if (typeof module !== 'undefined' && module.exports) {module.exports = createApp} else {this.app = createApp()}}).call(this);app.$mount('#app');
-</script>`
+const exampleScript = `<script>(function(){"use strict";var u=function(){return new Vue({mixins:[{methods:{hello:function(){console.log('Hello')}}}],data:function(){return{"title":"Express Vue","message":"Hello world","uuid":"farts"}},methods:{test:function(){console.error('test')}},components:{uuid:{props:["uuid"],data:function(){return{}},template:"<div><h2>Uuid: {{uuid ? uuid : 'no uuid'}}</h2></div>"},uuid2:{props:["uuid2"],data:function(){return{}},template:"<div><h3>Uuid2: {{uuid2 ? uuid2 : 'no uuid'}}</h3></div>"}},template:"<div><h1>{{title}}</h1><p>Welcome to the {{title}} demo. Click a link:</p><input v-model=\\"message\\" placeholder=\\"edit me\\"><p>{{message}}</p><uuid :uuid=\\"uuid\\"></uuid><uuid2 :uuid2=\\"uuid2\\"></uuid2><button type=\\"button\\" name=\\"button\\" v-on:click=\\"this.hello\\">Test mixin</button> <button type=\\"button\\" name=\\"button\\" v-on:click=\\"this.test\\">Test method</button></div>"})};typeof module!=='undefined'&&module.exports?(module.exports=u):(this.app=u())}).call(this),app.$mount('#app')</script>`
 
 test('renders App object', t => {
     const renderer = new ExpressVueRenderer(options);

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ function renderedScript(script: Object, router): string {`
`36`	`36`	const javaScriptString = `(function () {'use strict';${routerString}var createApp = function () {return new Vue(${scriptString})};if (typeof module !== 'undefined' && module.exports) {module.exports = createApp} else {this.app = createApp()}}).call(this);${debugToolsString}app.$mount('#app');`;
`37`	`37`	`const finalString = butternut.squash(javaScriptString, buttterNutOptions).code;`
`38`	`38`
`39`		- return `<script>\n${finalString}\n</script>`;
	`39`	+ return `<script>${finalString}</script>`;
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`type htmlUtilType = {`