using vendor css depends know on the use of a css preprocessor

Swiip · Apr 2, 2015 · 75de994 · 75de994
1 parent a05c458
commit 75de994
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -105,25 +105,27 @@ 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);
     });
 
     it('should add 4 files when all options', 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);
     });
   });