codeceptjs 4.0.0-beta.4 → 4.0.0-beta.6.esm-aria

package/lib/command/run-multiple.js

@@ -1,30 +1,20 @@
-const { fork } = require('child_process')
-const path = require('path')
-const crypto = require('crypto')
-
-const runHook = require('../hooks')
-const event = require('../event')
-const collection = require('./run-multiple/collection')
-const { clearString, replaceValueDeep } = require('../utils')
-const { getConfig, getTestRoot, fail } = require('./utils')
-
+import { fork } from 'child_process'
+import path from 'path'
+import crypto from 'crypto'
+import { fileURLToPath } from 'url'
+
+import runHook from '../hooks.js'
+import event from '../event.js'
+import { createRuns } from './run-multiple/collection.js'
+import { clearString, replaceValueDeep } from '../utils.js'
+import { getConfig, getTestRoot, fail } from './utils.js'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 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
@@ -37,7 +27,7 @@ let subprocessCount = 0
 let totalSubprocessCount = 0
 let processesDone
 
-module.exports = async function (selectedRuns, options) {
+export default async function (selectedRuns, options) {
   // registering options globally to use in config
   if (options.profile) {
     process.env.profile = options.profile
@@ -49,8 +39,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]
     })
 
@@ -62,7 +52,7 @@ module.exports = async function (selectedRuns, options) {
   }
 
   config = {
-    ...getConfig(configFile),
+    ...(await getConfig(configFile)),
     ...overrides,
   }
 
