Changes before error encountered

Copilot · kobenguyent · Copilot · commit 035b31201c84 · 2025-08-21T08:24:33.000Z
Co-authored-by: kobenguyent &lt;7845001+kobenguyent@users.noreply.github.com&gt;
diff --git a/lib/mocha/asyncWrapper.js b/lib/mocha/asyncWrapper.js
@@ -48,7 +48,7 @@ function makeDoneCallableOnce(done) {
 export function test(testInstance) {
   const testFn = testInstance.fn
   if (!testFn) {
-    return testInstanceInstance
+    return testInstance
   }
 
   testInstance.timeout(0)
@@ -63,28 +63,28 @@ export function test(testInstance) {
         // check that test should actually fail
         try {
           assertThrown(err, testInstance.throws)
-          event.emit(event.testInstance.passed, test)
-          event.emit(event.testInstance.finished, test)
+          event.emit(event.testInstance.passed, testInstance)
+          event.emit(event.testInstance.finished, testInstance)
           recorder.add(doneFn)
           return
         } catch (newErr) {
           err = newErr
         }
       }
       testInstance.err = err
-      event.emit(event.testInstance.failed, test, err)
-      event.emit(event.testInstance.finished, test)
+      event.emit(event.testInstance.failed, testInstance, err)
+      event.emit(event.testInstance.finished, testInstance)
       recorder.add(() => doneFn(err))
     })
 
     if (isAsyncFunction(testFn)) {
-      event.emit(event.testInstance.started, test)
+      event.emit(event.testInstance.started, testInstance)
       testFn
-        .call(test, getInjectedArguments(testFn, test))
+        .call(testInstance, getInjectedArguments(testFn, testInstance))
         .then(() => {
           recorder.add('fire testInstance.passed', () => {
-            event.emit(event.testInstance.passed, test)
-            event.emit(event.testInstance.finished, test)
+            event.emit(event.testInstance.passed, testInstance)
+            event.emit(event.testInstance.finished, testInstance)
           })
           recorder.add('finish test', doneFn)
         })
@@ -98,20 +98,20 @@ export function test(testInstance) {
     }
 
     try {
-      event.emit(event.testInstance.started, test)
-      testFn.call(test, getInjectedArguments(testFn, test))
+      event.emit(event.testInstance.started, testInstance)
+      testFn.call(testInstance, getInjectedArguments(testFn, testInstance))
     } catch (err) {
       recorder.throw(err)
     } finally {
       recorder.add('fire testInstance.passed', () => {
-        event.emit(event.testInstance.passed, test)
-        event.emit(event.testInstance.finished, test)
+        event.emit(event.testInstance.passed, testInstance)
+        event.emit(event.testInstance.finished, testInstance)
       })
       recorder.add('finish test', doneFn)
       recorder.catch()
     }
   }
-  return test
+  return testInstance
 }
 
 /**
diff --git a/lib/output.js b/lib/output.js
@@ -27,6 +27,8 @@ const outputModule = {
   print,
   /** @type {number} */
   stepShift: 0,
