Merge branch '3.x' into feat/analyze-result

Author: DavertMik

lib/plugin/commentStep.js

@@ -7,6 +7,8 @@ let currentCommentStep
 const defaultGlobalName = '__'
 
 /**
+ * @deprecated
+ *
  * Add descriptive nested steps for your tests:
  *
  * ```js
@@ -100,6 +102,9 @@ const defaultGlobalName = '__'
  * ```
  */
 module.exports = function (config) {
+  console.log('commentStep is deprecated, disable it and use Section instead')
+  console.log('const { Section: __ } = require("codeceptjs/steps")')
+
   event.dispatcher.on(event.test.started, () => {
     currentCommentStep = null
   })

lib/step/base.js

@@ -214,7 +214,7 @@ class Step {
     processingStep = this
 
     while (processingStep.metaStep) {
-      if (processingStep.metaStep.actor.match(/^(Given|When|Then|And)/)) {
+      if (processingStep.metaStep.actor?.match(/^(Given|When|Then|And)/)) {
         hasBDD = true
         break
       } else {

lib/step/meta.js

@@ -6,6 +6,10 @@ class MetaStep extends Step {
   constructor(actor, method) {
     if (!method) method = ''
     super(method)
+
+    /** @member {boolean} collsapsed hide children steps from output */
+    this.collapsed = false
+
     this.actor = actor
   }
 
@@ -32,7 +36,11 @@ class MetaStep extends Step {
       return `${this.prefix}${actorText} ${this.humanize()} ${this.humanizeArgs()}${this.suffix}`
     }
 
-    return `On ${this.prefix}${actorText}: ${this.humanize()} ${this.humanizeArgs()}${this.suffix}`
+    if (!this.actor) {
+      return `${this.name} ${this.humanizeArgs()}${this.suffix}`.trim()
+    }
+
+    return `On ${this.prefix}${actorText}: ${this.humanize()} ${this.humanizeArgs()}${this.suffix}`.trim()
   }
 
   humanize() {

lib/step/section.js

@@ -0,0 +1,55 @@
+const MetaStep = require('./meta')
+const event = require('../event')
+
+let currentSection
+
+class Section {
+  constructor(name = '') {
+    this.name = name
+
+    this.metaStep = new MetaStep(null, name)
+
+    this.attachMetaStep = step => {
+      if (currentSection !== this) return
+      if (!step) return
+      const metaStep = getRootMetaStep(step)
+
+      if (metaStep !== this.metaStep) {
+        metaStep.metaStep = this.metaStep
+      }
+    }
+  }
+
+  hidden() {
+    this.metaStep.collapsed = true
+    return this
+  }
+
+  start() {
+    if (currentSection) currentSection.end()
+    currentSection = this
+    event.dispatcher.prependListener(event.step.before, this.attachMetaStep)
+    event.dispatcher.once(event.test.finished, () => this.end())
+    return this
+  }
+
+  end() {
+    currentSection = null
+    event.dispatcher.off(event.step.started, this.attachMetaStep)
+    return this
+  }
+
+  /**
+   * @returns {Section}
+   */
+  static current() {
+    return currentSection
+  }
+}
+
+function getRootMetaStep(step) {
+  if (step.metaStep) return getRootMetaStep(step.metaStep)
+  return step
+}
+
+module.exports = Section

lib/steps.js

@@ -1,5 +1,5 @@
 const StepConfig = require('./step/config')
-
+const Section = require('./step/section')
 function stepOpts(opts = {}) {
   return new StepConfig(opts)
 }
@@ -12,12 +12,39 @@ function stepRetry(retry) {
   return new StepConfig().retry(retry)
 }
 
+function section(name) {
+  if (!name) return endSection()
+  return new Section(name).start()
+}
+
+function endSection() {
+  return Section.current().end()
+}
+
 // Section function to be added here
 
 const step = {
+  // steps.opts syntax
   opts: stepOpts,
   timeout: stepTimeout,
   retry: stepRetry,
+
+  // one-function syntax
+  stepTimeout,
+  stepRetry,
+  stepOpts,
+
+  // sections
+  section,
+  endSection,
+
+  Section: section,
+  EndSection: endSection,
+
+  // shortcuts
+  Given: () => section('Given'),
+  When: () => section('When'),
+  Then: () => section('Then'),
 }
 
 module.exports = step

runok.js

@@ -607,7 +607,7 @@ describe('CodeceptJS ${featureName}', function () {
     console.log(`Created test files for feature: ${featureName}`)
 
     console.log('Run codecept tests with:')
-    console.log(`./bin/codecept.js run --config ${configDir}/codecept.${featureName}.conf.js`)
+    console.log(`./bin/codecept.js run --config ${configDir}/codecept.conf.js`)
 
     console.log('')
     console.log('Run tests with:')

test/data/sandbox/configs/step-sections/codecept.conf.js

@@ -0,0 +1,16 @@
+exports.config = {
+  tests: './*_test.js',
+  output: './output',
+  helpers: {
+    FileSystem: {},
+    CustomHelper: {
+      require: './customHelper.js',
+    },
+  },
+  include: {
+    userPage: './userPage.js',
+  },
+  bootstrap: false,
+  mocha: {},
+  name: 'step-sections tests',
+}

test/data/sandbox/configs/step-sections/customHelper.js

@@ -0,0 +1,7 @@
+class CustomHelper extends Helper {
+  act() {
+    this.debug(JSON.stringify(arguments))
+  }
+}
+
+module.exports = CustomHelper

test/data/sandbox/configs/step-sections/step-sections_test.js

@@ -0,0 +1,34 @@
+const { Section, EndSection } = require('codeceptjs/steps')
+
+Feature('step-sections')
+
+Scenario('test using of basic step-sections', ({ I }) => {
+  I.amInPath('.')
+
+  Section('User Journey')
+  I.act('Hello, World!')
+
+  Section()
+  I.act('Nothing to say')
+})
+
+Scenario('test using of step-sections and page objects', ({ I, userPage }) => {
+  Section('User Journey')
+  userPage.actOnPage()
+
+  I.act('One more step')
+
+  Section()
+
+  I.act('Nothing to say')
+})
+
+Scenario('test using of hidden step-sections', ({ I, userPage }) => {
+  Section('User Journey').hidden()
+  userPage.actOnPage()
+  I.act('One more step')
+
+  EndSection()
+
+  I.act('Nothing to say')
+})

test/data/sandbox/configs/step-sections/userPage.js

@@ -0,0 +1,8 @@
+const { I } = inject()
+
+module.exports = {
+  actOnPage: () => {
+    I.act('actOnPage')
+    I.act('see on this page')
+  },
+}