@@ -96,12 +86,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) => {
+  createRuns(selectedRuns, config).forEach(run => {
     const runName = run.getOriginalName() || run.getName()
     const runConfig = run.getConfig()
     runsToExecute.push(executeRun(runName, runConfig))
@@ -113,7 +103,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 +139,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 +151,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 +163,7 @@ function executeRun(runName, runConfig) {
     params.push(runConfig.grep)
   }
 
-  const onProcessEnd = (errorCode) => {
+  const onProcessEnd = errorCode => {
     if (errorCode !== 0) {
       process.exitCode = errorCode
     }
@@ -197,7 +177,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-rerun.js

@@ -1,16 +1,15 @@
-const { getConfig, getTestRoot } = require('./utils')
-const { printError, createOutputDir } = require('./utils')
-const Config = require('../config')
-const Codecept = require('../rerun')
+import { getConfig, getTestRoot, printError, createOutputDir } from './utils.js'
+import Config from '../config.js'
+import Codecept from '../rerun.js'
 
-module.exports = async function (test, options) {
+export default async function (test, options) {
   // registering options globally to use in config
   // Backward compatibility for --profile
   process.profile = options.profile
   process.env.profile = options.profile
   const configFile = options.config
 
-  let config = getConfig(configFile)
+  let config = await getConfig(configFile)
   if (options.override) {
     config = Config.append(JSON.parse(options.override))
   }
@@ -20,7 +19,7 @@ module.exports = async function (test, options) {
   const codecept = new Codecept(config, options)
 
   try {
-    codecept.init(testRoot)
+    await codecept.init(testRoot)
 
     await codecept.bootstrap()
     codecept.loadTests(test)

package/lib/command/run-workers.js

@@ -1,19 +1,15 @@
 // For Node version >=10.5.0, have to use experimental flag
-const { tryOrDefault } = require('../utils')
-const output = require('../output')
-const store = require('../store')
-const event = require('../event')
-const Workers = require('../workers')
-
-module.exports = async function (workerCount, selectedRuns, options) {
+import { tryOrDefault } from '../utils.js'
+import output from '../output.js'
+import store from '../store.js'
+import event from '../event.js'
+import Workers from '../workers.js'
+import Codecept from '../codecept.js'
+import { getMachineInfo } from './info.js'
+
+export default 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'
@@ -27,72 +23,27 @@ module.exports = async function (workerCount, selectedRuns, options) {
 
   const numberOfWorkers = parseInt(workerCount, 10)
 
-  output.print(`CodeceptJS v${require('../codecept').version()} ${output.standWithUkraine()}`)
+  output.print(`CodeceptJS v${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,8 +51,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()
     }
     await workers.bootstrapAll()

package/lib/command/run.js

@@ -1,9 +1,9 @@
-const { getConfig, printError, getTestRoot, createOutputDir } = require('./utils')
-const Config = require('../config')
-const store = require('../store')
-const Codecept = require('../codecept')
+import { getConfig, printError, getTestRoot, createOutputDir } from './utils.js'
+import Config from '../config.js'
+import store from '../store.js'
+import Codecept from '../codecept.js'
 
-module.exports = async function (test, options) {
+export default async function (test, options) {
   // registering options globally to use in config
   // Backward compatibility for --profile
   // TODO: remove in CodeceptJS 4
@@ -16,7 +16,7 @@ module.exports = async function (test, options) {
 
   const configFile = options.config
 
-  let config = getConfig(configFile)
+  let config = await getConfig(configFile)
   if (options.override) {
     config = Config.append(JSON.parse(options.override))
   }
@@ -26,13 +26,13 @@ module.exports = async function (test, options) {
   const codecept = new Codecept(config, options)
 
   try {
-    codecept.init(testRoot)
+    await codecept.init(testRoot)
     await codecept.bootstrap()
     codecept.loadTests(test)
 
     if (options.verbose) {
       global.debugMode = true
-      const { getMachineInfo } = require('./info')
+      const { getMachineInfo } = await import('./info.js')
       await getMachineInfo()
     }
 

package/lib/command/utils.js

@@ -1,23 +1,25 @@
-const fs = require('fs')
-const path = require('path')
-const util = require('util')
-const mkdirp = require('mkdirp')
+import fs from 'fs'
+import path from 'path'
+import util from 'util'
+import { mkdirp } from 'mkdirp'
 
-const output = require('../output')
-const { fileExists, beautify } = require('../utils')
+import output from '../output.js'
+import { fileExists, beautify, deepMerge } from '../utils.js'
 
 // alias to deep merge
-module.exports.deepMerge = require('../utils').deepMerge
+export { deepMerge }
 
-module.exports.getConfig = function (configFile) {
+export async function getConfig(configFile) {
   try {
-    return require('../config').load(configFile)
+    const configModule = await import('../config.js')
+    const config = configModule.default || configModule
+    return await config.load(configFile)
   } catch (err) {
     fail(err.stack)
   }
 }
 
-module.exports.readConfig = function (configFile) {
+export function readConfig(configFile) {
   try {
     const data = fs.readFileSync(configFile, 'utf8')
     return data
@@ -29,18 +31,17 @@ 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
+export { getTestRoot }
 
 function fail(msg) {
   output.error(msg)
   process.exit(1)
 }
 
-module.exports.fail = fail
+export { fail }
 
 function updateConfig(testsPath, config, extension) {
   const configFile = path.join(testsPath, `codecept.conf.${extension}`)
@@ -58,7 +59,7 @@ function updateConfig(testsPath, config, extension) {
   return fs.writeFileSync(configFile, beautify(`exports.config = ${util.inspect(config, false, 4, false)}`), 'utf-8')
 }
 
-module.exports.updateConfig = updateConfig
+export { updateConfig }
 
 function safeFileWrite(file, contents) {
   if (fileExists(file)) {
@@ -69,9 +70,9 @@ function safeFileWrite(file, contents) {
   return true
 }
 
-module.exports.safeFileWrite = safeFileWrite
+export { safeFileWrite }
 
-module.exports.captureStream = (stream) => {
+export const captureStream = stream => {
   let oldStream
   let buffer = ''
 
@@ -79,7 +80,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,14 +89,14 @@ module.exports.captureStream = (stream) => {
   }
 }
 
-module.exports.printError = (err) => {
+export const printError = err => {
   output.print('')
   output.error(err.message)
   output.print('')
   output.print(output.colors.grey(err.stack.replace(err.message, '')))
 }
 
-module.exports.createOutputDir = (config, testRoot) => {
+export const createOutputDir = (config, testRoot) => {
   let outputDir
   if (path.isAbsolute(config.output)) outputDir = config.output
   else outputDir = path.join(testRoot, config.output)
@@ -106,7 +107,7 @@ module.exports.createOutputDir = (config, testRoot) => {
   }
 }
 
-module.exports.findConfigFile = (testsPath) => {
+export const findConfigFile = testsPath => {
   const extensions = ['js', 'ts']
   for (const ext of extensions) {
     const configFile = path.join(testsPath, `codecept.conf.${ext}`)