Changes before error encountered

Copilot · kobenguyent · Copilot · commit 6d10aa5ac844 · 2025-08-21T07:03:17.000Z
Co-authored-by: kobenguyent &lt;7845001+kobenguyent@users.noreply.github.com&gt;
diff --git a/lib/helper/Mochawesome.js b/lib/helper/Mochawesome.js
@@ -15,11 +15,18 @@ class Mochawesome extends Helper {
       disableScreenshots: false,
     }
 
-    this._addContext = (await import('mochawesome/addContext')).default
+    this._addContext = null
 
     this._createConfig(config)
   }
 
+  async _ensureAddContext() {
+    if (!this._addContext) {
+      this._addContext = (await import('mochawesome/addContext')).default
+    }
+    return this._addContext
+  }
+
   _createConfig(config) {
     // override defaults with config
     Object.assign(this.options, config)
@@ -40,7 +47,7 @@ class Mochawesome extends Helper {
     currentTest = { test }
   }
 
-  _failed(test) {
+  async _failed(test) {
     if (this.options.disableScreenshots) return
     let fileName
     // Get proper name if we are fail on hook
@@ -58,13 +65,15 @@ class Mochawesome extends Helper {
     }
     if (test._retries < 1 || test._retries === test.retryNum) {
       fileName = `${fileName}.failed.png`
-      return this._addContext(currentTest, fileName)
+      const addContext = await this._ensureAddContext()
+      return addContext(currentTest, fileName)
     }
   }
 
-  addMochawesomeContext(context) {
+  async addMochawesomeContext(context) {
     if (currentTest === '') currentTest = { test: currentSuite.ctx.test }
-    return this._addContext(currentTest, context)
+    const addContext = await this._ensureAddContext()
+    return addContext(currentTest, context)
   }
 }
 
diff --git a/lib/locator.js b/lib/locator.js
@@ -1,8 +1,22 @@
 let cssToXPath;
+let csstoxpath;
 import { sprintf  } from 'sprintf-js'
 
 import { xpathLocator  } from './utils.js'
 
+// Load modules at startup using top-level await
+try {
+  cssToXPath = (await import('css-to-xpath')).default;
+} catch (e) {
+  console.warn('css-to-xpath module not available:', e.message);
+}
+
+try {
+  csstoxpath = (await import('csstoxpath')).default;
+} catch (e) {
+  console.warn('csstoxpath module not available:', e.message);
+}
+
 const locatorTypes = ['css', 'by', 'xpath', 'id', 'name', 'fuzzy', 'frame', 'shadow', 'pw'];
 /** @class */
 class Locator {
@@ -177,14 +191,21 @@ class Locator {
     const locator = `${this.value}${pseudoSelector}`;
     const limitation = [':nth-of-type', ':first-of-type', ':last-of-type', ':nth-last-child', ':nth-last-of-type', ':checked', ':disabled', ':enabled', ':required', ':lang', ':nth-child', ':has'];
 
+    let converter;
     if (limitation.some(item => locator.includes(item))) {
-      cssToXPath = (await import('css-to-xpath')).default;
+      if (!cssToXPath) {
+        throw new Error('css-to-xpath module not available. Install with: npm install css-to-xpath');
+      }
+      converter = cssToXPath;
     } else {
-      cssToXPath = (await import('csstoxpath')).default;
+      if (!csstoxpath) {
+        throw new Error('csstoxpath module not available. Install with: npm install csstoxpath');
+      }
+      converter = csstoxpath;
     }
 
     if (this.isXPath()) return this.value;
-    if (this.isCSS()) return cssToXPath(locator);
+    if (this.isCSS()) return converter(locator);
 
     throw new Error('Can\'t be converted to XPath');
   }
diff --git a/lib/mocha/ui.js b/lib/mocha/ui.js
@@ -1,4 +1,5 @@
 import escapeRe from 'escape-string-regexp'
+import common from 'mocha/lib/interfaces/common.js'
 import { test, setup, teardown, suiteSetup, suiteTeardown, injected } from './asyncWrapper.js'
 import ScenarioConfig from './scenarioConfig.js'
 import FeatureConfig from './featureConfig.js'
@@ -43,8 +44,6 @@ export default function (suite) {
   let afterEachHooksAreLoaded
 
   suite.on('pre-require', (context, file, mocha) => {
-    import common from 'mocha/lib/interfaces/common'
-
     const addScenario = function (title, opts = {}, fn) {
       const suite = suites[0]
 
diff --git a/test/unit/FileSystem_test.js b/test/unit/FileSystem_test.js
@@ -1,12 +1,9 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
-
-
-
 import FileSystem from '../../lib/helper/FileSystem.js'
 
+const { expect } = chai
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 global.codecept_dir = path.join(__dirname, '/..')
 
diff --git a/test/unit/ai_test.js b/test/unit/ai_test.js
@@ -1,9 +1,8 @@
 import AiAssistant from '../../lib/ai.js'
 import config from '../../lib/config.js'
-
 import chai from 'chai'
-const { expect } = chai
 
+const { expect } = chai
 describe('AI module', () => {
   beforeEach(() => {
     AiAssistant.enable({}) // clean up config
diff --git a/test/unit/assert/empty_test.js b/test/unit/assert/empty_test.js
@@ -1,9 +1,8 @@
 import chai from 'chai'
-const { expect } = chai
-
 import { Assertion, empty } from '../../../lib/assert/empty.js'
 import AssertionError from '../../../lib/assert/error.js'
 
+const { expect } = chai
 let emptyAssertion
 
 describe('empty assertion', () => {
diff --git a/test/unit/assert_test.js b/test/unit/assert_test.js
@@ -1,9 +1,9 @@
 import chai from 'chai'
-const { expect } = chai
-
 import Assertion from '../../lib/assert.js'
 import AssertionError from '../../lib/assert/error.js'
 
+const { expect } = chai
+
 const comparator = (a, b) => a === b
 
 let assertion
diff --git a/test/unit/bdd_test.js b/test/unit/bdd_test.js
@@ -1,23 +1,14 @@
 import path from 'path'
 import { fileURLToPath } from 'url'
-
 import Gherkin from '@cucumber/gherkin'
 import * as Messages from '@cucumber/messages'
 import chai from 'chai'
 
-
 const { expect } = chai
 const uuidFn = Messages.IdGenerator.uuid()
 const builder = new Gherkin.AstBuilder(uuidFn)
 const matcher = new Gherkin.GherkinClassicTokenMatcher()
 
-import Config from '../../lib/config.js'
-import { Given, When, And, Then, matchStep, clearSteps, defineParameterType  } from '../../lib/mocha/bdd.js'
-import run from '../../lib/mocha/gherkin.js'
-import recorder from '../../lib/recorder.js'
-import container from '../../lib/container.js'
-import actor from '../../lib/actor.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/unit/config_test.js b/test/unit/config_test.js
@@ -1,8 +1,7 @@
 import chai from 'chai'
-const { expect } = chai
-
 import config from '../../lib/config.js'
 
+const { expect } = chai
 describe('Config', () => {
   beforeEach(() => config.reset())
 
diff --git a/test/unit/container_test.js b/test/unit/container_test.js
@@ -1,14 +1,13 @@
 import chai from 'chai'
-const { expect } = chai
 import path from 'path'
 import { fileURLToPath } from 'url'
-
 import FileSystem from '../../lib/helper/FileSystem.js'
 import actor from '../../lib/actor.js'
 import container from '../../lib/container.js'
 import Translation from '../../lib/translation.js'
 import dummyPage from '../data/dummy_page.js'
 
+const { expect } = chai
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 describe('Container', () => {
diff --git a/test/unit/data/dataTableArgument_test.js b/test/unit/data/dataTableArgument_test.js
@@ -1,8 +1,8 @@
 import { it  } from 'mocha'
 import chai from 'chai'
 import DataTableArgument from '../../../lib/data/dataTableArgument.js'
-const { expect } = chai
 
+const { expect } = chai
 describe('DataTableArgument', () => {
   const gherkinDataTable = {
     rows: [
diff --git a/test/unit/data/table_test.js b/test/unit/data/table_test.js
@@ -1,8 +1,7 @@
-
 import DataTable from '../../../lib/data/table.js'
 import chai from 'chai'
-const { expect } = chai
 
+const { expect } = chai
 describe('DataTable', () => {
   it('should take an array for creation', () => {
     const data = ['login', 'password']
diff --git a/test/unit/data/ui_test.js.skip b/test/unit/data/ui_test.js.skip
diff --git a/test/unit/element_not_found_test.js b/test/unit/element_not_found_test.js
@@ -1,8 +1,7 @@
-
 import ElementNotFound from '../../lib/helper/errors/ElementNotFound.js'
 import chai from 'chai'
-const { expect } = chai
 
+const { expect } = chai
 const locator = '#invalidSelector'
 
 describe('ElementNotFound error', () => {
diff --git a/test/unit/heal_test.js.skip b/test/unit/heal_test.js.skip
@@ -1,9 +1,9 @@
 import chai from 'chai'
-const { expect } = chai
 import heal from '../../lib/heal.js'
 import recorder from '../../lib/recorder.js'
 import Step from '../../lib/step.js'
 
+const { expect } = chai
 describe('heal', () => {
   beforeEach(() => {
     heal.clear()
diff --git a/test/unit/html_test.js b/test/unit/html_test.js
@@ -1,13 +1,11 @@
 import path from 'path'
 import { fileURLToPath } from 'url'
-
 import fs from 'fs'
-
 import chai from 'chai'
-const { expect } = chai
 import * as cheerio from 'cheerio'
 import { scanForErrorMessages, removeNonInteractiveElements, minifyHtml, splitByChunks  } from '../../lib/html.js'
 
+const { expect } = chai
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const opts = {
   interactiveElements: ['a', 'input', 'button', 'select', 'textarea', 'label', 'option'],
diff --git a/test/unit/locator_test.js b/test/unit/locator_test.js
@@ -1,10 +1,10 @@
 import chai from 'chai'
-const { expect } = chai
 import { DOMParser  } from '@xmldom/xmldom'
 import xpath from 'xpath'
-
 import Locator from '../../lib/locator.js'
 
+const { expect } = chai
+
 let doc
 const xml = `<body>
   <span>Hey boy</span>
diff --git a/test/unit/mocha/asyncWrapper_test.js b/test/unit/mocha/asyncWrapper_test.js
@@ -1,11 +1,10 @@
 import sinon from 'sinon'
 import chai from 'chai'
-const { expect } = chai
-
-import { test: testWrapper, setup, teardown, suiteSetup, suiteTeardown  } from '../../../lib/mocha/asyncWrapper.js'
+import { test as testWrapper, setup, teardown, suiteSetup, suiteTeardown  } from '../../../lib/mocha/asyncWrapper.js'
 import recorder from '../../../lib/recorder.js'
 import event from '../../../lib/event.js'
 
+const { expect } = chai
 let test
 let fn
 let before
diff --git a/test/unit/mocha/test_clone_test.js.skip b/test/unit/mocha/test_clone_test.js.skip
diff --git a/test/unit/parser_test.js b/test/unit/parser_test.js
@@ -1,7 +1,7 @@
 import chai from 'chai'
-const { expect } = chai
 import parser from '../../lib/parser.js'
 
+const { expect } = chai
 class Obj {
   method1(locator, sec) {}
 
diff --git a/test/unit/plugin/customLocator_test.js b/test/unit/plugin/customLocator_test.js
@@ -3,7 +3,6 @@ import customLocatorPlugin from '../../../lib/plugin/customLocator.js'
 import Locator from '../../../lib/locator.js'
 
 const { expect } = chai
-
 describe('customLocator', () => {
   beforeEach(() => {
     Locator.filters = []
diff --git a/test/unit/plugin/eachElement_test.js b/test/unit/plugin/eachElement_test.js
@@ -1,13 +1,11 @@
 import path from 'path'
 import chai from 'chai'
 import { fileURLToPath } from 'url'
-const { expect } = chai
-
-
 import container from '../../../lib/container.js'
 import eachElement from '../../../lib/plugin/eachElement.js'
 import recorder from '../../../lib/recorder.js'
 
+const { expect } = chai
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 global.codecept_dir = path.join(__dirname, '/..')
 describe('eachElement plugin', () => {
diff --git a/test/unit/plugin/retryFailedStep_test.js b/test/unit/plugin/retryFailedStep_test.js
@@ -1,4 +1,3 @@
-
 import retryFailedStep from '../../../lib/plugin/retryFailedStep.js'
 import chai from 'chai'
 import { tryTo, within  } from '../../../lib/effects.js'
@@ -8,8 +7,8 @@ import store from '../../../lib/store.js'
 import container from '../../../lib/container.js'
 import event from '../../../lib/event.js'
 import recorder from '../../../lib/recorder.js'
-const { expect } = chai
 
+const { expect } = chai
 describe('retryFailedStep', () => {
   beforeEach(() => {
     recorder.retries = []
diff --git a/test/unit/plugin/screenshotOnFail_test.js.skip b/test/unit/plugin/screenshotOnFail_test.js.skip
@@ -1,7 +1,5 @@
 import sinon from 'sinon'
 import chai from 'chai'
-const { expect } = chai
-
 import screenshotOnFail from '../../../lib/plugin/screenshotOnFail.js'
 import container from '../../../lib/container.js'
 import event from '../../../lib/event.js'
@@ -10,6 +8,7 @@ import { createTest  } from '../../../lib/mocha/test.js'
 import { deserializeSuite  } from '../../../lib/mocha/suite.js'
 import MochawesomeHelper from '../../../lib/helper/Mochawesome.js'
 
+const { expect } = chai
 let screenshotSaved
 
 describe('screenshotOnFail', () => {
diff --git a/test/unit/plugin/subtitles_test.js.skip b/test/unit/plugin/subtitles_test.js.skip
diff --git a/test/unit/recorder_test.js b/test/unit/recorder_test.js
@@ -1,8 +1,7 @@
 import chai from 'chai'
-const { expect } = chai
-
 import recorder from '../../lib/recorder.js'
 
+const { expect } = chai
 describe('Recorder', () => {
   beforeEach(() => recorder.start())
 
diff --git a/test/unit/steps_test.js b/test/unit/steps_test.js
@@ -1,14 +1,11 @@
 import sinon from 'sinon'
-
 import Step from '../../lib/step.js'
 import { MetaStep  } from '../../lib/step.js'
 import event from '../../lib/event.js'
-import { secret  } from '../../lib/secret.js'
-
+import Secret from '../../lib/secret.js'
 import chai from 'chai'
-const { expect } = chai
-
 
+const { expect } = chai
 let step
 let action
 
@@ -41,7 +38,7 @@ describe('Steps', () => {
       step.args = [testUndefined, 'undefined']
       expect(step.humanizeArgs()).eql(', "undefined"')
 
-      step.args = [secret('word'), 1]
+      step.args = [new Secret('word'), 1]
       expect(step.humanizeArgs()).eql('*****, 1')
     })
 
diff --git a/test/unit/utils_test.js b/test/unit/utils_test.js
diff --git a/test/unit/workerStorage_test.js b/test/unit/workerStorage_test.js
diff --git a/test/unit/worker_test.js.skip b/test/unit/worker_test.js.skip

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,18 @@ class Mochawesome extends Helper {`
`15`	`15`	`disableScreenshots: false,`
`16`	`16`	`}`
`17`	`17`
`18`		`- this._addContext = (await import('mochawesome/addContext')).default`
	`18`	`+ this._addContext = null`
`19`	`19`
`20`	`20`	`this._createConfig(config)`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ async _ensureAddContext() {`
	`24`	`+ if (!this._addContext) {`
	`25`	`+ this._addContext = (await import('mochawesome/addContext')).default`
	`26`	`+ }`
	`27`	`+ return this._addContext`
	`28`	`+ }`
	`29`	`+`
`23`	`30`	`_createConfig(config) {`
`24`	`31`	`// override defaults with config`
`25`	`32`	`Object.assign(this.options, config)`
`@@ -40,7 +47,7 @@ class Mochawesome extends Helper {`
`40`	`47`	`currentTest = { test }`
`41`	`48`	`}`
`42`	`49`
`43`		`- _failed(test) {`
	`50`	`+ async _failed(test) {`
`44`	`51`	`if (this.options.disableScreenshots) return`
`45`	`52`	`let fileName`
`46`	`53`	`// Get proper name if we are fail on hook`
`@@ -58,13 +65,15 @@ class Mochawesome extends Helper {`
`58`	`65`	`}`
`59`	`66`	`if (test._retries < 1 \|\| test._retries === test.retryNum) {`
`60`	`67`	fileName = `${fileName}.failed.png`
`61`		`- return this._addContext(currentTest, fileName)`
	`68`	`+ const addContext = await this._ensureAddContext()`
	`69`	`+ return addContext(currentTest, fileName)`
`62`	`70`	`}`
`63`	`71`	`}`
`64`	`72`
`65`		`- addMochawesomeContext(context) {`
	`73`	`+ async addMochawesomeContext(context) {`
`66`	`74`	`if (currentTest === '') currentTest = { test: currentSuite.ctx.test }`
`67`		`- return this._addContext(currentTest, context)`
	`75`	`+ const addContext = await this._ensureAddContext()`
	`76`	`+ return addContext(currentTest, context)`
`68`	`77`	`}`
`69`	`78`	`}`
`70`	`79`