fix more UTs

Author: kobenguyent

lib/mocha/asyncWrapper.js

@@ -60,7 +60,7 @@ function test(test) {
     let testPassed = false
     // Ensure recorder is running so any steps added inside test function are executed
     recorder.startUnlessRunning()
-    // Fire started event immediately so listeners are notified regardless of recorder queue
+    // Fire started event immediately so listeners are notified prior to queued steps
     event.emit(event.test.started, test)
     recorder.errHandler(err => {
       recorder.session.start('teardown')

lib/plugin/retryFailedStep.js

@@ -77,7 +77,7 @@ const defaultConfig = {
  * ```
  *
  */
-export default function(config) {
+export default function (config) {
   config = Object.assign(defaultConfig, config)
   config.ignoredSteps = config.ignoredSteps.concat(config.defaultIgnoredSteps)
   const customWhen = config.when
@@ -93,6 +93,11 @@ export default function(config) {
   }
   config.when = when
 
+  // Ensure retry options are available before any steps run
+  if (!recorder.retries.find(r => r === config)) {
+    recorder.retries.push(config)
+  }
+
   event.dispatcher.on(event.step.started, step => {
     // if a step is ignored - return
     for (const ignored of config.ignoredSteps) {
@@ -104,7 +109,8 @@ export default function(config) {
     enableRetry = true // enable retry for a step
   })
 
-  event.dispatcher.on(event.step.finished, () => {
+  // Disable retry only after a successful step; keep it enabled for failure so retry logic can act
+  event.dispatcher.on(event.step.passed, () => {
     enableRetry = false
   })
 
@@ -115,9 +121,38 @@ export default function(config) {
       store.autoRetries = false
       return // disable retry when a test is not active
     }
+
+    // Don't apply plugin retry logic if there are already manual retries configured
+    // Check if any retry configs exist that aren't from this plugin
+    const hasManualRetries = recorder.retries.some(retry => retry !== config)
+    if (hasManualRetries) {
+      store.autoRetries = false
+      return
+    }
+
     // this option is used to set the retries inside _before() block of helpers
     store.autoRetries = true
     test.opts.conditionalRetries = config.retries
+    // debug: record applied retries value for tests
+    if (process.env.DEBUG_RETRY_PLUGIN) {
+      // eslint-disable-next-line no-console
+      console.log('[retryFailedStep] applying retries =', config.retries, 'for test', test.title)
+    }
     recorder.retry(config)
   })
+
+  // Fallback for environments where event.test.before wasn't emitted (runner scenarios)
+  event.dispatcher.on(event.test.started, test => {
+    if (test.opts?.disableRetryFailedStep || test.disableRetryFailedStep) return
+
+    // Don't apply plugin retry logic if there are already manual retries configured
+    // Check if any retry configs exist that aren't from this plugin
+    const hasManualRetries = recorder.retries.some(retry => retry !== config)
+    if (hasManualRetries) return
+
+    if (!store.autoRetries) {
+      store.autoRetries = true
+      test.opts.conditionalRetries = test.opts.conditionalRetries || config.retries
+    }
+  })
 }

lib/recorder.js

@@ -232,7 +232,9 @@ export default {
     if (Number.isInteger(opts)) {
       opts = { retries: opts }
     }
-    return this.add(() => this.retries.push(opts))
+    // Push retry options immediately so first step can see them
+    this.retries.push(opts)
+    return Promise.resolve()
   },
 
   /**