codeceptjs 3.7.0-beta.17 → 3.7.0-beta.19

package/lib/command/check.js

@@ -25,6 +25,7 @@ module.exports = async function (options) {
     ai: true, // we don't need to check AI
     helpers: false,
     setup: false,
+    teardown: false,
     tests: false,
     def: false,
   }
@@ -131,23 +132,36 @@ module.exports = async function (options) {
   if (Object.keys(helpers).length) {
     const suite = container.mocha().suite
     const test = createTest('test', () => {})
-    try {
-      for (const helper of Object.values(helpers)) {
+    checks.setup = true
+    for (const helper of Object.values(helpers)) {
+      try {
         if (helper._beforeSuite) await helper._beforeSuite(suite)
         if (helper._before) await helper._before(test)
+      } catch (err) {
+        err.message = `${helper.constructor.name} helper: ${err.message}`
+        if (checks.setup instanceof Error) err.message = `${err.message}\n\n${checks.setup?.message || ''}`.trim()
+        checks.setup = err
+      }
+    }
+
+    printCheck('Helpers Before', checks['setup'], standardActingHelpers.some(h => Object.keys(helpers).includes(h)) ? 'Initializing browser' : '')
+
+    checks.teardown = true
+    for (const helper of Object.values(helpers).reverse()) {
+      try {
         if (helper._passed) await helper._passed(test)
         if (helper._after) await helper._after(test)
         if (helper._finishTest) await helper._finishTest(suite)
         if (helper._afterSuite) await helper._afterSuite(suite)
+      } catch (err) {
+        err.message = `${helper.constructor.name} helper: ${err.message}`
+        if (checks.teardown instanceof Error) err.message = `${err.message}\n\n${checks.teardown?.message || ''}`.trim()
+        checks.teardown = err
       }
-      checks.setup = true
-    } catch (err) {
-      err.message = `${helper.constructor.name} helper failed: ${err.message}`
-      checks.setup = err
     }
-  }
 
-  printCheck('Helpers Before/After', checks['setup'], standardActingHelpers.some(h => Object.keys(helpers).includes(h)) ? 'Initializing and closing browser' : '')
+    printCheck('Helpers After', checks['teardown'], standardActingHelpers.some(h => Object.keys(helpers).includes(h)) ? 'Closing browser' : '')
+  }
 
   try {
     definitions(configFile, { dryRun: true })

package/lib/plugin/retryTo.js

@@ -6,7 +6,7 @@ const defaultConfig = {
 
 module.exports = function (config) {
   config = Object.assign(defaultConfig, config)
-  console.log(`Deprecation Warning: 'retryTo' has been moved to the 'codeceptjs/effects' module`)
+  console.log(`Deprecation Warning: 'retryTo' has been moved to the 'codeceptjs/effects' module. Disable retryTo plugin to remove this warning.`)
 
   if (config.registerGlobal) {
     global.retryTo = retryTo

package/lib/plugin/tryTo.js

@@ -6,7 +6,7 @@ const defaultConfig = {
 
 module.exports = function (config) {
   config = Object.assign(defaultConfig, config)
-  console.log(`Deprecation Warning: 'tryTo' has been moved to the 'codeceptjs/effects' module`)
+  console.log(`Deprecation Warning: 'tryTo' has been moved to the 'codeceptjs/effects' module. Disable tryTo plugin to remove this warning.`)
 
   if (config.registerGlobal) {
     global.tryTo = tryTo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeceptjs",
-  "version": "3.7.0-beta.17",
+  "version": "3.7.0-beta.19",
   "description": "Supercharged End 2 End Testing Framework for NodeJS",
   "keywords": [
     "acceptance",