codeceptjs 4.0.0-beta.4 → 4.0.0-beta.5

package/lib/command/run-multiple/chunk.js

@@ -1,60 +1,60 @@
-const glob = require('glob');
-const path = require('path');
-const fs = require('fs');
+const { globSync } = require('glob')
+const path = require('path')
+const fs = require('fs')
 
 /**
  * Splits a list to (n) parts, defined via the size argument.
  */
 const splitFiles = (list, size) => {
-  const sets = [];
-  const chunks = list.length / size;
-  let i = 0;
+  const sets = []
+  const chunks = list.length / size
+  let i = 0
 
   while (i < chunks) {
-    sets[i] = list.splice(0, size);
-    i++;
+    sets[i] = list.splice(0, size)
+    i++
   }
 
-  return sets;
-};
+  return sets
+}
 
 /**
  * Executes a glob pattern and pushes the results to a list.
  */
-const findFiles = (pattern) => {
-  const files = [];
+const findFiles = pattern => {
+  const files = []
 
-  glob.sync(pattern).forEach((file) => {
-    files.push(path.resolve(file));
-  });
+  globSync(pattern).forEach(file => {
+    files.push(path.resolve(file))
+  })
 
-  return files;
-};
+  return files
+}
 
 /**
  * Joins a list of files to a valid glob pattern
  */
-const flattenFiles = (list) => {
-  const pattern = list.join(',');
-  return pattern.indexOf(',') > -1 ? `{${pattern}}` : pattern;
-};
+const flattenFiles = list => {
+  const pattern = list.join(',')
+  return pattern.indexOf(',') > -1 ? `{${pattern}}` : pattern
+}
 
 /**
  * Greps a file by its content, checks if Scenario or Feature text'
  * matches the grep text.
  */
 const grepFile = (file, grep) => {
-  const contents = fs.readFileSync(file, 'utf8');
-  const pattern = new RegExp(`((Scenario|Feature)\(.*${grep}.*\))`, 'g'); // <- How future proof/solid is this?
-  return !!pattern.exec(contents);
-};
+  const contents = fs.readFileSync(file, 'utf8')
+  const pattern = new RegExp(`((Scenario|Feature)\(.*${grep}.*\))`, 'g') // <- How future proof/solid is this?
+  return !!pattern.exec(contents)
+}
 
-const mapFileFormats = (files) => {
+const mapFileFormats = files => {
   return {
     gherkin: files.filter(file => file.match(/\.feature$/)),
     js: files.filter(file => file.match(/\.t|js$/)),
-  };
-};
+  }
+}
 
 /**
  * Creates a list of chunks incl. configuration by either dividing a list of scenario
@@ -62,30 +62,33 @@ const mapFileFormats = (files) => {
  * the splitting.
  */
 const createChunks = (config, patterns = []) => {
-  const files = patterns.filter(pattern => !!pattern).map((pattern) => {
-    return findFiles(pattern).filter((file) => {
-      return config.grep ? grepFile(file, config.grep) : true;
-    });
-  }).reduce((acc, val) => acc.concat(val), []);
+  const files = patterns
+    .filter(pattern => !!pattern)
+    .map(pattern => {
+      return findFiles(pattern).filter(file => {
+        return config.grep ? grepFile(file, config.grep) : true
+      })
+    })
+    .reduce((acc, val) => acc.concat(val), [])
 
-  let chunks = [];
+  let chunks = []
   if (typeof config.chunks === 'function') {
-    chunks = config.chunks.call(this, files);
+    chunks = config.chunks.call(this, files)
   } else if (typeof config.chunks === 'number' || typeof config.chunks === 'string') {
-    chunks = splitFiles(files, Math.ceil(files.length / config.chunks));
+    chunks = splitFiles(files, Math.ceil(files.length / config.chunks))
   } else {
-    throw new Error('chunks is neither a finite number or a valid function');
+    throw new Error('chunks is neither a finite number or a valid function')
   }
 
-  const chunkConfig = { ...config };
-  delete chunkConfig.chunks;
+  const chunkConfig = { ...config }
+  delete chunkConfig.chunks
 
-  return chunks.map((chunkFiles) => {
-    const { js, gherkin } = mapFileFormats(chunkFiles);
-    return { ...chunkConfig, tests: flattenFiles(js), gherkin: { features: flattenFiles(gherkin) } };
-  });
-};
+  return chunks.map(chunkFiles => {
+    const { js, gherkin } = mapFileFormats(chunkFiles)
+    return { ...chunkConfig, tests: flattenFiles(js), gherkin: { features: flattenFiles(gherkin) } }
+  })
+}
 
 module.exports = {
   createChunks,
-};
+}

package/lib/command/run-multiple.js

@@ -11,20 +11,7 @@ const { getConfig, getTestRoot, fail } = require('./utils')
 const runner = path.join(__dirname, '/../../bin/codecept')
 let config
 const childOpts = {}
