Skip to content

Commit

Permalink
test(gen): clean up code and test more endpoint combinations
Browse files Browse the repository at this point in the history 
Changes:
- remove unneeded code
- use runTest for endpoints as well
- test endpoints with different options
- test endpoints with various cased named

Exposes Bug:
See angular-fullstack#540
  • Loading branch information
@kingcody
kingcody committed Sep 10, 2014
1 parent 3536b45 commit cf6ae00
Showing 1 changed file with 64 additions and 30 deletions.
94 changes: 64 additions & 30 deletions test/test-file-creation.js
View file
Expand Up @@ -39,13 +39,16 @@ describe('angular-fullstack generator', function () {
path = path || './';
skip = skip || ['e2e', 'node_modules', 'client/bower_components'];

recursiveReadDir(path, skip, function(err, files) {
recursiveReadDir(path, skip, function(err, actualFiles) {
if (err) { return done(err); }
var files = actualFiles.concat();

for (var i = 0, expectedFilesLength = expectedFiles.length; i < expectedFilesLength; i++) {
var index = files.indexOf(expectedFiles[i]);
files.splice(index, 1);
}
expectedFiles.forEach(function(file, i) {
var index = files.indexOf(file);
if (index >= 0) {
files.splice(index, 1);
}
});

if (files.length !== 0) {
err = new Error('unexpected files found');
Expand All @@ -58,11 +61,16 @@ describe('angular-fullstack generator', function () {
});
}

function runTest(type, self, cb, timeout) {
function runTest(cmd, self, cb) {
var args = Array.prototype.slice.call(arguments),
endpoint = (args[3] && typeof args[3] === 'string') ? args.splice(3, 1)[0] : null,
timeout = (args[3] && typeof args[3] === 'number') ? args.splice(3, 1)[0] : null;

self.timeout(timeout || 60000);
gen.run({}, function() {
exec(type, function(error, stdout, stderr) {
switch(type) {

var execFn = function() {
exec(cmd, function(error, stdout, stderr) {
switch(cmd) {
case 'grunt test:client':
expect(stdout, 'Client tests failed \n' + stdout ).to.contain('Executed 1 of 1\u001b[32m SUCCESS\u001b');
break;
Expand All @@ -78,7 +86,13 @@ describe('angular-fullstack generator', function () {

cb();
});
});
};

if (endpoint) {
generatorTest('endpoint', endpoint, {}, execFn);
} else {
gen.run({}, execFn);
}
}

function genFiles(ops) {
Expand Down Expand Up @@ -206,10 +220,9 @@ describe('angular-fullstack generator', function () {
}

if (ops.oauth) {
var oauth = ops.oauth;
for (var i = 0, oauthLength = oauth.length; i < oauthLength; i++) {
files = files.concat(oauthFiles(oauth[i].replace('Auth', '')));
}
ops.oauth.forEach(function(type, i) {
files = files.concat(oauthFiles(type.replace('Auth', '')));
});
}

if (ops.socketio) {
Expand All @@ -224,11 +237,10 @@ describe('angular-fullstack generator', function () {
return files;
}

function everyFile(files, ops) {
ops = ops || {
skip: ['node_modules', 'client/bower_components', 'e2e']
}
}

/**
* Generator tests
*/

beforeEach(function (done) {
this.timeout(10000);
Expand Down Expand Up @@ -269,22 +281,28 @@ describe('angular-fullstack generator', function () {
runTest('grunt test:client', this, done);
});

it('should pass jshint', function(done) {
it('should pass lint', function(done) {
runTest('grunt jshint', this, done);
});

it('should run server tests successfully', function(done) {
runTest('grunt test:server', this, done);
});

it('should pass lint with generated endpoint', function(done) {
runTest('grunt jshint', this, done, 'foo');
});

it('should run server tests successfully with generated endpoint', function(done) {
this.timeout(60000);
generatorTest('endpoint', 'foo', {}, function() {
exec('grunt test:server', function (error, stdout, stderr) {
expect(stdout, 'Server tests failed (do you have mongoDB running?) \n' + stdout).to.contain('Done, without errors.');
done();
});
});
runTest('grunt test:server', this, done, 'foo');
});

it('should pass lint with generated capitalized endpoint', function(done) {
runTest('grunt jshint', this, done, 'Foo');
});

it('should run server tests successfully with generated capitalized endpoint', function(done) {
runTest('grunt test:server', this, done, 'Foo');
});

it('should use existing config if available', function(done) {
Expand Down Expand Up @@ -358,14 +376,22 @@ describe('angular-fullstack generator', function () {
runTest('grunt test:client', this, done);
});

it('should pass jshint', function(done) {
it('should pass lint', function(done) {
runTest('grunt jshint', this, done);
});

it('should run server tests successfully', function(done) {
runTest('grunt test:server', this, done);
});

it('should pass lint with generated snake-case endpoint', function(done) {
runTest('grunt jshint', this, done, 'foo-bar');
});

it('should run server tests successfully with generated snake-case endpoint', function(done) {
runTest('grunt test:server', this, done, 'foo-bar');
});

it('should generate expected files', function (done) {
gen.run({}, function () {
helpers.assertFile(genFiles(testOptions));
Expand Down Expand Up @@ -403,14 +429,22 @@ describe('angular-fullstack generator', function () {
runTest('grunt test:client', this, done);
});

it('should pass jshint', function(done) {
it('should pass lint', function(done) {
runTest('grunt jshint', this, done);
});

it('should run server tests successfully', function(done) {
runTest('grunt test:server', this, done);
});

it('should pass lint with generated endpoint', function(done) {
runTest('grunt jshint', this, done, 'foo');
});

it('should run server tests successfully with generated endpoint', function(done) {
runTest('grunt test:server', this, done, 'foo');
});

it('should generate expected files', function (done) {
gen.run({}, function () {
helpers.assertFile(genFiles(testOptions));
Expand Down Expand Up @@ -448,7 +482,7 @@ describe('angular-fullstack generator', function () {
runTest('grunt test:client', this, done);
});

it('should pass jshint', function(done) {
it('should pass lint', function(done) {
runTest('grunt jshint', this, done);
});

Expand Down

0 comments on commit cf6ae00

Please sign in to comment.