fix more tests

Author: kobenguyent

lib/container.js

@@ -62,7 +62,7 @@ class Container {
 
     // create support objects
     container.support = {}
-    container.helpers = createHelpers(config.helpers || {})
+    container.helpers = await createHelpers(config.helpers || {})
     container.translation = await loadTranslation(config.translation || null, config.vocabularies || [])
     container.proxySupport = createSupportObjects(config.include || {})
     container.plugins = await createPlugins(config.plugins || {}, opts)
@@ -252,7 +252,7 @@ class Container {
 
 export default Container
 
-function createHelpers(config) {
+async function createHelpers(config) {
   const helpers = {}
   for (let helperName in config) {
     try {
@@ -278,7 +278,7 @@ function createHelpers(config) {
           helpers[helperName] = {}
           asyncHelperPromise = asyncHelperPromise
             .then(() => helperResult)
-            .then(ResolvedHelperClass => {
+            .then(async ResolvedHelperClass => {
               debug(`helper ${helperName} resolved type: ${typeof ResolvedHelperClass}`, ResolvedHelperClass)
 
               // Extract default export from ESM module wrapper if needed
@@ -293,7 +293,7 @@ function createHelpers(config) {
 
               checkHelperRequirements(ResolvedHelperClass)
               helpers[helperName] = new ResolvedHelperClass(config[helperName])
-              if (helpers[helperName]._init) helpers[helperName]._init()
+              if (helpers[helperName]._init) await helpers[helperName]._init()
               debug(`helper ${helperName} async initialized`)
             })
           continue
@@ -332,7 +332,7 @@ function createHelpers(config) {
   }
 
   for (const name in helpers) {
-    if (helpers[name]._init) helpers[name]._init()
+    if (helpers[name]._init) await helpers[name]._init()
   }
   return helpers
 }

lib/helper/Puppeteer.js

@@ -303,16 +303,20 @@ class Puppeteer extends Helper {
     // Load puppeteer dynamically with fallback
     if (!puppeteer) {
       try {
-        puppeteer = await import('puppeteer')
-        puppeteer = puppeteer.default || puppeteer
+        const puppeteerModule = await import('puppeteer')
+        puppeteer = puppeteerModule.default || puppeteerModule
+        this.debugSection('Puppeteer', `Loaded puppeteer successfully, launch available: ${!!puppeteer.launch}`)
       } catch (e) {
         try {
-          puppeteer = await import('puppeteer-core')
-          puppeteer = puppeteer.default || puppeteer
+          const puppeteerModule = await import('puppeteer-core')
+          puppeteer = puppeteerModule.default || puppeteerModule
+          this.debugSection('Puppeteer', `Loaded puppeteer-core successfully, launch available: ${!!puppeteer.launch}`)
         } catch (e2) {
           throw new Error('Neither puppeteer nor puppeteer-core could be loaded. Please install one of them.')
         }
       }
+    } else {
+      this.debugSection('Puppeteer', `Puppeteer already loaded, launch available: ${!!puppeteer.launch}`)
     }
   }
 
@@ -577,6 +581,12 @@ class Puppeteer extends Helper {
   }
 
   async _startBrowser() {
+    this.debugSection('Puppeteer', `Starting browser. Puppeteer available: ${!!puppeteer}, launch available: ${!!puppeteer?.launch}`)
+
+    if (!puppeteer) {
+      throw new Error('Puppeteer is not loaded. Make sure _init() was called before _startBrowser()')
+    }
+
     if (this.isRemoteBrowser) {
       try {
         this.browser = await puppeteer.connect(this.puppeteerOptions)
@@ -694,7 +704,21 @@ class Puppeteer extends Helper {
       this.currentRunningTest.artifacts.trace = fileName
     }
 
-    await this.page.goto(url, { waitUntil: this.options.waitForNavigation })
+    try {
+      await this.page.goto(url, { waitUntil: this.options.waitForNavigation })
+    } catch (err) {
+      // Handle terminal navigation errors that shouldn't be retried
+      if (
+        err.message &&
+        (err.message.includes('ERR_ABORTED') || err.message.includes('frame was detached') || err.message.includes('Target page, context or browser has been closed') || err.message.includes('Navigation timeout'))
+      ) {
+        // Mark this as a terminal error to prevent retries
+        const terminalError = new Error(err.message)
+        terminalError.isTerminal = true
+        throw terminalError
+      }
+      throw err
+    }
 
     const performanceTiming = JSON.parse(await this.page.evaluate(() => JSON.stringify(window.performance.timing)))