now running mocha tests properly

This commit is contained in:
Philipp Kunz 2016-02-01 00:24:08 +01:00
parent 2fbcb58078
commit 8dcbe98c60
7 changed files with 11 additions and 24 deletions

View File

@ -107,13 +107,7 @@ var NpmtsTests;
plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests
plugins.beautylog.info("Now running mocha tests"); plugins.beautylog.info("Now running mocha tests");
var mocha = new plugins.mocha(); // Instantiate a Mocha instance. var mocha = new plugins.mocha(); // Instantiate a Mocha instance.
// Add each .js file to the mocha instance mocha.addFile(plugins.path.join(paths.testDir, "test.js"));
plugins.fs.readdirSync(paths.testDir).filter(function (file) {
// Only keep the .js files
return file.substr(-3) === '.js';
}).forEach(function (file) {
mocha.addFile(plugins.path.join(paths.testDir, file));
});
// Run the tests. // Run the tests.
mocha.run(function (failures) { mocha.run(function (failures) {
process.on('exit', function () { process.on('exit', function () {
@ -145,7 +139,7 @@ var NpmtsPromisechain;
/// <reference path="./npmts.default.ts" /> /// <reference path="./npmts.default.ts" />
/// <reference path="./npmts.tests.ts" /> /// <reference path="./npmts.tests.ts" />
/// <reference path="./npmts.promisechain.ts" /> /// <reference path="./npmts.promisechain.ts" />
console.log("** starting NPMTS **"); console.log("**** starting NPMTS ****");
var plugins = NpmtsPlugins.init(); var plugins = NpmtsPlugins.init();
var paths = NpmtsPaths.init(); var paths = NpmtsPaths.init();
var promisechain = NpmtsPromisechain.init(); var promisechain = NpmtsPromisechain.init();

View File

@ -1 +1 @@
console.log("**** starting test ****");

View File

@ -1 +1,2 @@
console.log("**** starting test ****");
//# sourceMappingURL=test.js.map //# sourceMappingURL=test.js.map

View File

@ -1 +1 @@
{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":""} {"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC"}

View File

@ -0,0 +1 @@
console.log("**** starting test ****");

View File

@ -8,7 +8,7 @@
/// <reference path="./npmts.default.ts" /> /// <reference path="./npmts.default.ts" />
/// <reference path="./npmts.tests.ts" /> /// <reference path="./npmts.tests.ts" />
/// <reference path="./npmts.promisechain.ts" /> /// <reference path="./npmts.promisechain.ts" />
console.log("** starting NPMTS **") console.log("**** starting NPMTS ****")
var plugins = NpmtsPlugins.init(); var plugins = NpmtsPlugins.init();
var paths = NpmtsPaths.init(); var paths = NpmtsPaths.init();
var promisechain = NpmtsPromisechain.init(); var promisechain = NpmtsPromisechain.init();

View File

@ -4,20 +4,11 @@ module NpmtsTests {
var done = plugins.q.defer(); var done = plugins.q.defer();
plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests
plugins.beautylog.info("Now running mocha tests"); plugins.beautylog.info("Now running mocha tests");
var mocha = new plugins.mocha(); // Instantiate a Mocha instance. var mocha = new plugins.mocha(); // Instantiate a Mocha instance.
// Add each .js file to the mocha instance
plugins.fs.readdirSync(paths.testDir).filter(function(file){
// Only keep the .js files
return file.substr(-3) === '.js';
}).forEach(function(file){
mocha.addFile( mocha.addFile(
plugins.path.join(paths.testDir, file) plugins.path.join(paths.testDir, "test.js")
); );
});
// Run the tests.
mocha.run(function(failures){ mocha.run(function(failures){
process.on('exit', function () { process.on('exit', function () {
process.exit(failures); process.exit(failures);