From 75de9942f6eb658fd5c28ebbe567c96791748f27 Mon Sep 17 00:00:00 2001
From: Matthieu Lux <matthieu.lux@gmail.com>
Date: Thu, 2 Apr 2015 14:47:22 +0200
Subject: [PATCH] using vendor css depends know on the use of a css
 preprocessor

---
 app/src/ui.js        |  2 +-
 test/node/test-ui.js | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/ui.js b/app/src/ui.js
index c4e0eced..613fcd55 100644
--- a/app/src/ui.js
+++ b/app/src/ui.js
@@ -60,7 +60,7 @@ module.exports = function(GulpAngularGenerator) {
       template: false
     });
 
-    if(this.props.ui.key !== 'none') {
+    if(this.props.cssPreprocessor.key !== 'none') {
       this.files.push({
         src: 'src/app/_' + this.props.ui.key + '/__' + this.props.ui.key + '-vendor.' + this.props.cssPreprocessor.extension,
         dest: 'src/app/vendor.' + this.props.cssPreprocessor.extension,
diff --git a/test/node/test-ui.js b/test/node/test-ui.js
index d3ebfef6..730fc79b 100644
--- a/test/node/test-ui.js
+++ b/test/node/test-ui.js
@@ -105,13 +105,12 @@ describe('gulp-angular generator ui script', function () {
       generator.props = {
         router: { module: null },
         ui: { key: 'none' },
-        cssPreprocessor: { extension: 'scss' }
+        cssPreprocessor: { key: 'none', extension: 'css' }
       };
-      generator.isVendorStylesPreprocessed = true;
       generator.files = [];
       generator.uiFiles();
       generator.files[0].src.should.be.equal('src/app/components/navbar/__none-navbar.html');
-      generator.files[1].src.should.be.equal('src/app/_none/__none-index.scss');
+      generator.files[1].src.should.be.equal('src/app/_none/__none-index.css');
       generator.files.length.should.be.equal(2);
     });
 
@@ -119,11 +118,14 @@ describe('gulp-angular generator ui script', function () {
       generator.props = {
         router: { module: 'ngRoute' },
         ui: { key: 'bootstrap' },
-        cssPreprocessor: { extension: 'scss' }
+        cssPreprocessor: { key: 'notnone', extension: 'scss' }
       };
-      generator.isVendorStylesPreprocessed = true;
       generator.files = [];
       generator.uiFiles();
+      generator.files[0].src.should.be.equal('src/app/components/navbar/__bootstrap-navbar.html');
+      generator.files[1].src.should.be.equal('src/app/main/__bootstrap.html');
+      generator.files[2].src.should.be.equal('src/app/_bootstrap/__bootstrap-index.scss');
+      generator.files[3].src.should.be.equal('src/app/_bootstrap/__bootstrap-vendor.scss');
       generator.files.length.should.be.equal(4);
     });
   });