Fix/bootstrap starting for def

lib/codecept.js

@@ -28,20 +28,20 @@ class Codecept {
    * Initialize CodeceptJS at specific directory.
    * If async initialization is required, pass callback as second parameter.
    *
-   * @param {*} dir
-   * @param {*} callback
+   * @param {string} dir
+   * @param {() => any} [callback]
    */
   init(dir, callback) {
     this.initGlobals(dir);
     // initializing listeners
     Container.create(this.config, this.opts);
-    this.bootstrap(callback);
+    this.runHooks(callback);
   }
 
   /**
    * Creates global variables
    *
-   * @param {*} dir
+   * @param {string} dir
    */
   initGlobals(dir) {
     global.codecept_dir = dir;
@@ -66,12 +66,11 @@ class Codecept {
   }
 
   /**
-   * Executes hooks and bootstrap.
-   * If bootstrap is async, second parameter is required.
+   * Executes hooks.
    *
-   * @param {*} done
+   * @param {() => any} [done]
    */
-  bootstrap(done) {
+  runHooks(done) {
     // default hooks
     runHook(require('./listener/steps'));
     runHook(require('./listener/config'));
@@ -82,7 +81,16 @@ class Codecept {
     // custom hooks
     this.config.hooks.forEach(hook => runHook(hook));
 
-    // bootstrap
+    if (done) done();
+  }
+
+  /**
+   * Executes bootstrap.
+   * If bootstrap is async, second parameter is required.
+   *
+   * @param {() => any} [done]
+   */
+  runBootstrap(done) {
     runHook(this.config.bootstrap, done, 'bootstrap');
   }
 

lib/command/definitions.js

@@ -162,7 +162,7 @@ module.exports = function (genPath, options) {
   const codecept = new Codecept(config, {});
   codecept.init(testsPath, (err) => {
     if (err) {
-      output.error(`Error while running bootstrap file :${err}`);
+      output.error(`Error while running init :${err}`);
       return;
     }
 
@@ -206,8 +206,6 @@ module.exports = function (genPath, options) {
     output.print('Definitions were generated in steps.d.ts');
     output.print('Load them by adding at the top of a test file:');
     output.print(output.colors.grey('\n/// <reference path="./steps.d.ts" />'));
-
-    codecept.teardown();
   });
 };
 

lib/command/gherkin/snippets.js

@@ -21,6 +21,8 @@ module.exports = function (genPath, options) {
 
   const codecept = new Codecept(config, {});
   codecept.init(testsPath, (err) => {
+    if (err) throw new Error(`Error while running init :${err}`);
+
     if (!config.gherkin) {
       output.error('Gherkin is not enabled in config. Run `codecept gherkin:init` to enable it');
       process.exit(1);
@@ -34,77 +36,81 @@ module.exports = function (genPath, options) {
       process.exit(1);
     }
 
-    const files = [];
-    glob.sync(config.gherkin.features, { cwd: global.codecept_dir }).forEach((file) => {
-      if (!fsPath.isAbsolute(file)) {
-        file = fsPath.join(global.codecept_dir, file);
-      }
-      files.push(fsPath.resolve(file));
-    });
-    output.print(`Loaded ${files.length} files`);
+    codecept.runBootstrap((err) => {
+      if (err) throw new Error(`Error while running bootstrap file :${err}`);
 
-    let newSteps = [];
-
-    const parseSteps = (steps) => {
-      const newSteps = [];
-      let currentKeyword = '';
-      for (const step of steps) {
-        if (step.keyword.trim() === 'And') {
-          if (!currentKeyword) throw new Error(`There is no active keyword for step '${step.text}'`);
-          step.keyword = currentKeyword;
+      const files = [];
+      glob.sync(config.gherkin.features, { cwd: global.codecept_dir }).forEach((file) => {
+        if (!fsPath.isAbsolute(file)) {
+          file = fsPath.join(global.codecept_dir, file);
         }
-        currentKeyword = step.keyword;
-        try {
-          matchStep(step.text);
-        } catch (err) {
-          let stepLine = step.text
-            .replace(/\"(.*?)\"/g, '{string}')
-            .replace(/(\d+\.\d+)/, '{float}')
-            .replace(/ (\d+) /, ' {int} ');
-          stepLine = Object.assign(stepLine, { type: step.keyword.trim(), location: step.location });
-          newSteps.push(stepLine);
+        files.push(fsPath.resolve(file));
+      });
+      output.print(`Loaded ${files.length} files`);
+
+      let newSteps = [];
+
+      const parseSteps = (steps) => {
+        const newSteps = [];
+        let currentKeyword = '';
+        for (const step of steps) {
+          if (step.keyword.trim() === 'And') {
+            if (!currentKeyword) throw new Error(`There is no active keyword for step '${step.text}'`);
+            step.keyword = currentKeyword;
+          }
+          currentKeyword = step.keyword;
+          try {
+            matchStep(step.text);
+          } catch (err) {
+            let stepLine = step.text
+              .replace(/\"(.*?)\"/g, '{string}')
+              .replace(/(\d+\.\d+)/, '{float}')
+              .replace(/ (\d+) /, ' {int} ');
+            stepLine = Object.assign(stepLine, { type: step.keyword.trim(), location: step.location });
+            newSteps.push(stepLine);
+          }
         }
-      }
-      return newSteps;
-    };
+        return newSteps;
+      };
 
-    const parseFile = (file) => {
-      const ast = parser.parse(fs.readFileSync(file).toString());
-      for (const child of ast.feature.children) {
-        if (child.type === 'ScenarioOutline') continue; // skip scenario outline
-        newSteps = newSteps.concat(parseSteps(child.steps).map((step) => {
-          return Object.assign(step, { file: file.replace(global.codecept_dir, '').slice(1) });
-        }));
-      }
-    };
+      const parseFile = (file) => {
+        const ast = parser.parse(fs.readFileSync(file).toString());
+        for (const child of ast.feature.children) {
+          if (child.type === 'ScenarioOutline') continue; // skip scenario outline
+          newSteps = newSteps.concat(parseSteps(child.steps).map((step) => {
+            return Object.assign(step, { file: file.replace(global.codecept_dir, '').slice(1) });
+          }));
+        }
+      };
 
-    files.forEach(file => parseFile(file));
+      files.forEach(file => parseFile(file));
 
-    let stepFile = config.gherkin.steps[0];
-    if (!fsPath.isAbsolute(stepFile)) {
-      stepFile = fsPath.join(global.codecept_dir, stepFile);
-    }
+      let stepFile = config.gherkin.steps[0];
+      if (!fsPath.isAbsolute(stepFile)) {
+        stepFile = fsPath.join(global.codecept_dir, stepFile);
+      }
 
-    const snippets = newSteps
-      .filter((value, index, self) => self.indexOf(value) === index)
-      .map((step) => {
-        return `
+      const snippets = newSteps
+        .filter((value, index, self) => self.indexOf(value) === index)
+        .map((step) => {
+          return `
 ${step.type}('${step}', () => {
   // From "${step.file}" ${JSON.stringify(step.location)}
   throw new Error('Not implemented yet');
 });`;
-      });
+        });
 
-    if (!snippets.length) {
-      output.print('No new snippets found');
-      return;
-    }
-    output.success(`Snippets generated: ${snippets.length}`);
-    output.print(snippets.join('\n'));
+      if (!snippets.length) {
+        output.print('No new snippets found');
+        return;
+      }
+      output.success(`Snippets generated: ${snippets.length}`);
+      output.print(snippets.join('\n'));
 
-    if (!options.dryRun) {
-      output.success(`Snippets added to ${output.colors.bold(stepFile)}`);
-      fs.writeFileSync(stepFile, fs.readFileSync(stepFile).toString() + snippets.join('\n') + '\n'); // eslint-disable-line
-    }
+      if (!options.dryRun) {
+        output.success(`Snippets added to ${output.colors.bold(stepFile)}`);
+        fs.writeFileSync(stepFile, fs.readFileSync(stepFile).toString() + snippets.join('\n') + '\n'); // eslint-disable-line
+      }
+    });
   });
 };

lib/command/gherkin/steps.js

@@ -13,16 +13,22 @@ module.exports = function (genPath, options) {
 
   const codecept = new Codecept(config, {});
   codecept.init(testsPath, (err) => {
-    output.print('Gherkin Step definitions:');
-    output.print();
-    const steps = getSteps();
-    for (const step of Object.keys(steps)) {
-      output.print(`  ${output.colors.bold(step)} \n    => ${output.colors.green(steps[step].line || '')}`);
-    }
-    output.print();
-    if (!Object.keys(steps).length) {
-      output.error('No Gherkin steps defined');
-    }
+    if (err) throw new Error(`Error while running init :${err}`);
+
+    codecept.runBootstrap((err) => {
+      if (err) throw new Error(`Error while running bootstrap file :${err}`);
+
+      output.print('Gherkin Step definitions:');
+      output.print();
+      const steps = getSteps();
+      for (const step of Object.keys(steps)) {
+        output.print(`  ${output.colors.bold(step)} \n    => ${output.colors.green(steps[step].line || '')}`);
+      }
+      output.print();
+      if (!Object.keys(steps).length) {
+        output.error('No Gherkin steps defined');
+      }
+    });
   });
 };
 

lib/command/interactive.js

@@ -13,19 +13,26 @@ module.exports = function (path, options) {
   const codecept = new Codecept(config, options);
   codecept.init(testsPath, (err) => {
     if (err) {
-      output.error(`Error while running bootstrap file :${err}`);
+      output.error(`Error while running init :${err}`);
       return;
     }
 
-    if (options.verbose) output.level(3);
+    codecept.runBootstrap((err) => {
+      if (err) {
+        output.error(`Error while running bootstrap file :${err}`);
+        return;
+      }
 
-    output.print('String interactive shell for current suite...');
-    recorder.start();
-    event.emit(event.suite.before, {});
-    event.emit(event.test.before);
-    require('../pause')();
-    recorder.add(() => event.emit(event.test.after));
-    recorder.add(() => event.emit(event.suite.after, {}));
-    recorder.add(() => codecept.teardown());
+      if (options.verbose) output.level(3);
+
+      output.print('String interactive shell for current suite...');
+      recorder.start();
+      event.emit(event.suite.before, {});
+      event.emit(event.test.before);
+      require('../pause')();
+      recorder.add(() => event.emit(event.test.after));
+      recorder.add(() => event.emit(event.suite.after, {}));
+      recorder.add(() => codecept.teardown());
+    });
   });
 };

lib/command/list.js

@@ -12,7 +12,7 @@ module.exports = function (path) {
   const codecept = new Codecept(config, {});
   codecept.init(testsPath, (err) => {
     if (err) {
-      output.error(`Error while running bootstrap file :${err}`);
+      output.error(`Error while running init :${err}`);
       return;
     }
 
@@ -38,7 +38,5 @@ module.exports = function (path) {
     }
     output.print('PS: Actions are retrieved from enabled helpers. ');
     output.print('Implement custom actions in your helper classes.');
-
-    codecept.teardown();
   });
 };

lib/command/run.js

@@ -33,9 +33,13 @@ module.exports = function (test, options) {
   try {
     codecept = new Codecept(config, options);
     codecept.init(testRoot, (err) => {
-      if (err) throw new Error(`Error while running bootstrap file :${err}`);
-      codecept.loadTests();
-      codecept.run(test);
+      if (err) throw new Error(`Error while running init :${err}`);
+
+      codecept.runBootstrap((err) => {
+        if (err) throw new Error(`Error while running bootstrap file :${err}`);
+        codecept.loadTests();
+        codecept.run(test);
+      });
     });
   } catch (err) {
     output.print('');