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

package/lib/helper/JSONResponse.js

@@ -1,6 +1,6 @@
-const Helper = require('@codeceptjs/helper')
-const assert = require('assert')
-const joi = require('joi')
+import Helper from '@codeceptjs/helper'
+import assert from 'assert'
+import joi from 'joi'
 
 /**
  * This helper allows performing assertions on JSON responses paired with following helpers:
@@ -69,12 +69,17 @@ class JSONResponse extends Helper {
 
   _beforeSuite() {
     this.response = null
-    if (!this.helpers[this.options.requestHelper]) {
-      throw new Error(`Error setting JSONResponse, helper ${this.options.requestHelper} is not enabled in config, helpers: ${Object.keys(this.helpers)}`)
-    }
-    // connect to REST helper
-    this.helpers[this.options.requestHelper].config.onResponse = response => {
-      this.response = response
+    try {
+      if (!this.helpers[this.options.requestHelper]) {
+        throw new Error(`Error setting JSONResponse, helper ${this.options.requestHelper} is not enabled in config, helpers: ${Object.keys(this.helpers)}`)
+      }
+      // connect to REST helper
+      this.helpers[this.options.requestHelper].config.onResponse = response => {
+        this.response = response
+      }
+    } catch (e) {
+      // Temporary workaround for ESM transition - helpers access issue
+      console.log('[JSONResponse] Warning: Could not connect to REST helper during ESM transition:', e.message)
     }
   }
 
@@ -84,7 +89,9 @@ class JSONResponse extends Helper {
 
   static _checkRequirements() {
     try {
-      require('joi')
+      // In ESM, joi is already imported at the top
+      // The import will fail at module load time if joi is missing
+      return null
     } catch (e) {
       return ['joi']
     }
@@ -349,25 +356,7 @@ class JSONResponse extends Helper {
     for (const key in expected) {
       assert(key in actual, `Key "${key}" not found in ${JSON.stringify(actual)}`)
       if (typeof expected[key] === 'object' && expected[key] !== null) {
-        if (Array.isArray(expected[key])) {
-          // Handle array comparison: each expected element should have a match in actual array
-          assert(Array.isArray(actual[key]), `Expected array for key "${key}", but got ${typeof actual[key]}`)
-          for (const expectedItem of expected[key]) {
-            let found = false
-            for (const actualItem of actual[key]) {
-              try {
-                this._assertContains(actualItem, expectedItem)
-                found = true
-                break
-              } catch (err) {
-                continue
-              }
-            }
-            assert(found, `No matching element found in array for ${JSON.stringify(expectedItem)}`)
-          }
-        } else {
-          this._assertContains(actual[key], expected[key])
-        }
+        this._assertContains(actual[key], expected[key])
       } else {
         assert.deepStrictEqual(actual[key], expected[key], `Values for key "${key}" don't match`)
       }
@@ -375,4 +364,4 @@ class JSONResponse extends Helper {
   }
 }
 
-module.exports = JSONResponse
+export { JSONResponse as default }

package/lib/helper/Mochawesome.js

@@ -1,9 +1,10 @@
 let currentTest
 let currentSuite
 
-const Helper = require('@codeceptjs/helper')
-const { clearString } = require('../utils')
-const { testToFileName } = require('../mocha/test')
+import Helper from '@codeceptjs/helper'
+import { createRequire } from 'module'
+import { clearString } from '../utils.js'
+import { testToFileName } from '../mocha/test.js'
 
 class Mochawesome extends Helper {
   constructor(config) {
@@ -15,6 +16,8 @@ class Mochawesome extends Helper {
       disableScreenshots: false,
     }
 
+    // ESM-compatible require for CommonJS module
+    const require = createRequire(import.meta.url)
     this._addContext = require('mochawesome/addContext')
 
     this._createConfig(config)
@@ -37,20 +40,7 @@ class Mochawesome extends Helper {
   }
 
   _test(test) {
-    // If this is a retried test, we want to add context to the retried test
-    // but also potentially preserve context from the original test
-    const originalTest = test.retriedTest && test.retriedTest()
-    if (originalTest) {
-      // This is a retried test - use the retried test for context
-      currentTest = { test }
-
-      // Optionally copy context from original test if it exists
-      // Note: mochawesome context is stored in test.ctx, but we need to be careful
-      // not to break the mocha context structure
-    } else {
-      // Normal test (not a retry)
-      currentTest = { test }
-    }
+    currentTest = { test }
   }
 
   _failed(test) {
@@ -77,17 +67,8 @@ class Mochawesome extends Helper {
 
   addMochawesomeContext(context) {
     if (currentTest === '') currentTest = { test: currentSuite.ctx.test }
-
-    // For retried tests, make sure we're adding context to the current (retried) test
-    // not the original test
-    let targetTest = currentTest
-    if (currentTest.test && currentTest.test.retriedTest && currentTest.test.retriedTest()) {
-      // This test has been retried, make sure we're using the current test for context
-      targetTest = { test: currentTest.test }
-    }
-
-    return this._addContext(targetTest, context)
+    return this._addContext(currentTest, context)
   }
 }
 
-module.exports = Mochawesome
+export default Mochawesome