fixed tests. Removed duplicate files in the example project. Fixed the example project with the new folders

nikos-fytros · nikos-fytros · commit 281c48dfe029 · 2017-08-30T22:01:11.000+02:00
diff --git a/example/app.js b/example/app.js
@@ -15,7 +15,7 @@ var exampleMixin = {
 };
 
 const options = {
-    rootPath: path.join(__dirname, '/vueFiles'),
+    rootPath: path.join(__dirname, ''),
     vue: {
         head: {
             meta: [{
@@ -66,7 +66,7 @@ app.get('/', (req, res) => {
             ]
         }
     }
-    res.renderVue('main/main.vue', data, vueOptions)
+    res.renderVue('main.vue', data, vueOptions)
 });
 
 app.listen(3000);
diff --git a/example/components/uuid.vue b/example/components/uuid.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import inner from '../components/inner.vue';
+import inner from './components/inner.vue';
 export default {
     props: ['uuid'],
     data: function () {
diff --git a/example/main.vue b/example/main.vue
diff --git a/example/vueFiles/main/main.vue b/example/vueFiles/main/main.vue
diff --git a/src/parser/component.js b/src/parser/component.js
@@ -3,6 +3,7 @@
 const fs = require('fs');
 const camelCase = require('camel-case');
 const compiler = require('vue-template-compiler');
+const CleanCSS = require('clean-css');
 const styleParser = require('./style');
 const htmlParser = require('./html');
 const scriptParser = require('./script');
@@ -69,7 +70,7 @@ function parseContent(content: string, templatePath: string, defaults: Object, t
                     if (resultsArray[2]) {
                         style = resultsArray[2];
                     } else {
-                        style = resultsArray[1].styles ? resultsArray[1].styles : '';
+                        style = new CleanCSS({}).minify(resultsArray[1].styles ? resultsArray[1].styles : '').styles;
                     }
 
                     script.template = template;
diff --git a/tests/index.js b/tests/index.js
@@ -5,7 +5,7 @@ const Models = require('../src/models');
 const path = require('path');
 
 const options = {
-    rootPath: path.join(__dirname, '../example/vueFiles')
+    rootPath: path.join(__dirname, '../example')
 };
 
 const data = {
@@ -20,8 +20,8 @@ const vueOptions = {
     }
 }
 
-const exampleHead = `<head>\n<title>Page Title</title>\n</head>`;
-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>`
+const exampleHead = `<head>\n<title>Page Title</title>\n<style>.test{color:#00f}.red{color:#9acd32}</style></head>`;
+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{}},components:{inner:{data:function(){return{}},template:"<div><p>Inner Text</p></div>"}},styles:"",template:"<div><inner></inner><h2 class=\\"test\\">Uuid: {{uuid ? uuid : \'no uuid\'}}</h2></div>"},uuid2:{props:["uuid2"],data:function(){return{}},template:"<div><h3 class=\\"red\\">Uuid2: {{uuid2 ? uuid2 : \'no uuid\'}}</h3></div>"}},styles:".test{color:#00f}.red{color:#9acd32}",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);
diff --git a/tests/parser/index.js b/tests/parser/index.js
@@ -20,9 +20,9 @@ var cacheOptions = {
 var lruCache = LRU(cacheOptions);
 
 let types = new Types();
-const component = __dirname + '/../../example/vueFiles/components/uuid.vue';
+const component = __dirname + '/../../example/components/uuid.vue';
 const options = {
-    rootPath: path.join(__dirname, 'tests'),
+    rootPath: path.join(__dirname, '../../example'),
     component: 'uuid.vue'
 };
 
diff --git a/tests/utils/checkPathUtils.js b/tests/utils/checkPathUtils.js
@@ -5,7 +5,7 @@ import {
 } from '../../src/utils';
 import Models from '../../src/models';
 
-const rootPath = path.join(__dirname, '../../example/vueFiles/');
+const rootPath = path.join(__dirname, '../../example/');
 const defaults = new Models.Defaults();
 var LRU = require('lru-cache');
 var cacheOptions = {
@@ -15,7 +15,7 @@ var cacheOptions = {
 var lruCache = LRU(cacheOptions);
 
 test('correctPath Path', t => {
-    const filePath = path.join(rootPath, '../../example/vueFiles/components/uuid.vue');
+    const filePath = path.join(rootPath, '../example/components/uuid.vue');
     const correctPath = rootPath + 'components/uuid.vue';
 
     return PathUtils.getCorrectPathForFile(filePath, 'view', defaults, lruCache)

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ var exampleMixin = {`
`15`	`15`	`};`
`16`	`16`
`17`	`17`	`const options = {`
`18`		`- rootPath: path.join(__dirname, '/vueFiles'),`
	`18`	`+ rootPath: path.join(__dirname, ''),`
`19`	`19`	`vue: {`
`20`	`20`	`head: {`
`21`	`21`	`meta: [{`
`@@ -66,7 +66,7 @@ app.get('/', (req, res) => {`
`66`	`66`	`]`
`67`	`67`	`}`
`68`	`68`	`}`
`69`		`- res.renderVue('main/main.vue', data, vueOptions)`
	`69`	`+ res.renderVue('main.vue', data, vueOptions)`
`70`	`70`	`});`
`71`	`71`
`72`	`72`	`app.listen(3000);`