fixed bdd tests

Author: DavertMik

lib/mocha/gherkin.js

@@ -1,8 +1,10 @@
 const Gherkin = require('@cucumber/gherkin')
 const Messages = require('@cucumber/messages')
-const { Context, Suite, Test } = require('mocha')
+const { Context, Suite } = require('mocha')
 const debug = require('debug')('codeceptjs:bdd')
 
+const { enhanceMochaSuite } = require('./suite')
+const { createTest } = require('./test')
 const { matchStep } = require('./bdd')
 const event = require('../event')
 const scenario = require('./scenario')
@@ -28,6 +30,7 @@ module.exports = (text, file) => {
     throw new Error(`No 'Features' available in Gherkin '${file}' provided!`)
   }
   const suite = new Suite(ast.feature.name, new Context())
+  enhanceMochaSuite(suite)
   const tags = ast.feature.tags.map(t => t.name)
   suite.title = `${suite.title} ${tags.join(' ')}`.trim()
   suite.tags = tags || []
@@ -130,10 +133,10 @@ module.exports = (text, file) => {
             }
           }
 
-          const test = new Test(title, async () => runSteps(addExampleInTable(exampleSteps, current)))
+          const test = createTest(title, async () => runSteps(addExampleInTable(exampleSteps, current)))
+          test.addToSuite(suite)
           test.tags = suite.tags.concat(tags)
           test.file = file
-          suite.addTest(scenario.test(test))
         }
       }
       continue
@@ -142,10 +145,10 @@ module.exports = (text, file) => {
     if (child.scenario) {
       const tags = child.scenario.tags.map(t => t.name)
       const title = `${child.scenario.name} ${tags.join(' ')}`.trim()
-      const test = new Test(title, async () => runSteps(child.scenario.steps))
+      const test = createTest(title, async () => runSteps(child.scenario.steps))
+      test.addToSuite(suite)
       test.tags = suite.tags.concat(tags)
       test.file = file
-      suite.addTest(scenario.test(test))
     }
   }
 

lib/mocha/scenarioConfig.js

@@ -1,3 +1,5 @@
+const { isAsyncFunction } = require('../utils')
+
 /** @class */
 class ScenarioConfig {
   constructor(test) {
@@ -71,21 +73,20 @@ class ScenarioConfig {
    * @param {Object<string, any>} [obj]
    * @returns {this}
    */
-  async config(helper, obj) {
+  config(helper, obj) {
     if (!obj) {
       obj = helper
       helper = 0
     }
     if (typeof obj === 'function') {
-      obj(this.test).then(result => {
-        this.test.config[helper] = result
-      })
+      if (isAsyncFunction(obj)) {
+        obj(this.test).then(res => (this.test.config[helper] = res))
+      } else {
+        obj = obj(this.test)
+      }
       return this
     }
 
-    if (!this.test.config) {
-      this.test.config = {}
-    }
     this.test.config[helper] = obj
     return this
   }

test/unit/bdd_test.js

@@ -1,6 +1,6 @@
 const Gherkin = require('@cucumber/gherkin')
 const Messages = require('@cucumber/messages')
-
+const path = require('path')
 const chai = require('chai')
 
 const expect = chai.expect
@@ -17,6 +17,8 @@ const container = require('../../lib/container')
 const actor = require('../../lib/actor')
 const event = require('../../lib/event')
 
+global.codecept_dir = path.join(__dirname, '/..')
+
 class Color {
   constructor(name) {
     this.name = name
@@ -111,7 +113,7 @@ describe('BDD', () => {
     expect('@super').is.equal(suite.tests[0].tags[0])
   })
 
-  it('should load step definitions', done => {
+  it('should load and run step definitions', done => {
     let sum = 0
     Given(/I have product with (\d+) price/, param => (sum += parseInt(param, 10)))
     When('I go to checkout process', () => (sum += 10))