codeceptjs 4.0.0-beta.2 → 4.0.0-beta.21

package/lib/output.js

@@ -1,5 +1,6 @@
-import colors from 'chalk';
-import figures from 'figures';
+import colors from 'chalk'
+import figures from 'figures'
+import { maskData, shouldMaskData, getMaskConfig } from './utils/mask_data.js'
 
 const styles = {
   error: colors.bgRed.white.bold,
@@ -9,17 +10,18 @@ const styles = {
   debug: colors.cyan,
   log: colors.grey,
   bold: colors.bold,
-};
+  section: colors.white.dim.bold,
+}
 
-let outputLevel = 0;
-let outputProcess = '';
-let newline = true;
+let outputLevel = 0
+let outputProcess = ''
+let newline = true
 
 /**
  * @alias output
  * @namespace
  */
-export const output = {
+const output = {
   colors,
   styles,
   print,
@@ -27,7 +29,7 @@ export const output = {
   stepShift: 0,
 
   standWithUkraine() {
-    return `#${colors.bold.yellow('StandWith')}${colors.bold.cyan('Ukraine')}`;
+    return `#${colors.bold.yellow('StandWith')}${colors.bold.cyan('Ukraine')}`
   },
 
   /**
@@ -36,8 +38,8 @@ export const output = {
    * @returns {number}
    */
   level(level) {
-    if (level !== undefined) outputLevel = level;
-    return outputLevel;
+    if (level !== undefined) outputLevel = level
+    return outputLevel
   },
 
   /**
@@ -47,9 +49,42 @@ export const output = {
    * @returns {string}
    */
   process(process) {
-    if (process === null) return outputProcess = '';
-    if (process) outputProcess = String(process).length === 1 ? `[0${process}]` : `[${process}]`;
-    return outputProcess;
+    if (process === null) return (outputProcess = '')
+    if (process) {
+      // Handle objects by converting to empty string or extracting properties
+      let processValue = process
+      if (typeof process === 'object') {
+        // If it's an object, try to extract a numeric value or use empty string
+        processValue = process.id || process.index || process.worker || ''
+      }
+
+      // Check if this is a run-multiple process (contains : or .)
+      // Format: "1.runName:browserName" from run-multiple
+      if (String(processValue).includes(':') || (String(processValue).includes('.') && String(processValue).split('.').length > 1)) {
+        // Keep original format for run-multiple
+        outputProcess = colors.cyan.bold(`[${processValue}]`)
+      } else {
+        // Standard worker format for run-workers
+        const processNum = parseInt(processValue, 10)
+        const processStr = !isNaN(processNum) ? String(processNum).padStart(2, '0') : String(processValue).padStart(2, '0')
+
+        // Assign different colors to different workers for better identification
+        const workerColors = [
+          colors.cyan, // Worker 01 - Cyan
+          colors.magenta, // Worker 02 - Magenta
+          colors.green, // Worker 03 - Green
+          colors.yellow, // Worker 04 - Yellow
+          colors.blue, // Worker 05 - Blue
+          colors.red, // Worker 06 - Red
+          colors.white, // Worker 07 - White
+          colors.gray, // Worker 08 - Gray
+        ]
+        const workerIndex = !isNaN(processNum) ? processNum - 1 : -1
+        const colorFn = workerIndex >= 0 && workerColors[workerIndex % workerColors.length] ? workerColors[workerIndex % workerColors.length] : colors.cyan
+        outputProcess = colorFn.bold(`[Worker ${processStr}]`)
+      }
+    }
+    return outputProcess
   },
 
   /**
@@ -57,22 +92,20 @@ export const output = {
    * @param {string} msg
    */
   debug(msg) {
+    const _msg = shouldMaskData() ? maskData(msg, getMaskConfig()) : msg
     if (outputLevel >= 2) {
-      print(' '.repeat(this.stepShift), styles.debug(`${figures.pointerSmall} ${msg}`));
+      print(' '.repeat(output.stepShift), styles.debug(`${figures.pointerSmall} ${_msg}`))
     }
   },
 
-  debugSection(section, msg) {
-    this.debug(`[${section}] ${msg}`);
-  },
-
   /**
    * Print information in --verbose mode
    * @param {string} msg
    */
   log(msg) {
+    const _msg = shouldMaskData() ? maskData(msg, getMaskConfig()) : msg
     if (outputLevel >= 3) {
-      print(' '.repeat(this.stepShift), styles.log(truncate(`   ${msg}`, this.spaceShift)));
+      print(' '.repeat(output.stepShift), styles.log(truncate(`   ${_msg}`, output.stepShift)))
     }
   },
 
@@ -81,7 +114,8 @@ export const output = {
    * @param {string} msg
    */
   error(msg) {
-    print(styles.error(msg));
+    const _msg = shouldMaskData() ? maskData(msg, getMaskConfig()) : msg
+    print(styles.error(_msg))
   },
 
   /**
@@ -89,7 +123,8 @@ export const output = {
    * @param {string} msg
    */
   success(msg) {
-    print(styles.success(msg));
+    const _msg = shouldMaskData() ? maskData(msg, getMaskConfig()) : msg
+    print(styles.success(_msg))
   },
 
   /**
@@ -98,7 +133,7 @@ export const output = {
    * @param {string} msg
    */
   plugin(pluginName, msg = '') {
-    this.debug(`<${pluginName}> ${msg}`);
+    output.debug(`<${pluginName}> ${msg}`)
   },
 
   /**
@@ -106,25 +141,26 @@ export const output = {
    * @param {CodeceptJS.Step} step
    */
   step(step) {
-    if (outputLevel === 0) return;
-    if (!step) return;
+    if (outputLevel === 0) return
+    if (!step) return
     // Avoid to print non-gherkin steps, when gherkin is running for --steps mode
     if (outputLevel === 1) {
       if (typeof step === 'object' && step.hasBDDAncestor()) {
-        return;
+        return
       }
     }
 
-    let stepLine = step.toString();
+    let stepLine = step.toCliStyled ? step.toCliStyled() : step.toString()
     if (step.metaStep && outputLevel >= 1) {
-      this.stepShift += 2;
-      stepLine = colors.green(truncate(stepLine, this.spaceShift));
+      // this.stepShift += 2;
+      stepLine = colors.dim(truncate(stepLine, output.stepShift))
     }
     if (step.comment) {
-      stepLine += colors.grey(step.comment.split('\n').join('\n' + ' '.repeat(4))); // eslint-disable-line
+      stepLine += colors.grey(step.comment.split('\n').join('\n' + ' '.repeat(4)))
     }
 
-    print(' '.repeat(this.stepShift), truncate(stepLine, this.spaceShift));
+    const _stepLine = shouldMaskData() ? maskData(stepLine, getMaskConfig()) : stepLine
+    print(' '.repeat(this.stepShift), truncate(_stepLine, this.spaceShift))
   },
 
   /** @namespace */
@@ -132,10 +168,11 @@ export const output = {
     /**
      * @param {Mocha.Suite} suite
      */
-    started: (suite) => {
-      if (!suite.title) return;
-      print(`${colors.bold(suite.title)} --`);
-      if (suite.comment) print(suite.comment);
+    started: suite => {
+      if (!suite.title) return
+      print(`${colors.bold(suite.title)} --`)
+      if (suite.file && outputLevel >= 1) print(colors.underline.grey(suite.file))
+      if (suite.comment) print(suite.comment)
     },
   },
 
@@ -145,25 +182,38 @@ export const output = {
      * @param {Mocha.Test} test
      */
     started(test) {
-      print(`  ${colors.magenta.bold(test.title)}`);
+      // Only show feature name in workers mode (when outputProcess is set)
+      const featureName = outputProcess && test.parent?.title ? `${colors.cyan.bold(test.parent.title)} › ` : ''
+      print(`  ${featureName}${colors.magenta.bold(test.title)}`)
     },
     /**
      * @param {Mocha.Test} test
      */
     passed(test) {
-      print(`  ${colors.green.bold(figures.tick)} ${test.title} ${colors.grey(`in ${test.duration}ms`)}`);
+      // Only show feature name in workers mode (when outputProcess is set)
+      const featureName = outputProcess && test.parent?.title ? `${colors.cyan(test.parent.title)} › ` : ''
+      const scenarioName = colors.bold(test.title)
+      const executionTime = colors.cyan(`in ${test.duration}ms`)
+      print(`  ${colors.green.bold(figures.tick)} ${featureName}${scenarioName} ${executionTime}`)
     },
     /**
      * @param {Mocha.Test} test
      */
     failed(test) {
-      print(`  ${colors.red.bold(figures.cross)} ${test.title} ${colors.grey(`in ${test.duration}ms`)}`);
+      // Only show feature name in workers mode (when outputProcess is set)
+      const featureName = outputProcess && test.parent?.title ? `${colors.yellow(test.parent.title)} › ` : ''
+      const scenarioName = colors.bold(test.title)
+      const executionTime = colors.yellow(`in ${test.duration}ms`)
+      print(`  ${colors.red.bold(figures.cross)} ${featureName}${scenarioName} ${executionTime}`)
     },
     /**
      * @param {Mocha.Test} test
      */
     skipped(test) {
-      print(`  ${colors.yellow.bold('S')} ${test.title}`);
+      // Only show feature name in workers mode (when outputProcess is set)
+      const featureName = outputProcess && test.parent?.title ? `${colors.gray(test.parent.title)} › ` : ''
+      const scenarioName = colors.bold(test.title)
+      print(`  ${colors.yellow.bold('S')} ${featureName}${scenarioName}`)
     },
   },
 
@@ -172,22 +222,40 @@ export const output = {
     /**
      * @param {Mocha.Test} test
      */
-    /* eslint-disable */
-    started(test) {},
-    /* eslint-enable */
+
+    started(test) {
+      if (outputLevel < 1) return
+      print(`  ${colors.dim.bold('Scenario()')}`)
+    },
+
     /**
      * @param {Mocha.Test} test
      */
     passed(test) {
-      print(`  ${colors.green.bold(`${figures.tick} OK`)} ${colors.grey(`in ${test.duration}ms`)}`);
-      print();
+      print(`  ${colors.green.bold(`${figures.tick} OK`)} ${colors.grey(`in ${test.duration}ms`)}`)
+      print()
     },
     /**
      * @param {Mocha.Test} test
      */
     failed(test) {
-      print(`  ${colors.red.bold(`${figures.cross} FAILED`)} ${colors.grey(`in ${test.duration}ms`)}`);
-      print();
+      print(`  ${colors.red.bold(`${figures.cross} FAILED`)} ${colors.grey(`in ${test.duration}ms`)}`)
+      print()
+    },
+  },
+
+  hook: {
+    started(hook) {
+      if (outputLevel < 1) return
+      print(`  ${colors.dim.bold(hook.toCode())}`)
+    },
+    passed(hook) {
+      if (outputLevel < 1) return
+      print()
+    },
+    failed(hook) {
+      if (outputLevel < 1) return
+      print(`  ${colors.red.bold(hook.toCode())}`)
     },
   },
 
@@ -199,9 +267,9 @@ export const output = {
    */
   say(message, color = 'cyan') {
     if (colors[color] === undefined) {
-      color = 'cyan';
+      color = 'cyan'
     }
-    if (outputLevel >= 1) print(`   ${colors[color].bold(message)}`);
+    if (outputLevel >= 1) print(`   ${colors[color].bold(message)}`)
   },
 
   /**
@@ -211,50 +279,52 @@ export const output = {
    * @param {number|string} duration
    */
   result(passed, failed, skipped, duration, failedHooks = 0) {
-    let style = colors.bgGreen;
-    let msg = ` ${passed || 0} passed`;
-    let status = style.bold('  OK ');
+    let style = colors.bgGreen
+    let msg = ` ${passed || 0} passed`
+    let status = style.bold('  OK ')
     if (failed) {
-      style = style.bgRed;
-      status = style.bold('  FAIL ');
-      msg += `, ${failed} failed`;
+      style = style.bgRed
+      status = style.bold('  FAIL ')
+      msg += `, ${failed} failed`
     }
 
     if (failedHooks > 0) {
-      style = style.bgRed;
-      status = style.bold('  FAIL ');
-      msg += `, ${failedHooks} failedHooks`;
+      style = style.bgRed
+      status = style.bold('  FAIL ')
+      msg += `, ${failedHooks} failedHooks`
     }
-    status += style.grey(' |');
+    status += style.grey(' |')
 
     if (skipped) {
-      if (!failed) style = style.bgYellow;
-      msg += `, ${skipped} skipped`;
+      if (!failed) style = style.bgYellow
+      msg += `, ${skipped} skipped`
     }
-    msg += '  ';
-    print(status + style(msg) + colors.grey(` // ${duration}`));
+    msg += '  '
+    print(status + style(msg) + colors.grey(` // ${duration}`))
   },
-};
+}
+
+export default output
 
-export function print(...msg) {
+function print(...msg) {
   if (outputProcess) {
-    msg.unshift(outputProcess);
+    msg.unshift(outputProcess)
   }
   if (!newline) {
-    console.log();
-    newline = true;
+    console.log()
+    newline = true
   }
 
-  console.log.apply(this, msg);
+  console.log.apply(this, msg)
 }
 
 function truncate(msg, gap = 0) {
   if (msg.indexOf('\n') > 0 || outputLevel >= 3) {
-    return msg; // don't cut multi line steps or on verbose log level
+    return msg // don't cut multi line steps or on verbose log level
   }
-  const width = (process.stdout.columns || 200) - gap - 4;
+  const width = (process.stdout.columns || 200) - gap - 4
   if (msg.length > width) {
-    msg = msg.substr(0, width - 1) + figures.ellipsis;
+    msg = msg.substr(0, width - 1) + figures.ellipsis
   }
-  return msg;
+  return msg
 }

package/lib/parser.js

@@ -1,71 +1,81 @@
-import { parse as acornParse } from 'acorn';
-import parseFunction from 'parse-function';
-import * as output from './output.js';
+function _interopDefault(ex) {
+  return ex && typeof ex === 'object' && 'default' in ex ? ex.default : ex
+}
+import * as acorn from 'acorn'
+import parseFunctionModule from 'parse-function'
+const parseFunction = _interopDefault(parseFunctionModule)
+const parser = parseFunction({ parse: acorn.parse, ecmaVersion: 11, plugins: ['objectRestSpread'] })
+import output from './output.js'
+
+parser.use(destructuredArgs)
 
-const app = parseFunction({ parse: acornParse, ecmaVersion: 11, plugins: ['objectRestSpread'] });
-app.use(destructuredArgs);
-export function getParamsToString(fn) {
-  const newFn = fn.toString().replace(/^async/, 'async function');
-  return getParams(newFn).join(', ');
+export const getParamsToString = function (fn) {
+  const newFn = fn.toString().replace(/^async/, 'async function')
+  return getParams(newFn).join(', ')
 }
 
-export function getParams(fn) {
-  if (fn.isSinonProxy) return [];
+function getParams(fn) {
+  if (fn.isSinonProxy) return []
   try {
-    const reflected = app.parse(fn);
+    // Convert arrow functions to regular functions for parsing
+    let fnString = fn.toString()
+    // Handle async arrow functions: async (...) => { becomes async function(...) {
+    fnString = fnString.replace(/^async\s*(\([^)]*\))\s*=>/, 'async function$1')
+    // Handle regular arrow functions: (...) => { becomes function(...) {
+    fnString = fnString.replace(/^(\([^)]*\))\s*=>/, 'function$1')
+    
+    const reflected = parser.parse(fnString)
     if (reflected.args.length > 1 || reflected.args[0] === 'I') {
-      output.output.error('Error: old CodeceptJS v2 format detected. Upgrade your project to the new format -> https://bit.ly/codecept3Up');
+      output.error('Error: old CodeceptJS v2 format detected. Upgrade your project to the new format -> https://bit.ly/codecept3Up')
     }
-    if (reflected.destructuredArgs.length > 0) reflected.args = [...reflected.destructuredArgs];
-    const params = reflected.args.map((p) => {
-      const def = reflected.defaults[p];
+    if (reflected.destructuredArgs.length > 0) reflected.args = [...reflected.destructuredArgs]
+    const params = reflected.args.map(p => {
+      const def = reflected.defaults[p]
       if (def) {
-        return `${p}=${def}`;
+        return `${p}=${def}`
       }
-      return p;
-    });
-    return params;
+      return p
+    })
+    return params
   } catch (err) {
-    console.log(`Error in ${fn.toString()}`);
-    output.output.error(err);
+    console.log(`Error in ${fn.toString()}`)
+    output.error(err)
   }
 }
 
-export function destructuredArgs() {
+export { getParams }
+
+function destructuredArgs() {
   return (node, result) => {
-    result.destructuredArgs = result.destructuredArgs || [];
+    result.destructuredArgs = result.destructuredArgs || []
 
     if (node.type === 'ObjectExpression' && node.properties.length > 0) {
-      node.properties.forEach((prop) => {
+      node.properties.forEach(prop => {
         if (prop.value && prop.value.params.length > 0) {
-          result.destructuredArgs = parseDestructuredArgs(prop.value);
+          result.destructuredArgs = parseDestructuredArgs(prop.value)
         }
-      });
+      })
 
-      return result;
+      return result
     }
 
-    if (!Array.isArray(node.params)) return result;
-    result.destructuredArgs = parseDestructuredArgs(node);
+    if (!Array.isArray(node.params)) return result
+    result.destructuredArgs = parseDestructuredArgs(node)
 
-    return result;
-  };
+    return result
+  }
 }
 
 function parseDestructuredArgs(node) {
-  const destructuredArgs = [];
-  node.params.forEach((param) => {
-    if (
-      param.type === 'ObjectPattern'
-        && param.properties
-        && param.properties.length > 0
-    ) {
-      param.properties.forEach((prop) => {
-        const { name } = prop.value;
-        destructuredArgs.push(name);
-      });
+  const destructuredArgs = []
+  node.params.forEach(param => {
+    if (param.type === 'ObjectPattern' && param.properties && param.properties.length > 0) {
+      param.properties.forEach(prop => {
+        const { name } = prop.value
+        destructuredArgs.push(name)
+      })
     }
-  });
+  })
 
-  return destructuredArgs;
+  return destructuredArgs
 }