fix: more tests

.eslintrc.json

@@ -44,6 +44,10 @@
     "arrow-parens": 0,
     "default-param-last": 0,
     "import/extensions": 0,
-    "no-return-await": "off"
+    "no-return-await": "off",
+    "import/prefer-default-export": 0,
+    "import/no-named-as-default-member": 0,
+    "import/no-named-default": 0,
+    "import/no-cycle": 0
   }
 }

bin/codecept.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
-import { program } from 'commander';
-import Codecept from '../lib/codecept.js';
+import { Command } from 'commander';
+const program = new Command();
+import { version } from '../lib/codecept.js';
 import { print, error } from '../lib/output.js';
 import { printError } from '../lib/command/utils.js';
 import * as init from '../lib/command/init.js';
@@ -21,7 +22,7 @@ import * as info from '../lib/command/info.js';
 
 const errorHandler = (fn) => async (...args) => {
   try {
-    await fn(...args);
+    await fn.default(...args);
   } catch (e) {
     printError(e);
     process.exitCode = 1;
@@ -37,7 +38,7 @@ if (process.versions.node && process.versions.node.split('.') && process.version
 }
 
 program.usage('<command> [options]');
-program.version(Codecept.version());
+program.version(version());
 
 program.command('init [path]')
   .description('Creates dummy config in current dir or [path]')
@@ -131,7 +132,7 @@ program.command('run [test]')
   .option('-R, --reporter <name>', 'specify the reporter to use')
   .option('-S, --sort', 'sort test files')
   .option('-b, --bail', 'bail after first test failure')
-  .option('-d, --debug', "enable node's debugger, synonym for node --debug")
+  //.option('-d, --debug', "enable node's debugger, synonym for node --debug")
   .option('-g, --grep <pattern>', 'only run tests matching <pattern>')
   .option('-f, --fgrep <string>', 'only run tests containing <string>')
   .option('-i, --invert', 'inverts --grep and --fgrep matches')
@@ -229,7 +230,7 @@ program.command('run-rerun [test]')
   .option('-R, --reporter <name>', 'specify the reporter to use')
   .option('-S, --sort', 'sort test files')
   .option('-b, --bail', 'bail after first test failure')
-  .option('-d, --debug', "enable node's debugger, synonym for node --debug")
+ // .option('-d, --debug', "enable node's debugger, synonym for node --debug")
   .option('-g, --grep <pattern>', 'only run tests matching <pattern>')
   .option('-f, --fgrep <string>', 'only run tests containing <string>')
   .option('-i, --invert', 'inverts --grep and --fgrep matches')

lib/actor.js

@@ -1,11 +1,10 @@
-import { Step } from './step.js';
-import { MetaStep } from './step.js';
+import { Step, MetaStep } from './step.js';
 import container from './container.js';
 import { methodsOfObject } from './utils.js';
 import recorder from './recorder.js';
 import * as event from './event.js';
 import { store } from './store.js';
-import output from './output.js';
+import * as output from './output.js';
 
 /**
  * @interface

lib/ai.js

@@ -1,10 +1,11 @@
 import { Configuration, OpenAIApi } from 'openai';
 import debug from 'debug';
-debug('codeceptjs:ai');
 import config from './config.js';
-import output from './output.js';
+import * as output from './output.js';
 import { removeNonInteractiveElements, minifyHtml, splitByChunks } from './html.js';
 
+debug('codeceptjs:ai');
+
 const defaultConfig = {
   model: 'gpt-3.5-turbo-16k',
   temperature: 0.1,

lib/assert/empty.js

@@ -1,7 +1,7 @@
 import Assertion from '../assert.js';
 import AssertionFailedError from './error.js';
 import { template } from '../utils.js';
-import output from '../output.js';
+import * as output from '../output.js';
 
 class EmptinessAssertion extends Assertion {
   constructor(params) {

lib/assert/equal.js

@@ -1,7 +1,7 @@
 import Assertion from '../assert.js';
 import AssertionFailedError from './error.js';
 import { template } from '../utils.js';
-import output from '../output.js';
+import * as output from '../output.js';
 
 class EqualityAssertion extends Assertion {
   constructor(params) {

lib/assert/truth.js

@@ -1,7 +1,7 @@
 import Assertion from '../assert.js';
 import AssertionFailedError from './error.js';
 import { template } from '../utils.js';
-import output from '../output.js';
+import * as output from '../output.js';
 
 class TruthAssertion extends Assertion {
   constructor(params) {
@@ -31,7 +31,9 @@ class TruthAssertion extends Assertion {
   }
 }
 
+export function truth(subject, type) {
+  return new TruthAssertion({ subject, type });
+}
 export default {
   Assertion: TruthAssertion,
-  truth: (subject, type) => new TruthAssertion({ subject, type }),
 };

lib/cli.js

@@ -1,11 +1,10 @@
 import mocha from 'mocha';
-
-import ms from "ms";
-
-import * as event from "./event.js";
-
-import output from "./output.js";
-import AssertionFailedError from "./assert/error.js";
+import ms from 'ms';
+import * as event from './event.js';
+import * as output from './output.js';
+import AssertionFailedError from './assert/error.js';
+import * as Codecept from './codecept.js';
+import container from './container.js';
 
 const { reporters: { Base } } = mocha;
 
@@ -23,16 +22,15 @@ class Cli extends Base {
     if (opts.debug) level = 2;
     if (opts.verbose) level = 3;
     output.level(level);
-    const version = require('./codecept.js').version();
+    const version = Codecept.version();
     output.print(`CodeceptJS v${version} ${output.standWithUkraine()}`);
     output.print(`Using test root "${global.codecept_dir}"`);
 
     const showSteps = level >= 1;
 
     if (level >= 2) {
-      const Containter = require('./container.js');
-      output.print(output.styles.debug(`Helpers: ${Object.keys(Containter.helpers()).join(', ')}`));
-      output.print(output.styles.debug(`Plugins: ${Object.keys(Containter.plugins()).join(', ')}`));
+      output.print(output.styles.debug(`Helpers: ${Object.keys(container.helpers()).join(', ')}`));
+      output.print(output.styles.debug(`Plugins: ${Object.keys(container.plugins()).join(', ')}`));
     }
 
     runner.on('start', () => {

lib/codecept.js

@@ -1,49 +1,47 @@
 import { existsSync, readFileSync } from 'fs';
 import glob from 'glob';
-import fsPath from 'path';
-import { resolve } from 'path';
+import fsPath, { resolve } from 'path';
+import generated from '@codeceptjs/helper';
 import container from './container.js';
 import Config from './config.js';
 import * as event from './event.js';
 import runHook from './hooks.js';
-import output from './output.js';
+import * as output from './output.js';
 import { emptyFolder } from './utils.js';
-import path from "path";
-import generated from "@codeceptjs/helper";
 import * as index from './index.js';
 
-import * as actor0 from "./actor.js";
+import * as actor0 from './actor.js';
 
-import pause0 from "./pause.js";
+import pause0 from './pause.js';
 
-import within0 from "./within.js";
+import within0 from './within.js';
 
-import session0 from "./session.js";
+import session0 from './session.js';
 
-import data from "./data/table.js";
+import data from './data/table.js';
 
-import build from "./locator.js";
+import * as Build from './locator.js';
 
 import secret from './secret.js';
 
 // BDD
-import stepDefinitions from "./interfaces/bdd.js";
+import * as stepDefinitions from './interfaces/bdd.js';
 
-import listener from "./listener/steps.js";
+import listener from './listener/steps.js';
 
-import listener0 from "./listener/artifacts.js";
+import listener0 from './listener/artifacts.js';
 
-import listener01 from "./listener/config.js";
+import listener01 from './listener/config.js';
 
-import listener012 from "./listener/helpers.js";
+import listener012 from './listener/helpers.js';
 
-import listener0123 from "./listener/retry.js";
+import listener0123 from './listener/retry.js';
 
-import listener01234 from "./listener/timeout.js";
+import listener01234 from './listener/timeout.js';
 
-import listener012345 from "./listener/exit.js";
+import listener012345 from './listener/exit.js';
 
-const __dirname = path.resolve();
+const __dirname = fsPath.resolve('.');
 
 /**
  * CodeceptJS runner
@@ -111,7 +109,7 @@ export default class Codecept {
       global.within = within0;
       global.session = session0;
       global.DataTable = data;
-      global.locate = locator => new build(locator);
+      global.locate = locator => new Build(locator);
       global.inject = container.support;
       global.share = container.share;
       global.secret = secret;
@@ -238,8 +236,8 @@ export default class Codecept {
       }
     });
   }
+}
 
-  static version() {
-    return JSON.parse(readFileSync(`${__dirname}/../package.json`, 'utf8')).version;
-  }
+export function version() {
+  return JSON.parse(readFileSync(`${__dirname}/package.json`, 'utf8')).version;
 }

lib/command/definitions.js

@@ -1,10 +1,10 @@
 import fs from 'fs';
 import path from 'path';
 import { getConfig, getTestRoot } from './utils.js';
-import Codecept from '../../lib/codecept.js';
+import Codecept from '../codecept.js';
 import container from '../container.js';
-import output from '../output.js';
-import plugin from "../plugin/standardActingHelpers.js";
+import * as output from '../output.js';
+import plugin from '../plugin/standardActingHelpers.js';
 
 const actingHelpers = [...(plugin), 'REST'];
 

lib/command/dryRun.js

@@ -1,7 +1,7 @@
 import { getConfig, getTestRoot } from './utils.js';
 import Config from '../config.js';
 import Codecept from '../codecept.js';
-import output from '../output.js';
+import * as output from '../output.js';
 import * as event from '../event.js';
 import { store } from '../store.js';
 import Container from '../container.js';

lib/command/generate.js

@@ -3,10 +3,14 @@ import fs from 'fs';
 import inquirer from 'inquirer';
 import mkdirp from 'mkdirp';
 import path from 'path';
-import { fileExists, ucfirst, lcfirst, beautify } from '../utils.js';
-import output from '../output.js';
+import {
+  fileExists, ucfirst, lcfirst, beautify,
+} from '../utils.js';
+import * as output from '../output.js';
 import generateDefinitions from './definitions.js';
-import { getConfig, getTestRoot, safeFileWrite, readConfig } from './utils.js';
+import {
+  getConfig, getTestRoot, safeFileWrite, readConfig,
+} from './utils.js';
 
 let extension = 'js';
 

lib/command/gherkin/init.js

@@ -1,8 +1,10 @@
 import path from 'path';
 import mkdirp from 'mkdirp';
-import output from '../../output.js';
+import * as output from '../../output.js';
 import { fileExists } from '../../utils.js';
-import { getConfig, getTestRoot, updateConfig, safeFileWrite } from '../utils.js';
+import {
+  getConfig, getTestRoot, updateConfig, safeFileWrite,
+} from '../utils.js';
 
 const featureFile = `Feature: Business rules
   In order to achieve my goals

lib/command/gherkin/snippets.js

@@ -6,7 +6,7 @@ import glob from 'glob';
 import fsPath from 'path';
 import { getConfig, getTestRoot } from '../utils.js';
 import Codecept from '../../codecept.js';
-import output from '../../output.js';
+import * as output from '../../output.js';
 import { matchStep } from '../../interfaces/bdd.js';
 
 const uuidFn = Messages.IdGenerator.uuid();

lib/command/gherkin/steps.js

@@ -1,6 +1,6 @@
 import { getConfig, getTestRoot } from '../utils.js';
 import Codecept from '../../codecept.js';
-import output from '../../output.js';
+import * as output from '../../output.js';
 import { getSteps } from '../../interfaces/bdd.js';
 
 export default function (genPath, options) {

lib/command/info.js

@@ -1,7 +1,8 @@
 import envinfo from 'envinfo';
 import { getConfig, getTestRoot } from './utils.js';
 import Codecept from '../codecept.js';
-import output from '../output.js';
+import * as codeceptInstance from '../codecept.js';
+import * as output from '../output.js';
 
 export default async function (path) {
   const testsPath = getTestRoot(path);
@@ -11,7 +12,7 @@ export default async function (path) {
 
   output.print('\n Environment information:-\n');
   const info = {};
-  info.codeceptVersion = Codecept.version();
+  info.codeceptVersion = codeceptInstance.version();
   info.nodeInfo = await envinfo.helpers.getNodeInfo();
   info.osInfo = await envinfo.helpers.getOSInfo();
   info.cpuInfo = await envinfo.helpers.getCPUInfo();
@@ -37,7 +38,7 @@ export default async function (path) {
   output.print('***************************************');
 }
 
-export const getMachineInfo = async () => {
+export async function getMachineInfo() {
   const info = {
     nodeInfo: await envinfo.helpers.getNodeInfo(),
     osInfo: await envinfo.helpers.getOSInfo(),
@@ -59,4 +60,4 @@ export const getMachineInfo = async () => {
   output.print('If you need more detailed info, just run this: npx codeceptjs info');
   output.print('***************************************');
   return info;
-};
+}

lib/command/init.js

@@ -10,7 +10,7 @@ import { fileExists, beautify, installedLocally } from '../utils.js';
 import { getTestRoot } from './utils.js';
 import generateDefinitions from './definitions.js';
 import { test as generateTest } from './generate.js';
-import * as translations0 from "../../translations/index.js";
+import * as translations0 from '../../translations/index.js';
 
 const isLocal = installedLocally();
 

lib/command/interactive.js

@@ -3,7 +3,7 @@ import recorder from '../recorder.js';
 import Codecept from '../codecept.js';
 import Container from '../container.js';
 import * as event from '../event.js';
-import output from '../output.js';
+import * as output from '../output.js';
 import webHelpers from '../plugin/standardActingHelpers.js';
 
 export default async function (path, options) {

lib/command/list.js

@@ -3,7 +3,7 @@ import Codecept from '../codecept.js';
 import container from '../container.js';
 import { getParamsToString } from '../parser.js';
 import { methodsOfObject } from '../utils.js';
-import output from '../output.js';
+import * as output from '../output.js';
 
 export default function (path) {
   const testsPath = getTestRoot(path);

lib/command/run-multiple.js

@@ -6,6 +6,7 @@ import * as event from '../event.js';
 import collection from './run-multiple/collection.js';
 import { clearString, replaceValueDeep } from '../utils.js';
 import { getConfig, getTestRoot, fail } from './utils.js';
+
 const __dirname = path.resolve();
 
 const runner = path.join(__dirname, '/../../bin/codecept.js');

lib/command/run-multiple/run.js

@@ -23,4 +23,4 @@ class Run {
 
 export function createRun(name, config) {
   return new Run(name, config);
-};
+}