Fix browser close hanging by ensuring all pages and contexts are closed first

Co-authored-by: kobenguyent <7845001+kobenguyent@users.noreply.github.com>

Author: Copilot

lib/helper/Playwright.js

@@ -1389,6 +1389,29 @@ class Playwright extends Helper {
       }
     }
 
+    // Close all contexts and pages before closing browser to prevent hanging
+    if (this.browser) {
+      try {
+        const contexts = await Promise.race([
+          this.browser.contexts(),
+          new Promise((_, reject) => setTimeout(() => reject(new Error('Get contexts timeout')), 1000))
+        ])
+        // Close all pages in all contexts first
+        await Promise.allSettled(contexts.map(async (ctx) => {
+          try {
+            const pages = await ctx.pages()
+            await Promise.allSettled(pages.map(p => p.close().catch(() => {})))
+          } catch (e) {
+            // Ignore errors getting or closing pages
+          }
+        }))
+        // Then close all contexts
+        await Promise.allSettled(contexts.map(c => c.close().catch(() => {})))
+      } catch (e) {
+        // Ignore errors if browser is already closed or timeout getting contexts
+      }
+    }
+
     if (this.options.recordHar && this.browserContext) {
       try {
         await this.browserContext.close()

lib/helper/extras/PlaywrightRestartOpts.js

@@ -14,9 +14,9 @@ export function setRestartStrategy(options) {
     return (restarts = restart)
   }
 
-  // When restart is false, map to 'context' restart (as per documentation)
+  // When restart is false, don't restart anything
   if (restart === false) {
-    restarts = 'context'
+    restarts = null
     return
   }
 

lib/listener/helpers.js

@@ -74,10 +74,9 @@ export default function () {
 
   event.dispatcher.on(event.all.result, () => {
     // Skip _finishTest for all helpers if any browser helper restarts to avoid double cleanup
-    // Note: restart: false is equivalent to restart: 'context' per documentation
     const hasBrowserRestart = Object.values(helpers).some(helper => 
-      (helper.config && (helper.config.restart === 'browser' || helper.config.restart === 'context' || helper.config.restart === false || helper.config.restart === true)) || 
-      (helper.options && (helper.options.restart === 'browser' || helper.options.restart === 'context' || helper.options.restart === false || helper.options.restart === true))
+      (helper.config && (helper.config.restart === 'browser' || helper.config.restart === 'context' || helper.config.restart === true)) || 
+      (helper.options && (helper.options.restart === 'browser' || helper.options.restart === 'context' || helper.options.restart === true))
     )
 
     Object.keys(helpers).forEach(key => {
@@ -90,10 +89,9 @@ export default function () {
 
   event.dispatcher.on(event.all.after, () => {
     // Skip _cleanup for all helpers if any browser helper restarts to avoid double cleanup
-    // Note: restart: false is equivalent to restart: 'context' per documentation
     const hasBrowserRestart = Object.values(helpers).some(helper => 
-      (helper.config && (helper.config.restart === 'browser' || helper.config.restart === 'context' || helper.config.restart === false || helper.config.restart === true)) || 
-      (helper.options && (helper.options.restart === 'browser' || helper.options.restart === 'context' || helper.options.restart === false || helper.options.restart === true))
+      (helper.config && (helper.config.restart === 'browser' || helper.config.restart === 'context' || helper.config.restart === true)) || 
+      (helper.options && (helper.options.restart === 'browser' || helper.options.restart === 'context' || helper.options.restart === true))
     )
 
     Object.keys(helpers).forEach(key => {