-const copyOptions = [
-  'override',
-  'steps',
-  'reporter',
-  'verbose',
-  'config',
-  'reporter-options',
-  'grep',
-  'fgrep',
-  'invert',
-  'debug',
-  'plugins',
-  'colors',
-]
+const copyOptions = ['override', 'steps', 'reporter', 'verbose', 'config', 'reporter-options', 'grep', 'fgrep', 'invert', 'debug', 'plugins', 'colors']
 let overrides = {}
 
 // codeceptjs run-multiple smoke:chrome regression:firefox - will launch smoke run in chrome and regression in firefox
@@ -49,8 +36,8 @@ module.exports = async function (selectedRuns, options) {
 
   // copy opts to run
   Object.keys(options)
-    .filter((key) => copyOptions.indexOf(key) > -1)
-    .forEach((key) => {
+    .filter(key => copyOptions.indexOf(key) > -1)
+    .forEach(key => {
       childOpts[key] = options[key]
     })
 
@@ -96,12 +83,12 @@ module.exports = async function (selectedRuns, options) {
     config.gherkin.features = ''
   }
 
-  const childProcessesPromise = new Promise((resolve) => {
+  const childProcessesPromise = new Promise(resolve => {
     processesDone = resolve
   })
 
   const runsToExecute = []
-  collection.createRuns(selectedRuns, config).forEach((run) => {
+  collection.createRuns(selectedRuns, config).forEach(run => {
     const runName = run.getOriginalName() || run.getName()
     const runConfig = run.getConfig()
     runsToExecute.push(executeRun(runName, runConfig))
@@ -113,7 +100,7 @@ module.exports = async function (selectedRuns, options) {
 
   // Execute all forks
   totalSubprocessCount = runsToExecute.length
-  runsToExecute.forEach((runToExecute) => runToExecute.call(this))
+  runsToExecute.forEach(runToExecute => runToExecute.call(this))
 
   return childProcessesPromise.then(async () => {
     // fire hook
@@ -149,11 +136,7 @@ function executeRun(runName, runConfig) {
   // tweaking default output directories and for mochawesome
   overriddenConfig = replaceValueDeep(overriddenConfig, 'output', path.join(config.output, outputDir))
   overriddenConfig = replaceValueDeep(overriddenConfig, 'reportDir', path.join(config.output, outputDir))
-  overriddenConfig = replaceValueDeep(
-    overriddenConfig,
-    'mochaFile',
-    path.join(config.output, outputDir, `${browserName}_report.xml`),
-  )
+  overriddenConfig = replaceValueDeep(overriddenConfig, 'mochaFile', path.join(config.output, outputDir, `${browserName}_report.xml`))
 
   // override tests configuration
   if (overriddenConfig.tests) {
@@ -165,15 +148,9 @@ function executeRun(runName, runConfig) {
   }
 
   // override grep param and collect all params
-  const params = [
-    'run',
-    '--child',
-    `${runId++}.${runName}:${browserName}`,
-    '--override',
-    JSON.stringify(overriddenConfig),
-  ]
-
-  Object.keys(childOpts).forEach((key) => {
+  const params = ['run', '--child', `${runId++}.${runName}:${browserName}`, '--override', JSON.stringify(overriddenConfig)]
+
+  Object.keys(childOpts).forEach(key => {
     params.push(`--${key}`)
     if (childOpts[key] !== true) params.push(childOpts[key])
   })
@@ -183,7 +160,7 @@ function executeRun(runName, runConfig) {
     params.push(runConfig.grep)
   }
 
-  const onProcessEnd = (errorCode) => {
+  const onProcessEnd = errorCode => {
     if (errorCode !== 0) {
       process.exitCode = errorCode
     }
@@ -197,7 +174,7 @@ function executeRun(runName, runConfig) {
   // Return function of fork for later execution
   return () =>
     fork(runner, params, { stdio: [0, 1, 2, 'ipc'] })
-      .on('exit', (code) => {
+      .on('exit', code => {
         return onProcessEnd(code)
       })
       .on('error', () => {

package/lib/command/run-workers.js

@@ -8,15 +8,24 @@ const Workers = require('../workers')
 module.exports = async function (workerCount, selectedRuns, options) {
   process.env.profile = options.profile
 
-  const suiteArr = []
-  const passedTestArr = []
-  const failedTestArr = []
-  const skippedTestArr = []
-  const stepArr = []
-
   const { config: testConfig, override = '' } = options
   const overrideConfigs = tryOrDefault(() => JSON.parse(override), {})
-  const by = options.suites ? 'suite' : 'test'
+
+  // Determine test split strategy
+  let by = 'test' // default
+  if (options.by) {
+    // Explicit --by option takes precedence
+    by = options.by
+  } else if (options.suites) {
+    // Legacy --suites option
+    by = 'suite'
+  }
+
+  // Validate the by option
+  const validStrategies = ['test', 'suite', 'pool']
+  if (!validStrategies.includes(by)) {
+    throw new Error(`Invalid --by strategy: ${by}. Valid options are: ${validStrategies.join(', ')}`)
+  }
   delete options.parent
   const config = {
     by,
@@ -30,69 +39,24 @@ module.exports = async function (workerCount, selectedRuns, options) {
   output.print(`CodeceptJS v${require('../codecept').version()} ${output.standWithUkraine()}`)
   output.print(`Running tests in ${output.styles.bold(numberOfWorkers)} workers...`)
   output.print()
+  store.hasWorkers = true
 
   const workers = new Workers(numberOfWorkers, config)
   workers.overrideConfig(overrideConfigs)
 
-  workers.on(event.suite.before, (suite) => {
-    suiteArr.push(suite)
-  })
-
-  workers.on(event.step.passed, (step) => {
-    stepArr.push(step)
-  })
-
-  workers.on(event.step.failed, (step) => {
-    stepArr.push(step)
-  })
-
-  workers.on(event.test.failed, (test) => {
-    failedTestArr.push(test)
+  workers.on(event.test.failed, test => {
     output.test.failed(test)
   })
 
-  workers.on(event.test.passed, (test) => {
-    passedTestArr.push(test)
+  workers.on(event.test.passed, test => {
     output.test.passed(test)
   })
 
-  workers.on(event.test.skipped, (test) => {
-    skippedTestArr.push(test)
+  workers.on(event.test.skipped, test => {
     output.test.skipped(test)
   })
 
-  workers.on(event.all.result, () => {
-    // expose test stats after all workers finished their execution
-    function addStepsToTest(test, stepArr) {
-      stepArr.test.steps.forEach((step) => {
-        if (test.steps.length === 0) {
-          test.steps.push(step)
-        }
-      })
-    }
-
-    stepArr.forEach((step) => {
-      passedTestArr.forEach((test) => {
-        if (step.test.title === test.title) {
-          addStepsToTest(test, step)
-        }
-      })
-
-      failedTestArr.forEach((test) => {
-        if (step.test.title === test.title) {
-          addStepsToTest(test, step)
-        }
-      })
-    })
-
-    event.dispatcher.emit(event.workers.result, {
-      suites: suiteArr,
-      tests: {
-        passed: passedTestArr,
-        failed: failedTestArr,
-        skipped: skippedTestArr,
-      },
-    })
+  workers.on(event.all.result, result => {
     workers.printResults()
   })
 
@@ -100,7 +64,6 @@ module.exports = async function (workerCount, selectedRuns, options) {
     if (options.verbose || options.debug) store.debugMode = true
 
     if (options.verbose) {
-      global.debugMode = true
       const { getMachineInfo } = require('./info')
       await getMachineInfo()
     }

package/lib/command/utils.js

@@ -29,8 +29,7 @@ module.exports.readConfig = function (configFile) {
 function getTestRoot(currentPath) {
   if (!currentPath) currentPath = '.'
   if (!path.isAbsolute(currentPath)) currentPath = path.join(process.cwd(), currentPath)
-  currentPath =
-    fs.lstatSync(currentPath).isDirectory() || !path.extname(currentPath) ? currentPath : path.dirname(currentPath)
+  currentPath = fs.lstatSync(currentPath).isDirectory() || !path.extname(currentPath) ? currentPath : path.dirname(currentPath)
   return currentPath
 }
 module.exports.getTestRoot = getTestRoot
@@ -71,7 +70,7 @@ function safeFileWrite(file, contents) {
 
 module.exports.safeFileWrite = safeFileWrite
 
-module.exports.captureStream = (stream) => {
+module.exports.captureStream = stream => {
   let oldStream
   let buffer = ''
 
@@ -79,7 +78,7 @@ module.exports.captureStream = (stream) => {
     startCapture() {
       buffer = ''
       oldStream = stream.write.bind(stream)
-      stream.write = (chunk) => (buffer += chunk)
+      stream.write = chunk => (buffer += chunk)
     },
     stopCapture() {
       if (oldStream !== undefined) stream.write = oldStream
@@ -88,7 +87,7 @@ module.exports.captureStream = (stream) => {
   }
 }
 
-module.exports.printError = (err) => {
+module.exports.printError = err => {
   output.print('')
   output.error(err.message)
   output.print('')
@@ -106,7 +105,7 @@ module.exports.createOutputDir = (config, testRoot) => {
   }
 }
 
-module.exports.findConfigFile = (testsPath) => {
+module.exports.findConfigFile = testsPath => {
   const extensions = ['js', 'ts']
   for (const ext of extensions) {
     const configFile = path.join(testsPath, `codecept.conf.${ext}`)