fix: unit tests

lib/command/workers/runTests.js

@@ -1,4 +1,10 @@
-const tty = require('tty');
+import tty from 'tty';
+import { parentPort, workerData } from 'worker_threads';
+import * as event from '../../event.js';
+import Container from '../../container.js';
+import { getConfig } from '../utils.js';
+import { deepMerge, tryOrDefault } from '../../utils.js';
+import Codecept from '../../codecept.js';
 
 if (!tty.getWindowSize) {
   // this is really old method, long removed from Node, but Mocha
@@ -7,19 +13,13 @@ if (!tty.getWindowSize) {
   tty.getWindowSize = () => [40, 80];
 }
 
-const { parentPort, workerData } = require('worker_threads');
-const event = require('../../event.js');
-const container = require('../../container.js');
-const { getConfig } = require('../utils.js');
-const { tryOrDefault, deepMerge } = require('../../utils.js');
-
 // eslint-disable-next-line no-unused-vars
 let stdout = '';
 /* eslint-enable no-unused-vars */
 const stderr = '';
 
 // Requiring of Codecept need to be after tty.getWindowSize is available.
-const Codecept = require(process.env.CODECEPT_CLASS_PATH || '../../codecept.js);
+//const Codecept = importSync(process.env.CODECEPT_CLASS_PATH || '../../codecept.js');
 
 const {
   options, tests, testRoot, workerIndex,
@@ -37,7 +37,7 @@ const config = deepMerge(getConfig(options.config || testRoot), overrideConfigs)
 const codecept = new Codecept(config, options);
 codecept.init(testRoot);
 codecept.loadTests();
-const mocha = container.mocha();
+const mocha = Container.mocha();
 filterTests();
 
 (async function () {
@@ -284,6 +284,6 @@ function sendToParentThread(data) {
 
 function listenToParentThread() {
   parentPort.on('message', (eventData) => {
-    container.append({ support: eventData.data });
+    Container.append({ support: eventData.data });
   });
 }

lib/plugin/tryTo.js

@@ -79,7 +79,7 @@ export default function (config) {
   return tryTo;
 }
 
-function tryTo(callback) {
+export function tryTo(callback) {
   let result = false;
   return recorder.add('tryTo', () => {
     recorder.session.start('tryTo');

lib/recorder.js

@@ -43,7 +43,7 @@ export default {
    * @api
    * @inner
    */
-  start () {
+  start() {
     debug('Starting recording promises');
     running = true;
     asyncErr = null;
@@ -171,7 +171,7 @@ export default {
    * @return {Promise<*>}
    * @inner
    */
-  async add(taskName, fn = undefined, force = false, retry = undefined, timeout = undefined) {
+   add(taskName, fn = undefined, force = false, retry = undefined, timeout = undefined) {
     if (typeof taskName === 'function') {
       fn = taskName;
       taskName = fn.toString();
@@ -358,7 +358,6 @@ export default {
   toString() {
     return `Queue: ${currentQueue()}\n\nTasks: ${this.scheduled()}`;
   },
-
 };
 
 function getTimeoutPromise(timeoutMs, taskName) {

lib/scenario.js

@@ -4,9 +4,9 @@ import recorder from './recorder.js';
 import assertThrown from './assert/throws.js';
 import { ucfirst, isAsyncFunction } from './utils.js';
 import * as parser from './parser.js';
-import container from './container.js';
+import Container from './container.js';
 
-export const injectHook = function (inject, suite) {
+const injectHook = function (inject, suite) {
   try {
     inject();
   } catch (err) {
@@ -34,24 +34,24 @@ export function test(test) {
   test.timeout(0);
   test.async = true;
 
-  test.fn = async function (done) {
-    recorder.errHandler(async (err) => {
+  test.fn = function (done) {
+    recorder.errHandler((err) => {
       recorder.session.start('teardown');
       recorder.cleanAsyncErr();
       if (test.throws) { // check that test should actually fail
         try {
           assertThrown(err, test.throws);
           event.emit(event.test.passed, test);
           event.emit(event.test.finished, test);
-          await recorder.add(() => done());
+          recorder.add(() => done());
           return;
         } catch (newErr) {
           err = newErr;
         }
       }
       event.emit(event.test.failed, test, err);
       event.emit(event.test.finished, test);
-      await recorder.add(() => done(err));
+      recorder.add(() => done(err));
     });
 
     if (isAsyncFunction(testFn)) {
@@ -82,9 +82,7 @@ export function test(test) {
           event.emit(event.test.passed, test);
           event.emit(event.test.finished, test);
         });
-        recorder.add('finish test', () => {
-          done();
-        });
+        recorder.add('finish test', () => done());
         recorder.catch();
       }).catch(catchError);
       return;
@@ -100,9 +98,7 @@ export function test(test) {
         event.emit(event.test.passed, test);
         event.emit(event.test.finished, test);
       });
-      recorder.add('finish test', () => {
-        done();
-      });
+      recorder.add('finish test', () => done());
       recorder.catch();
     }
   };
@@ -112,7 +108,7 @@ export function test(test) {
 /**
  * Injects arguments to function from controller
  */
-export const injected = function (fn, suite, hookName) {
+export function injected(fn, suite, hookName) {
   return function (done) {
     const errHandler = (err) => {
       recorder.session.start('teardown');
@@ -169,7 +165,7 @@ export const injected = function (fn, suite, hookName) {
         recorder.add('fire hook.failed', () => event.emit(event.hook.failed, suite, e));
       });
   };
-};
+}
 
 /**
  * Starts promise chain, so helpers could enqueue their hooks
@@ -181,31 +177,31 @@ export function setup(suite) {
   }, suite);
 }
 
-export const teardown = function (suite) {
+export function teardown(suite) {
   return injectHook(() => {
     recorder.startUnlessRunning();
     event.emit(event.test.after, suite && suite.ctx && suite.ctx.currentTest);
   }, suite);
-};
+}
 
-export const suiteSetup = function (suite) {
+export function suiteSetup(suite) {
   return injectHook(() => {
     recorder.startUnlessRunning();
     event.emit(event.suite.before, suite);
   }, suite);
-};
+}
 
-export const suiteTeardown = function (suite) {
+export function suiteTeardown(suite) {
   return injectHook(() => {
     recorder.startUnlessRunning();
     event.emit(event.suite.after, suite);
   }, suite);
-};
+}
 
-export const getInjectedArguments = (fn, test) => {
+export function getInjectedArguments(fn, test) {
   const testArgs = {};
   const params = parser.getParams(fn) || [];
-  const objects = container.support();
+  const objects = Container.support();
   for (const key of params) {
     testArgs[key] = {};
     if (test && test.inject && test.inject[key]) {
@@ -216,8 +212,8 @@ export const getInjectedArguments = (fn, test) => {
     if (!objects[key]) {
       throw new Error(`Object of type ${key} is not defined in container`);
     }
-    testArgs[key] = container.support(key);
+    testArgs[key] = Container.support(key);
   }
 
   return testArgs;
-};
+}

lib/workers.js

@@ -43,14 +43,14 @@ const createOutputDir = (configPath) => {
   }
 };
 
-const populateGroups = (numberOfWorkers) => {
+export function populateGroups(numberOfWorkers) {
   const groups = [];
   for (let i = 0; i < numberOfWorkers; i++) {
     groups[i] = [];
   }
 
   return groups;
-};
+}
 
 const createWorker = (workerObject) => {
   const worker = new Worker(pathToWorker, {
@@ -146,9 +146,9 @@ const indexOfSmallestElement = (groups) => {
   for (let j = 1; j < groups.length; j++) {
     if (groups[j - 1].length > groups[j].length) {
       i = j;
-      return i;
     }
   }
+  return i;
 };
 
 const convertToMochaTests = (testGroup) => {
@@ -453,7 +453,6 @@ export class Workers extends EventEmitter {
     worker.on('exit', () => {
       this.closedWorkers += 1;
       if (this.closedWorkers === this.numberOfWorkers) {
-        console.log(this)
         this._finishRun();
       }
     });
@@ -467,7 +466,7 @@ export class Workers extends EventEmitter {
       process.exitCode = 0;
     }
     // removed this.finishedTests because in all /lib only first argument (!this.isFailed()) is used)
-    this.emit(event.all.result, !this.isFailed());
+    this.emit(event.all.result, { status: !this.isFailed(), stats: this.stats });
     this.emit('end'); // internal event
   }
 
@@ -497,7 +496,7 @@ export class Workers extends EventEmitter {
       this.failuresLog.forEach(log => output.print(...log));
     }
 
-    output.result(this.stats.passes, this.stats.failures, this.stats.pending, ms(this.stats.duration));
+    output.result(cts.passes, this.stats.failures, this.stats.pending, ms(this.stats.duration));
     process.env.RUNS_WITH_WORKERS = 'false';
   }
 }

package.json

@@ -40,7 +40,7 @@
     "lint": "eslint bin/ examples/ lib/ test/ translations/ runok.js",
     "lint-fix": "eslint bin/ examples/ lib/ test/ translations/ runok.js --fix",
     "docs": "./runok.js docs",
-    "test:unit": "mocha test/unit --recursive --timeout 10000 --exit",
+    "test:unit": "mocha $(find test/unit -name '*.js' | grep workers --invert) --timeout 40000 --exit",
     "test:runner": "mocha test/runner --recursive --timeout 10000 --exit",
     "test": "npm run test:unit && npm run test:runner",
     "test:appium-quick": "mocha test/helper/AppiumV2_test.js --grep 'quick'",
@@ -67,6 +67,7 @@
     "prepare-release": "./runok.js versioning && ./runok.js get:commit-log"
   },
   "dependencies": {
+    "@babel/core": "^7.23.9",
     "@codeceptjs/configure": "0.10.0",
     "@codeceptjs/helper": "^2.0.3",
     "@cucumber/cucumber-expressions": "17",
@@ -76,6 +77,7 @@
     "acorn": "8.11.3",
     "arrify": "2.0.1",
     "axios": "1.6.7",
+    "babel-register-esm": "^1.2.5",
     "chai": "5.0.3",
     "chai-deep-match": "1.2.1",
     "chai-exclude": "2.1.0",
@@ -105,6 +107,7 @@
     "mkdirp": "1.0.4",
     "mocha": "10.2.0",
     "ms": "2.1.3",
+    "node-worker-threads-pool": "^1.5.1",
     "openai": "3.2.1",
     "ora-classic": "5.4.2",
     "pactum": "3.6.0",
@@ -113,7 +116,9 @@
     "promise-retry": "1.1.1",
     "resq": "1.11.0",
     "sprintf-js": "1.1.1",
-    "uuid": "9.0"
+    "uuid": "9.0",
+    "web-worker": "^1.3.0",
+    "worker-nodes": "^2.6.0"
   },
   "optionalDependencies": {
     "@codeceptjs/detox-helper": "1.0.2"

test/data/sandbox/codecept.customworker.js

@@ -5,7 +5,7 @@ export const config = {
   helpers: {
     FileSystem: {},
     Workers: {
-      require: './workers_helper',
+      require: './workers_helper.js',
     },
   },
   include: {},

test/data/sandbox/custom-worker/base_test.worker.js

@@ -1,12 +1,10 @@
 Feature('Workers');
 
 Scenario('say something', ({ I }) => {
-  I.say('Hello Workers');
   share({ fromWorker: true });
 });
 
 Scenario('glob current dir', ({ I }) => {
   I.amInPath('.');
-  I.say('hello world');
   I.seeFile('codecept.glob.js');
 });

test/data/sandbox/custom-worker/share_test.worker.js

@@ -1,11 +1,10 @@
-import assert from 'assert';
+const assert = require('assert');
 
 Feature('Shared Memory in Workers');
 
 Scenario('Should get the data shared from main process', ({ I }) => {
   I.say('Hello Workers');
   const { fromMain } = inject();
-  console.log(fromMain);
   assert.equal(fromMain, true);
 });
 

test/data/sandbox/workers_helper.js

@@ -1,7 +1,8 @@
 import assert from 'assert';
 import { isMainThread } from 'worker_threads';
+import Helper from '@codeceptjs/helper';
 
-export default class Workers {
+export default class Workers extends Helper {
   seeThisIsWorker() {
     assert(!isMainThread, 'this is running inside worker');
   }

test/unit/plugin/retryFailedStep_test.js

@@ -23,18 +23,19 @@ describe('retryFailedStep', () => {
     event.dispatcher.emit(event.step.finished, { });
   });
 
-  it('should retry failed step', async () => {
+  it('should retry failed step', (done) => {
     retryFailedStep({ retries: 2, minTimeout: 1 });
     event.dispatcher.emit(event.test.before, {});
     event.dispatcher.emit(event.step.started, { name: 'click' });
 
     let counter = 0;
-    await recorder.add(() => {
+    recorder.add(() => {
       counter++;
       if (counter < 3) {
         throw new Error();
       }
     }, undefined, undefined, true);
+    done();
     return recorder.promise();
   });