+  /** @type {number} */
+  spaceShift: 100, // default width for truncating output
 
   standWithUkraine() {
     return `#${colors.bold.yellow('StandWith')}${colors.bold.cyan('Ukraine')}`
@@ -61,7 +63,7 @@ const outputModule = {
   debug(msg) {
     const _msg = isMaskedData() ? maskSensitiveData(msg) : msg
     if (outputLevel >= 2) {
-      print(' '.repeat(this.stepShift), styles.debug(`${figures.pointerSmall} ${_msg}`))
+      print(' '.repeat(outputModule.stepShift), styles.debug(`${figures.pointerSmall} ${_msg}`))
     }
   },
 
@@ -72,7 +74,7 @@ const outputModule = {
   log(msg) {
     const _msg = isMaskedData() ? maskSensitiveData(msg) : msg
     if (outputLevel >= 3) {
-      print(' '.repeat(this.stepShift), styles.log(truncate(`   ${_msg}`, this.spaceShift)))
+      print(' '.repeat(outputModule.stepShift), styles.log(truncate(`   ${_msg}`, outputModule.spaceShift)))
     }
   },
 
@@ -118,14 +120,14 @@ const outputModule = {
     let stepLine = step.toCliStyled ? step.toCliStyled() : step.toString()
     if (step.metaStep && outputLevel >= 1) {
       // this.stepShift += 2;
-      stepLine = colors.dim(truncate(stepLine, this.spaceShift))
+      stepLine = colors.dim(truncate(stepLine, outputModule.spaceShift))
     }
     if (step.comment) {
       stepLine += colors.grey(step.comment.split('\n').join('\n' + ' '.repeat(4)))
     }
 
     const _stepLine = isMaskedData() ? maskSensitiveData(stepLine) : stepLine
-    print(' '.repeat(this.stepShift), truncate(_stepLine, this.spaceShift))
+    print(' '.repeat(outputModule.stepShift), truncate(_stepLine, outputModule.spaceShift))
   },
 
   /** @namespace */
diff --git a/test/runner/codecept_test.js b/test/runner/codecept_test.js
@@ -4,9 +4,9 @@ import { fileURLToPath } from 'url'
 const { expect } = chai
 
 import assert from 'assert'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import debug from 'debug'
-import event from '../../lib.js'
+import event from '../../lib/event.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 global.codecept_dir = path.join(__dirname, '/..')
diff --git a/test/runner/comment_step_test.js b/test/runner/comment_step_test.js
@@ -1,9 +1,9 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
-import exec from 'child_process'
+import { exec } from 'child_process'
 import { expect  } from 'expect'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
diff --git a/test/runner/consts.js b/test/runner/consts.js
@@ -1,11 +1,6 @@
 import path from 'path'
 
 const runner = path.join(process.cwd(), 'bin/codecept.js')
-const codecept_dir = path.join(process.cwd(), 'test/data/sandbox')
-const codecept_run = `${runner} run`
-
-export default {
-  codecept_run,
-  codecept_dir,
-  runner,
-}
+export const codecept_dir = path.join(process.cwd(), 'test/data/sandbox')
+export const codecept_run = `${runner} run`
+export { runner }
diff --git a/test/runner/custom-reporter-plugin_test.js b/test/runner/custom-reporter-plugin_test.js
@@ -1,11 +1,11 @@
 import { expect  } from 'expect'
 import chai from 'chai'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import { codecept_dir, codecept_run  } from './consts.js'
 import debug from 'debug'
 import fs from 'fs'
 import path from 'path'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 const config_run_config = (config, grep, verbose = false) => `${codecept_run} ${verbose ? '--verbose' : ''} --config ${codecept_dir}/configs/custom-reporter-plugin/${config} ${grep ? `--grep "${grep}"` : ''}`
 
diff --git a/test/runner/definitions_test.js b/test/runner/definitions_test.js
@@ -7,6 +7,7 @@ import { exec, execSync  } from 'child_process'
 
 import { Project, StructureKind, ts  } from 'ts-morph'
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const runner = path.join(__dirname, '/../../bin/codecept.js')
 const codecept_dir = path.join(__dirname, '/../data/sandbox/configs/definitions')
 const pathToRootOfProject = path.join(__dirname, '../../')
@@ -15,11 +16,6 @@ const pathOfJSDocDefinitions = path.join(pathToRootOfProject, 'typings/types.d.t
 const pathToTests = path.resolve(pathToRootOfProject, 'test')
 const pathToTypings = path.resolve(pathToRootOfProject, 'typings')
 
-      if (diagnostics.length > 0) throw new Error(project.formatDiagnosticsWithColorAndContext(diagnostics))
-    })
-  })
-})
-
 describe('Definitions', function () {
   this.timeout(30000)
   this.retries(4)
@@ -250,7 +246,6 @@ describe('Definitions', function () {
  */
 function resolutionHost(moduleResolutionHost, getCompilerOptions) {
   return {
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
     resolveTypeReferenceDirectives: (typeDirectiveNames, containingFile) => {
       const compilerOptions = getCompilerOptions()
       const resolvedTypeReferenceDirectives = []
diff --git a/test/runner/dry_run_test.js b/test/runner/dry_run_test.js
@@ -1,18 +1,16 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
-
 import { expect  } from 'expect'
-import exec from 'child_process'
+import { exec } from 'child_process'
+import char from 'figures'
 
+const { expect: chaiExpect } = chai
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const runner = path.join(__dirname, '/../../bin/codecept.js')
 const codecept_dir = path.join(__dirname, '/../data/sandbox')
 const codecept_run = `${runner} dry-run`
 const codecept_run_config = (config, grep) => `${codecept_run} --config ${codecept_dir}/${config} ${grep ? `--grep "${grep}"` : ''}`
-import char from 'figures'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
 describe('dry-run command', () => {
   before(() => {
     process.chdir(codecept_dir)
diff --git a/test/runner/init_test.js b/test/runner/init_test.js
@@ -4,7 +4,7 @@ import { fileURLToPath } from 'url'
 import { DOWN, ENTER  } from 'inquirer-test'
 import run from 'inquirer-test'
 import fs from 'fs'
-import mkdirp from 'mkdirp'
+import { mkdirp } from 'mkdirp'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const runner = path.join(__dirname, '../../bin/codecept.js')
diff --git a/test/runner/interface_test.js b/test/runner/interface_test.js
@@ -1,10 +1,10 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 import { expect  } from 'expect'
-import exec from 'child_process'
+import { exec } from 'child_process'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const runner = path.join(__dirname, '/../../bin/codecept.js')
diff --git a/test/runner/pageobject_test.js b/test/runner/pageobject_test.js
@@ -1,14 +1,14 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
-
-import exec from 'child_process'
+import { exec } from 'child_process'
 import { expect  } from 'expect'
 import figures from 'figures'
 import debug from 'debug'
-const runner = path.join(__dirname, '/../../bin/codecept.js')
+
+const { expect: chaiExpect } = chai
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const runner = path.join(__dirname, '/../../bin/codecept.js')
 const codecept_dir = path.join(__dirname, '/../data/sandbox/configs/pageObjects')
 const codecept_run = `${runner} run`
 const config_run_config = (config, grep) => `${codecept_run} --config ${codecept_dir}/${config} ${grep ? `--grep "${grep}"` : ''}`
diff --git a/test/runner/retry_hooks_test.js b/test/runner/retry_hooks_test.js
@@ -1,8 +1,8 @@
 import { expect  } from 'expect'
 import chai from 'chai'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import { codecept_dir, codecept_run  } from './consts.js'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 const debug_this_test = false
 
diff --git a/test/runner/run_multiple_test.js b/test/runner/run_multiple_test.js
@@ -1,11 +1,11 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 import assert from 'assert'
 import { expect  } from 'expect'
-import exec from 'child_process'
+import { exec } from 'child_process'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 global.codecept_dir = path.join(__dirname, '/..')
diff --git a/test/runner/run_rerun_test.js b/test/runner/run_rerun_test.js
@@ -1,11 +1,11 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 import { expect  } from 'expect'
 import { describe  } from 'mocha'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import semver from 'semver'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
diff --git a/test/runner/run_workers_test.js b/test/runner/run_workers_test.js
@@ -1,12 +1,13 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 import { expect  } from 'expect'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import semver from 'semver'
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const runner = path.join(__dirname, '/../../bin/codecept.js')
 const codecept_dir = path.join(__dirname, '/../data/sandbox')
 const codecept_run = `${runner} run-workers --config ${codecept_dir}/codecept.workers.conf.js `
@@ -173,7 +174,6 @@ describe('CodeceptJS Workers Runner', function () {
 
   it('should create output folder with custom name', function (done) {
     const customName = 'thisIsCustomOutputFolderName'
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
 global.codecept_dir = path.join(__dirname, '/..')
     const outputDir = `${codecept_dir}/${customName}`
     let createdOutput = false
diff --git a/test/runner/scenario_stale_test.js b/test/runner/scenario_stale_test.js
@@ -1,7 +1,7 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 import { expect  } from 'expect'
 import { exec  } from 'child_process'
diff --git a/test/runner/step-enhancements_test.js b/test/runner/step-enhancements_test.js
@@ -1,9 +1,9 @@
 import { expect  } from 'expect'
 import chai from 'chai'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import { codecept_dir, codecept_run  } from './consts.js'
 import debug from 'debug'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 const config_run_config = (config, grep, verbose = false) => `${codecept_run} ${verbose ? '--verbose' : ''} --config ${codecept_dir}/configs/step-enhancements/${config} ${grep ? `--grep "${grep}"` : ''}`
 
diff --git a/test/runner/step-sections_test.js b/test/runner/step-sections_test.js
@@ -1,9 +1,9 @@
 import { expect  } from 'expect'
 import chai from 'chai'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import { codecept_dir, codecept_run  } from './consts.js'
 import debug from 'debug'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 const config_run_config = (config, grep) => `${codecept_run} --steps --config ${codecept_dir}/configs/step-sections/${config} ${grep ? `--grep "${grep}"` : ''}`
 
diff --git a/test/runner/step_timeout_test.js b/test/runner/step_timeout_test.js
@@ -1,9 +1,9 @@
 import { expect  } from 'expect'
 import chai from 'chai'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import { codecept_dir, codecept_run  } from './consts.js'
 import figures from 'figures'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 const debug_this_test = false
 
 const config_run_config = (config, grep, verbose = false) => `${codecept_run} ${verbose || debug_this_test ? '--verbose' : ''} --config ${codecept_dir}/configs/step_timeout/${config} ${grep ? `--grep "${grep}"` : ''}`
diff --git a/test/runner/store-test-and-suite_test.js b/test/runner/store-test-and-suite_test.js
@@ -1,9 +1,9 @@
 import { expect  } from 'expect'
 import chai from 'chai'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import { codecept_dir, codecept_run  } from './consts.js'
 import debug from 'debug'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 const config_run_config = (config, grep, verbose = false) => `${codecept_run} ${verbose ? '--verbose' : ''} --config ${codecept_dir}/configs/store-test-and-suite/${config} ${grep ? `--grep "${grep}"` : ''}`
 
diff --git a/test/runner/timeout_test.js b/test/runner/timeout_test.js
@@ -1,8 +1,8 @@
 import { expect  } from 'expect'
 import chai from 'chai'
-import exec from 'child_process'
+import { exec } from 'child_process'
 import { codecept_dir, codecept_run  } from './consts.js'
-const { expect } = chai
+const { expect: chaiExpect } = chai
 
 const debug_this_test = false
 
diff --git a/test/unit/data/fs_sample.txt b/test/unit/data/fs_sample.txt
@@ -0,0 +1,3 @@
+A simple file
+for FileSystem helper
+test
diff --git a/test/unit/html_test.js b/test/unit/html_test.js
diff --git a/test/unit/steps_test.js b/test/unit/steps_test.js
diff --git a/test/unit/utils_test.js b/test/unit/utils_test.js
