diff --git a/index.js b/index.js index 9caf919..127e6e0 100644 --- a/index.js +++ b/index.js @@ -107,13 +107,7 @@ var NpmtsTests; plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests plugins.beautylog.info("Now running mocha tests"); 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(plugins.path.join(paths.testDir, file)); - }); + mocha.addFile(plugins.path.join(paths.testDir, "test.js")); // Run the tests. mocha.run(function (failures) { process.on('exit', function () { @@ -145,7 +139,7 @@ var NpmtsPromisechain; /// /// /// -console.log("** starting NPMTS **"); +console.log("**** starting NPMTS ****"); var plugins = NpmtsPlugins.init(); var paths = NpmtsPaths.init(); var promisechain = NpmtsPromisechain.init(); diff --git a/test/assets/test/test.js b/test/assets/test/test.js index 8b13789..68b07c4 100644 --- a/test/assets/test/test.js +++ b/test/assets/test/test.js @@ -1 +1 @@ - +console.log("**** starting test ****"); diff --git a/test/assets/ts/test.js b/test/assets/ts/test.js index 6f3fefb..9039870 100644 --- a/test/assets/ts/test.js +++ b/test/assets/ts/test.js @@ -1 +1,2 @@ +console.log("**** starting test ****"); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/test/assets/ts/test.js.map b/test/assets/ts/test.js.map index 3a8a8aa..eba9974 100644 --- a/test/assets/ts/test.js.map +++ b/test/assets/ts/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":""} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC"} \ No newline at end of file diff --git a/test/assets/ts/test.ts b/test/assets/ts/test.ts index e69de29..9a2b561 100644 --- a/test/assets/ts/test.ts +++ b/test/assets/ts/test.ts @@ -0,0 +1 @@ +console.log("**** starting test ****"); \ No newline at end of file diff --git a/ts/index.ts b/ts/index.ts index 9e1b1c2..af956e6 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -8,7 +8,7 @@ /// /// /// -console.log("** starting NPMTS **") +console.log("**** starting NPMTS ****") var plugins = NpmtsPlugins.init(); var paths = NpmtsPaths.init(); var promisechain = NpmtsPromisechain.init(); diff --git a/ts/npmts.tests.ts b/ts/npmts.tests.ts index 0545dea..2881867 100644 --- a/ts/npmts.tests.ts +++ b/ts/npmts.tests.ts @@ -4,20 +4,11 @@ module NpmtsTests { var done = plugins.q.defer(); plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests plugins.beautylog.info("Now running mocha tests"); + 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( - plugins.path.join(paths.testDir, file) - ); - }); - - // Run the tests. + mocha.addFile( + plugins.path.join(paths.testDir, "test.js") + ); mocha.run(function(failures){ process.on('exit', function () { process.exit(failures);