Skip to content

Commit

Permalink
fix(app): Generator is not going through the steps
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghaiklor
ghaiklor committed Oct 20, 2016
1 parent 7b5f816 commit 1658d11
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 96 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -44,7 +44,7 @@
"chalk": "1.1.3",
"print-message": "2.1.0",
"update-notifier": "1.0.2",
"yeoman-generator": "0.24.1",
"yeoman-generator": "0.22.6",
"yosay": "1.2.1"
},
"devDependencies": {
Expand Down
189 changes: 94 additions & 95 deletions test/unit/app.test.js
View file
Expand Up @@ -5,99 +5,98 @@ const assert = require('yeoman-assert');
const test = require('yeoman-test');

describe('sails-rest-api:app', () => {
// FIXME: Somehow `end` event is not triggering, only `ready`
// describe('Should properly scaffold with default configuration', () => {
// before(done => {
// test
// .run(path.join(__dirname, '../../generators/app'))
// .withGenerators([
// [test.createDummyGenerator(), 'sails-rest-api:adapter'],
// [test.createDummyGenerator(), 'sails-rest-api:authentication'],
// [test.createDummyGenerator(), 'sails-rest-api:blueprint'],
// [test.createDummyGenerator(), 'sails-rest-api:config'],
// [test.createDummyGenerator(), 'sails-rest-api:controller'],
// [test.createDummyGenerator(), 'sails-rest-api:cron'],
// [test.createDummyGenerator(), 'sails-rest-api:hook'],
// [test.createDummyGenerator(), 'sails-rest-api:logger'],
// [test.createDummyGenerator(), 'sails-rest-api:model'],
// [test.createDummyGenerator(), 'sails-rest-api:policy'],
// [test.createDummyGenerator(), 'sails-rest-api:response'],
// [test.createDummyGenerator(), 'sails-rest-api:service'],
// [test.createDummyGenerator(), 'sails-rest-api:swagger']
// ])
// .on('end', done);
// });
//
// it('Should properly create root files', () => {
// assert.file([
// 'app.js',
// 'Dockerfile',
// '.editorconfig',
// 'esdoc.json',
// '.gitignore',
// 'package.json',
// 'README.md',
// '.sailsrc'
// ]);
// });
//
// it('Should properly create mocha.opts and bootstrap', () => {
// assert.file([
// 'test/bootstrap.js',
// 'test/mocha.opts'
// ]);
// });
// });
//
// describe('Should properly scaffold with custom configuration', () => {
// before(done => {
// test
// .run(path.join(__dirname, '../../generators/app'))
// .withGenerators([
// [test.createDummyGenerator(), 'sails-rest-api:adapter'],
// [test.createDummyGenerator(), 'sails-rest-api:authentication'],
// [test.createDummyGenerator(), 'sails-rest-api:blueprint'],
// [test.createDummyGenerator(), 'sails-rest-api:config'],
// [test.createDummyGenerator(), 'sails-rest-api:controller'],
// [test.createDummyGenerator(), 'sails-rest-api:cron'],
// [test.createDummyGenerator(), 'sails-rest-api:hook'],
// [test.createDummyGenerator(), 'sails-rest-api:logger'],
// [test.createDummyGenerator(), 'sails-rest-api:model'],
// [test.createDummyGenerator(), 'sails-rest-api:policy'],
// [test.createDummyGenerator(), 'sails-rest-api:response'],
// [test.createDummyGenerator(), 'sails-rest-api:service'],
// [test.createDummyGenerator(), 'sails-rest-api:swagger']
// ])
// .withOptions({
// 'skip-update': true
// })
// .withPrompts({
// 'authentication:enabled': false,
// 'blueprint:all': false,
// 'cron:enabled': false,
// 'swagger:enabled': false
// })
// .on('end', done);
// });
//
// it('Should properly create root files', () => {
// assert.file([
// 'app.js',
// 'Dockerfile',
// '.editorconfig',
// 'esdoc.json',
// '.gitignore',
// 'package.json',
// 'README.md',
// '.sailsrc'
// ]);
// });
//
// it('Should properly create mocha.opts and bootstrap', () => {
// assert.file([
// 'test/bootstrap.js',
// 'test/mocha.opts'
// ]);
// });
// });
describe('Should properly scaffold with default configuration', () => {
before(done => {
test
.run(path.join(__dirname, '../../generators/app'))
.withGenerators([
[test.createDummyGenerator(), 'sails-rest-api:adapter'],
[test.createDummyGenerator(), 'sails-rest-api:authentication'],
[test.createDummyGenerator(), 'sails-rest-api:blueprint'],
[test.createDummyGenerator(), 'sails-rest-api:config'],
[test.createDummyGenerator(), 'sails-rest-api:controller'],
[test.createDummyGenerator(), 'sails-rest-api:cron'],
[test.createDummyGenerator(), 'sails-rest-api:hook'],
[test.createDummyGenerator(), 'sails-rest-api:logger'],
[test.createDummyGenerator(), 'sails-rest-api:model'],
[test.createDummyGenerator(), 'sails-rest-api:policy'],
[test.createDummyGenerator(), 'sails-rest-api:response'],
[test.createDummyGenerator(), 'sails-rest-api:service'],
[test.createDummyGenerator(), 'sails-rest-api:swagger']
])
.on('end', done);
});

it('Should properly create root files', () => {
assert.file([
'app.js',
'Dockerfile',
'.editorconfig',
'esdoc.json',
'.gitignore',
'package.json',
'README.md',
'.sailsrc'
]);
});

it('Should properly create mocha.opts and bootstrap', () => {
assert.file([
'test/bootstrap.js',
'test/mocha.opts'
]);
});
});

describe('Should properly scaffold with custom configuration', () => {
before(done => {
test
.run(path.join(__dirname, '../../generators/app'))
.withGenerators([
[test.createDummyGenerator(), 'sails-rest-api:adapter'],
[test.createDummyGenerator(), 'sails-rest-api:authentication'],
[test.createDummyGenerator(), 'sails-rest-api:blueprint'],
[test.createDummyGenerator(), 'sails-rest-api:config'],
[test.createDummyGenerator(), 'sails-rest-api:controller'],
[test.createDummyGenerator(), 'sails-rest-api:cron'],
[test.createDummyGenerator(), 'sails-rest-api:hook'],
[test.createDummyGenerator(), 'sails-rest-api:logger'],
[test.createDummyGenerator(), 'sails-rest-api:model'],
[test.createDummyGenerator(), 'sails-rest-api:policy'],
[test.createDummyGenerator(), 'sails-rest-api:response'],
[test.createDummyGenerator(), 'sails-rest-api:service'],
[test.createDummyGenerator(), 'sails-rest-api:swagger']
])
.withOptions({
'skip-update': true
})
.withPrompts({
'authentication:enabled': false,
'blueprint:all': false,
'cron:enabled': false,
'swagger:enabled': false
})
.on('end', done);
});

it('Should properly create root files', () => {
assert.file([
'app.js',
'Dockerfile',
'.editorconfig',
'esdoc.json',
'.gitignore',
'package.json',
'README.md',
'.sailsrc'
]);
});

it('Should properly create mocha.opts and bootstrap', () => {
assert.file([
'test/bootstrap.js',
'test/mocha.opts'
]);
});
});
});

0 comments on commit 1658d11

Please sign in to comment.