fixed session tests

Author: DavertMik

lib/helper/Playwright.js

@@ -2680,33 +2680,16 @@ class Playwright extends Helper {
 
     this.debugSection('Screenshot', relativeDir(outputFile))
 
-    // Multiple layers of checking before attempting screenshot
-    if (!this.page) {
-      this.debug('Cannot take screenshot: page object is undefined')
+    if (!this.page || !this.browser || !this.browserContext) {
+      this.debug(`Cannot take screenshot: page=${!!this.page}, browser=${!!this.browser}, browserContext=${!!this.browserContext}`)
       return
     }
-
-    if (!this.browser) {
-      this.debug('Cannot take screenshot: browser object is undefined')
-      return
-    }
-
-    if (!this.browserContext) {
-      this.debug('Cannot take screenshot: browser context is undefined')
+    if (this.page.isClosed && this.page.isClosed()) {
+      this.debug('Cannot take screenshot: page is closed')
       return
     }
 
     try {
-      // Check if page is still accessible before taking screenshot
-      if (this.page.isClosed && this.page.isClosed()) {
-        this.debug('Cannot take screenshot: page is closed')
-        return
-      }
-
-      // Additional check - try to access page properties to ensure it's alive
-      await Promise.race([this.page.url(), new Promise((_, reject) => setTimeout(() => reject(new Error('Page URL check timeout')), 1000))])
-
-      // Take screenshot with timeout protection
       await Promise.race([
         this.page.screenshot({
           path: outputFile,
@@ -2718,18 +2701,10 @@ class Playwright extends Helper {
     } catch (err) {
       this.debug(`Failed to take screenshot: ${err.message}`)
 
-      // Track screenshot failures that could affect test results
       this.hasCleanupError = true
       this.testFailures.push(`Screenshot failed: ${err.message}`)
 
-      if (
-        err.message.includes('Target page, context or browser has been closed') ||
-        err.message.includes('Page has been closed') ||
-        err.message.includes('Browser has been closed') ||
-        err.message.includes('Protocol error') ||
-        err.message.includes('Connection closed') ||
-        err.message.includes('timeout')
-      ) {
+      if (err.message.includes('closed') || err.message.includes('Protocol error') || err.message.includes('timeout')) {
         this.debug('Screenshot failed due to browser/page closure or timeout, continuing...')
         return
       }

lib/session.js

@@ -51,7 +51,7 @@ function session(sessionName, config, fn) {
       delete savedSessions[sessionName]
     }
 
-    event.dispatcher.once(event.test.finished, () => {
+    event.dispatcher.once(event.test.after, () => {
       recorder.add('close session browsers', closeBrowsers)
     })
 
@@ -83,6 +83,7 @@ function session(sessionName, config, fn) {
       recorder.session.start(`session:${sessionName}`)
       event.dispatcher.on(event.step.after, addContextToStep)
       recorder.add('switch to browser', () => {
+        const session = savedSessions[sessionName]
         return session.loadVars(session.vars)
       })
 
@@ -99,9 +100,10 @@ function session(sessionName, config, fn) {
       if (isAsyncFunction(fn)) {
         return fn
           .apply(null)
-          .then(res => {
+          .then(async res => {
             finalize()
-            return recorder.promise().then(() => res)
+            await recorder.promise()
+            return res
           })
           .catch(e => {
             output.stepShift = 0

package.json

@@ -133,7 +133,7 @@
     "@inquirer/testing": "^2.1.49",
     "@pollyjs/adapter-puppeteer": "6.0.6",
     "@pollyjs/core": "6.0.6",
-    "@testomatio/reporter": "^2.0.2",
+    "@testomatio/reporter": "^2.3.0",
     "@types/chai": "5.2.2",
     "@types/inquirer": "9.0.7",
     "@types/node": "24.0.10",

test/acceptance/session_test.js

@@ -22,14 +22,16 @@ Scenario('screenshots reflect the current page of current session @Puppeteer @Pl
   I.amOnPage('/')
   I.saveScreenshot('session_default_1.png')
 
-  session('john', () => {
+  await session('john', () => {
     I.amOnPage('/info')
     I.saveScreenshot('session_john_1.png')
+    I.say('John is first')
   })
 
+  I.say('Me is second')
   I.saveScreenshot('session_default_2.png')
 
-  session('john', () => {
+  await session('john', () => {
     I.saveScreenshot('session_john_2.png')
   })
 

test/support/TestHelper.js

@@ -1,6 +1,6 @@
 class TestHelper {
   static siteUrl() {
-    return process.env.SITE_URL || 'http://localhost:8000'
+    return process.env.SITE_URL || 'http://0.0.0.0:8000'
   }
 
   static angularSiteUrl() {
@@ -12,23 +12,23 @@ class TestHelper {
   }
 
   static seleniumHost() {
-    return process.env.SELENIUM_HOST || 'localhost'
+    return process.env.SELENIUM_HOST || '0.0.0.0'
   }
 
   static seleniumPort() {
     return parseInt(process.env.SELENIUM_PORT || '4444', 10)
   }
 
   static jsonServerUrl() {
-    return process.env.JSON_SERVER_URL || 'http://localhost:8010'
+    return process.env.JSON_SERVER_URL || 'http://0.0.0.0:8010'
   }
 
   static graphQLServerPort() {
     return parseInt(process.env.GRAPHQL_SERVER_PORT || '8020', 10)
   }
 
   static graphQLServerUrl() {
-    return process.env.GRAPHQL_SERVER_URL || 'http://localhost:8020/graphql'
+    return process.env.GRAPHQL_SERVER_URL || 'http://0.0.0.0:8020/graphql'
   }
 
   static echo(...args) {