added async teardown option

Author: DavertMik

lib/codecept.js

@@ -29,7 +29,7 @@ class Codecept {
     this.testFiles = [];
   }
 
-   init(dir, callback) {
+  init(dir, callback) {
     // preparing globals
     global.codecept_dir = dir;
     global.output_dir = fsPath.resolve(dir, this.config.output);
@@ -50,7 +50,7 @@ class Codecept {
 
   // loading bootstrap
   bootstrap(callback) {
-    if (typeof this.config.bootstrap === 'string' &&  fileExists(fsPath.join(codecept_dir, this.config.bootstrap))) {
+    if (typeof this.config.bootstrap === 'string' && fileExists(fsPath.join(codecept_dir, this.config.bootstrap))) {
       var bootstrap = require(fsPath.join(codecept_dir, this.config.bootstrap));
       if (typeof bootstrap === 'function') {
         bootstrap(callback);
@@ -64,15 +64,18 @@ class Codecept {
   }
 
   // loading teardown
-  teardown() {
+  teardown(callback) {
     if (typeof this.config.teardown === 'string' && fileExists(fsPath.join(codecept_dir, this.config.teardown))) {
-        var teardown = require(fsPath.join(codecept_dir, this.config.teardown));
-        if (typeof teardown === 'function') {
-          teardown();
-        }
+      var teardown = require(fsPath.join(codecept_dir, this.config.teardown));
+      if (typeof teardown === 'function') {
+        teardown(callback);
+        return;
+      }
     } else if (typeof this.config.teardown === 'function') {
-      this.config.teardown();
+      this.config.teardown(callback);
+      return;
     }
+    callback();
   }
 
   loadTests(pattern) {
@@ -85,16 +88,16 @@ class Codecept {
   reporterOptions() {
     var reporterOptions = Object.assign(this.config.mocha.reporterOptions || {});
     if (this.opts.reporterOptions !== undefined) {
-        this.opts.reporterOptions.split(",").forEach(function(opt) {
-            var L = opt.split("=");
-            if (L.length > 2 || L.length === 0) {
-                throw new Error("invalid reporter option '" + opt + "'");
-            } else if (L.length === 2) {
-                reporterOptions[L[0]] = L[1];
-            } else {
-                reporterOptions[L[0]] = true;
-            }
-        });
+      this.opts.reporterOptions.split(",").forEach(function (opt) {
+        var L = opt.split("=");
+        if (L.length > 2 || L.length === 0) {
+          throw new Error("invalid reporter option '" + opt + "'");
+        } else if (L.length === 2) {
+          reporterOptions[L[0]] = L[1];
+        } else {
+          reporterOptions[L[0]] = true;
+        }
+      });
     }
     return reporterOptions;
 
@@ -105,10 +108,11 @@ class Codecept {
     if (test) {
       this.mocha.files = this.mocha.files.filter((t) => fsPath.basename(t, '_test.js') === test || fsPath.basename(t, '.js') === test || fsPath.basename(t) === test);
     }
-    this.mocha.run(() => {
-      event.emit(event.all.result, this);
-    }).on('end', () => {
-      this.teardown();
+    this.mocha.run().on('end', () => {
+      let done = () => {
+        event.emit(event.all.result, this);
+      };
+      this.teardown(done);
     });
   }
 

lib/command/run.js

@@ -3,15 +3,15 @@ let getConfig = require('./utils').getConfig;
 let getTestRoot = require('./utils').getTestRoot;
 let Codecept = require('../codecept');
 let output = require('../output');
-let codecept;
 
 module.exports = function (suite, test, options) {
   // registering options globally to use in config
   process.profile = options.profile;
-  let configfile = options.config;
+  let configFile = options.config;
+  let codecept;
 
   let testRoot = getTestRoot(suite);
-  let config = getConfig(testRoot, configfile);
+  let config = getConfig(testRoot, configFile);
   try {
     codecept = new Codecept(config, options);
     codecept.init(testRoot, function (err) {

lib/command/utils.js

@@ -10,35 +10,34 @@ module.exports.getTestRoot = function (currentPath) {
   return testsPath;
 };
 
-module.exports.getConfig = function (testRoot, configfile) {
+module.exports.getConfig = function (testRoot, configFile) {
 
   let config,
-    manualConfigFile = configfile && path.resolve(configfile),
+    manualConfigFile = configFile && path.resolve(configFile),
     jsConfigFile = path.join(testRoot, 'codecept.conf.js'),
     jsConfigFileDeprecated = path.join(testRoot, 'codecept.js'),
     jsonConfigFile = path.join(testRoot, 'codecept.json');
 
-
   if (isFile(manualConfigFile)) { // --config option provided
     if (path.extname(manualConfigFile) === '.js') {
       return configWithDefaults(require(manualConfigFile).config);
     }
     return configWithDefaults(JSON.parse(fs.readFileSync(manualConfigFile, 'utf8')));
   }
 
-  if (fileExists(jsConfigFile)) { // js config file
+  if (isFile(jsConfigFile)) { // js config file
     return configWithDefaults(require(jsConfigFile).config);
   }
 
-  if (fileExists(jsConfigFileDeprecated)) { // deprecated js config file
+  if (isFile(jsConfigFileDeprecated)) { // deprecated js config file
     console.log('Using codecept.js as configuration is deprecated, please rename it to codecept.conf.js');
     return configWithDefaults(require(jsConfigFileDeprecated).config);
   }
 
-  if (fileExists(jsonConfigFile)) { // json config provided
+  if (isFile(jsonConfigFile)) { // json config provided
     return configWithDefaults(JSON.parse(fs.readFileSync(jsonConfigFile, 'utf8')));
   }
-  output.error(`Can not load config from ${jsConfigFile}, ${jsonConfigFile} or ${manualConfigFile}\nCodeceptJS is not initialized in this dir. Execute 'codeceptjs init' to start`);
+  output.error(`Can not load config from ${jsConfigFile}, ${jsonConfigFile} or ${manualConfigFile || 'manual config'}\nCodeceptJS is not initialized in this dir. Execute 'codeceptjs init' to start`);
   process.exit(1);
 };