Skip to content

Commit

Permalink
add front end build test
Browse files Browse the repository at this point in the history
  • Loading branch information
TerryZwei committed Sep 9, 2016
1 parent 414e9e0 commit 6897380
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 87 deletions.
11 changes: 9 additions & 2 deletions src/app/steps/writing.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,16 @@ module.exports = function(){
this.copy('README.md', 'README.md');
var sails_config = {
grunt: false,
pm2:false
gulp: false,
pm2: false
};
if(this.answers['grunt:enabled']){
// if(this.answers['grunt:enabled']){
// sails_config.grunt = true
// }
if (this.answers['febuild:chosen'] == 'Gulp') {
sails_config.gulp = true
}
if (this.answers['febuild:chosen'] == 'Grunt'){
sails_config.grunt = true
}
if(this.answers['pm2:enabled']){
Expand Down
3 changes: 3 additions & 0 deletions src/app/templates/sailsrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"generators": {
"modules": {
<%_ if (sails_config.gulp){_%>
"gulp": "sails-generate-gulp"
<%_}_%>
}
},
"hooks": {
Expand Down
26 changes: 0 additions & 26 deletions src/febuild/templates/gulp/tasks/config/cssmin.js

This file was deleted.

26 changes: 0 additions & 26 deletions src/febuild/templates/gulp/tasks/config/uglify.js

This file was deleted.

6 changes: 3 additions & 3 deletions test/unit/app.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('sails-diy:app', function(){
[generators.test.createDummyGenerator(), 'sails-diy:config'],
[generators.test.createDummyGenerator(), 'sails-diy:controller'],
[generators.test.createDummyGenerator(), 'sails-diy:cron'],
[generators.test.createDummyGenerator(), 'sails-diy:grunt'],
[generators.test.createDummyGenerator(), 'sails-diy:febuild'],
[generators.test.createDummyGenerator(), 'sails-diy:hook'],
[generators.test.createDummyGenerator(), 'sails-diy:logger'],
[generators.test.createDummyGenerator(), 'sails-diy:model'],
Expand Down Expand Up @@ -79,7 +79,7 @@ describe('sails-diy:app', function(){
[generators.test.createDummyGenerator(), 'sails-diy:config'],
[generators.test.createDummyGenerator(), 'sails-diy:controller'],
[generators.test.createDummyGenerator(), 'sails-diy:cron'],
[generators.test.createDummyGenerator(), 'sails-diy:grunt'],
[generators.test.createDummyGenerator(), 'sails-diy:febuild'],
[generators.test.createDummyGenerator(), 'sails-diy:hook'],
[generators.test.createDummyGenerator(), 'sails-diy:logger'],
[generators.test.createDummyGenerator(), 'sails-diy:model'],
Expand All @@ -94,7 +94,7 @@ describe('sails-diy:app', function(){
})
.withPrompts({
'cron:enabled': false,
'grunt:enabled': true,
'febuild:chosen': 'Grunt',
'views:chosen': 'Jade'
})
.on('end', done);
Expand Down
60 changes: 60 additions & 0 deletions test/unit/febuild.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
var path = require('path');
var generators = require('yeoman-generator');

describe('sails-diy:febuild', function() {

describe('Should properly scaffold default grunt tool', function () {
before(function (done) {
generators.test
.run(path.join(__dirname, '../../src/febuild'))
.withArguments(['Grunt'])
.on('end', done)
});

it('Should properly create configuration files', function(){
generators.assert.file([
'Gruntfile.js',
'tasks/config/clean.js',
'tasks/config/copy.js',
'tasks/config/less.js',
'tasks/config/sync.js',
'tasks/config/watch.js',
'tasks/register/compileAssets.js',
'tasks/register/default.js',
'tasks/register/prod.js',
'tasks/register/syncAssets.js',
'tasks/pipeline.js',
'tasks/README.md'
]);
});
});


describe('Should properly scaffold default gulp tool', function () {
before(function (done) {
generators.test
.run(path.join(__dirname, '../../src/febuild'))
.withArguments(['Gulp'])
.on('end', done);
});

it('Should properly create configuration files', function(){
generators.assert.file([
'gulpfile.js',
'tasks/config/clean.js',
'tasks/config/copy.js',
'tasks/config/less.js',
'tasks/config/sync.js',
'tasks/config/watcher.js',
'tasks/config/filerev.js',
'tasks/config/replacerev.js',
'tasks/register/compileAssets.js',
'tasks/register/default.js',
'tasks/register/prod.js',
'tasks/register/syncAssets.js',
'tasks/pipeline.js',
'tasks/README.md'
]);
});
});
});
30 changes: 0 additions & 30 deletions test/unit/grunt.test.js

This file was deleted.

0 comments on commit 6897380

Please sign in to comment.