From 435ce10ff902441dbb18129b948e16fe61cc5571 Mon Sep 17 00:00:00 2001
From: kobenguyent <kobenguyent@gmail.com>
Date: Thu, 16 Jan 2025 16:41:43 +0100
Subject: [PATCH] fix: screenshots for sessions

---
 lib/helper/Playwright.js        | 16 ++++++++--------
 lib/helper/Puppeteer.js         | 16 ++++++++--------
 package.json                    |  2 +-
 test/acceptance/session_test.js |  5 ++---
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 979cc743a..04a3a9af6 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -2287,14 +2287,6 @@ class Playwright extends Helper {
     const fullPageOption = fullPage || this.options.fullPageScreenshots
     let outputFile = screenshotOutputFolder(fileName)
 
-    this.debugSection('Screenshot', relativeDir(outputFile))
-
-    await this.page.screenshot({
-      path: outputFile,
-      fullPage: fullPageOption,
-      type: 'png',
-    })
-
     if (this.activeSessionName) {
       for (const sessionName in this.sessionPages) {
         const activeSessionPage = this.sessionPages[sessionName]
@@ -2311,6 +2303,14 @@ class Playwright extends Helper {
         }
       }
     }
+
+    this.debugSection('Screenshot', relativeDir(outputFile))
+
+    await this.page.screenshot({
+      path: outputFile,
+      fullPage: fullPageOption,
+      type: 'png',
+    })
   }
 
   /**
diff --git a/lib/helper/Puppeteer.js b/lib/helper/Puppeteer.js
index 3ea66872d..9083ef86c 100644
--- a/lib/helper/Puppeteer.js
+++ b/lib/helper/Puppeteer.js
@@ -1954,14 +1954,6 @@ class Puppeteer extends Helper {
     const fullPageOption = fullPage || this.options.fullPageScreenshots
     let outputFile = screenshotOutputFolder(fileName)
 
-    this.debug(`Screenshot is saving to ${outputFile}`)
-
-    await this.page.screenshot({
-      path: outputFile,
-      fullPage: fullPageOption,
-      type: 'png',
-    })
-
     if (this.activeSessionName) {
       for (const sessionName in this.sessionPages) {
         const activeSessionPage = this.sessionPages[sessionName]
@@ -1978,6 +1970,14 @@ class Puppeteer extends Helper {
         }
       }
     }
+
+    this.debug(`Screenshot is saving to ${outputFile}`)
+
+    await this.page.screenshot({
+      path: outputFile,
+      fullPage: fullPageOption,
+      type: 'png',
+    })
   }
 
   async _failed(test) {
diff --git a/package.json b/package.json
index 45f0a6c18..b243ce22c 100644
--- a/package.json
+++ b/package.json
@@ -94,8 +94,8 @@
     "figures": "3.2.0",
     "fn-args": "4.0.0",
     "fs-extra": "11.2.0",
-    "glob": "^11.0.0",
     "fuse.js": "^7.0.0",
+    "glob": "^11.0.0",
     "html-minifier-terser": "7.2.0",
     "inquirer": "6.5.2",
     "invisi-data": "^1.0.0",
diff --git a/test/acceptance/session_test.js b/test/acceptance/session_test.js
index 98812a331..098704b6d 100644
--- a/test/acceptance/session_test.js
+++ b/test/acceptance/session_test.js
@@ -81,7 +81,6 @@ Scenario('should save screenshot for sessions @Puppeteer @Playwright', async fun
   await I.amOnPage('/form/bug1467')
   await I.saveScreenshot('original.png')
   await I.amOnPage('/')
-  await I.saveScreenshot('main_session.png')
   session('john', async () => {
     await I.amOnPage('/form/bug1467')
     event.dispatcher.emit(event.test.failed, this)
@@ -94,8 +93,8 @@ Scenario('should save screenshot for sessions @Puppeteer @Playwright', async fun
   await I.expectEqual(original, failed)
 
   // Assert that screenshots of sessions are created
-  const [main_original, session_failed] = await I.getSHA256Digests([`${output_dir}/main_session.png`, `${output_dir}/john_${fileName}.failed.png`])
-  await I.expectNotEqual(main_original, session_failed)
+  const [main_original] = await I.getSHA256Digests([`${output_dir}/${fileName}.failed.png`])
+  await I.expectNotEqual(main_original, failed)
 })
 
 Scenario('should throw exception and close correctly @Puppeteer @Playwright', ({ I }) => {