add helper

Author: DenysKuchma

lib/listener/globalTimeout.js

@@ -7,6 +7,7 @@ import debugModule from 'debug'
 const debug = debugModule('codeceptjs:timeout')
 import { TIMEOUT_ORDER, TimeoutError, TestTimeoutError, StepTimeoutError } from '../timeout.js'
 import { BeforeSuiteHook, AfterSuiteHook } from '../mocha/hooks.js'
+import { extractStepCode } from '../step.js'
 
 export default function () {
   let timeout
@@ -122,15 +123,15 @@ export default function () {
     if (typeof timeout !== 'number') return
 
     if (!store.timeouts) {
-      debug('step', (step.code || (typeof step.toCode === 'function' ? step.toCode() : step.name)).trim(), 'timeout disabled')
+      debug('step', extractStepCode(step), 'timeout disabled')
       return
     }
 
     if (timeout < 0) {
       debug('Previous steps timed out, setting timeout to 0.01s')
       step.setTimeout(0.01, TIMEOUT_ORDER.testOrSuite)
     } else {
-      debug(`Setting timeout ${timeout}ms for step ${(step.code || (typeof step.toCode === 'function' ? step.toCode() : step.name)).trim()}`)
+      debug(`Setting timeout ${timeout}ms for step ${extractStepCode(step)}`)
       step.setTimeout(timeout, TIMEOUT_ORDER.testOrSuite)
     }
   })
@@ -158,17 +159,17 @@ export default function () {
 
   event.dispatcher.on(event.step.finished, step => {
     if (!store.timeouts) {
-      debug('step', (step.code || (typeof step.toCode === 'function' ? step.toCode() : step.name)).trim(), 'timeout disabled')
+      debug('step', extractStepCode(step), 'timeout disabled')
       return
     }
 
     if (typeof timeout === 'number') debug('Timeout', timeout)
 
-    debug(`step ${(step.code || (typeof step.toCode === 'function' ? step.toCode() : step.name)).trim()}:${step.status} duration`, step.duration)
+    debug(`step ${extractStepCode(step)}:${step.status} duration`, step.duration)
     if (typeof timeout === 'number' && !Number.isNaN(timeout)) timeout -= step.duration
 
     if (typeof timeout === 'number' && timeout <= 0 && recorder.isRunning()) {
-      debug(`step ${(step.code || (typeof step.toCode === 'function' ? step.toCode() : step.name)).trim()} timed out`)
+      debug(`step ${extractStepCode(step)} timed out`)
       recorder.throw(new TestTimeoutError(currentTimeout))
     }
   })

lib/step.js

@@ -5,7 +5,7 @@
  */
 import BaseStep from './step/base.js'
 import StepConfig from './step/config.js'
-import Step from './step/helper.js'
+import Step, { extractStepCode } from './step/helper.js'
 
 /**
  * MetaStep is a step that is used to wrap other steps.
@@ -20,4 +20,4 @@ import MetaStep from './step/meta.js'
 import FuncStep from './step/func.js'
 
 export default Step
-export { MetaStep, BaseStep, StepConfig, FuncStep }
+export { MetaStep, BaseStep, StepConfig, FuncStep, extractStepCode }

lib/step/helper.js

@@ -40,6 +40,10 @@ class HelperStep extends Step {
 
 export default HelperStep
 
+export function extractStepCode(step) {
+  return (step.code || (typeof step.toCode === 'function' ? step.toCode() : step.name)).trim()
+}
+
 function dryRunResolver() {
   return {
     get(target, prop) {