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

package/lib/command/run-multiple.js

@@ -1,13 +1,16 @@
-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 = {}
@@ -24,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,7 +52,7 @@ module.exports = async function (selectedRuns, options) {
   }
 
   config = {
-    ...getConfig(configFile),
+    ...(await getConfig(configFile)),
     ...overrides,
   }
 
@@ -88,7 +91,7 @@ module.exports = async function (selectedRuns, options) {
   })
 
   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))

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,31 +1,18 @@
 // 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')
+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'
 
-module.exports = async function (workerCount, selectedRuns, options) {
+export default async function (workerCount, selectedRuns, options) {
   process.env.profile = options.profile
 
   const { config: testConfig, override = '' } = options
   const overrideConfigs = tryOrDefault(() => JSON.parse(override), {})
-
-  // 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(', ')}`)
-  }
+  const by = options.suites ? 'suite' : 'test'
   delete options.parent
   const config = {
     by,
@@ -36,7 +23,7 @@ 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
@@ -64,7 +51,6 @@ module.exports = async function (workerCount, selectedRuns, options) {
     if (options.verbose || options.debug) store.debugMode = true
 
     if (options.verbose) {
-      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
@@ -32,14 +34,14 @@ function getTestRoot(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}`)
@@ -57,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)) {
@@ -68,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 = ''
 
@@ -87,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)
@@ -105,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}`)