add back beforeunload

getgauge · May 24, 2024 · 0adb1d5 · 0adb1d5
1 parent 101d51d
commit 0adb1d5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/lib/connection.js b/lib/connection.js
@@ -126,13 +126,23 @@ const connect_to_cri = async (target, options = {}) => {
   return initCRI(tgt, numRetries, options);
 };
 
-const closeConnection = async () => {
+const closeConnection = async (promisesToBeResolvedBeforeCloseBrowser) => {
   if (_client) {
     // remove listeners other than JS dialog for beforeUnload on client first to stop executing them when closing
     await _client.removeAllListeners();
     pageHandler.addJavascriptDialogOpeningListener();
     if (!defaultConfig.firefox) {
       await pageHandler.closePage();
+
+      await new Promise((resolve) => {
+        let timeout = setTimeout(() => {
+          resolve();
+        }, defaultConfig.retryTimeout);
+        Promise.all(promisesToBeResolvedBeforeCloseBrowser).then(() => {
+          clearTimeout(timeout);
+          resolve();
+        });
+      });
     }
   }
   defaultConfig.connectedToRemoteBrowser ? await _client.Browser.close() : await closeBrowser();

diff --git a/lib/taiko.js b/lib/taiko.js
@@ -135,7 +135,7 @@ module.exports.closeBrowser = async () => {
 
 const _closeBrowser = async () => {
   fetchHandler.resetInterceptors();
-  await closeConnection();
+  await closeConnection(promisesToBeResolvedBeforeCloseBrowser);
 };
 
 /**
@@ -2223,11 +2223,7 @@ module.exports.confirm = (message, callback) => dialog('confirm', message, callb
  *
  * @param {function} callback - Action to perform. Accept/Dismiss.
  */
-module.exports.beforeunload = () => {
-  console.warn(
-    'beforeunload handler is not supported any more refer https://developer.chrome.com/docs/web-platform/deprecating-unload',
-  );
-};
+module.exports.beforeunload = (callback) => dialog('beforeunload', '', callback);
 
 /**
  * Evaluates script on element matching the given selector.
@@ -2520,8 +2516,18 @@ module.exports.getConfig = getConfig;
  */
 module.exports.setConfig = setConfig;
 
+const promisesToBeResolvedBeforeCloseBrowser = [];
+
 const dialog = (dialogType, dialogMessage, callback) => {
   validate();
+  let resolver = null;
+  if (dialogType === 'beforeunload') {
+    promisesToBeResolvedBeforeCloseBrowser.push(
+      new Promise((resolve) => {
+        resolver = resolve;
+      }),
+    );
+  }
   let eventName = '';
   if (isFunction(dialogMessage)) {
     eventName = dialogType;
@@ -2530,7 +2536,10 @@ const dialog = (dialogType, dialogMessage, callback) => {
     eventName = createJsDialogEvent(dialogMessage, dialogType);
     eventRegexMap.set(eventName, new RegExp(dialogMessage));
   }
-  return eventHandler.once(eventName, callback);
+  return eventHandler.once(eventName, async (args) => {
+    await callback(args);
+    resolver && resolver();
+  });
 };
 
 const createJsDialogEvent = (message, dType) => {

diff --git a/test/unit-tests/beforeunload.test.js b/test/unit-tests/beforeunload.test.js
@@ -16,9 +16,7 @@ let {
 let { createHtml, removeFile, openBrowserArgs } = require('./test-util');
 const test_name = 'beforeunload';
 
-// TODO: Skip this test and remove the unload functionality
-// Refer:https://developer.chrome.com/docs/web-platform/deprecating-unload
-xdescribe(test_name, () => {
+describe(test_name, () => {
   let filePath, filePath1;
   let called = false;
   before(async () => {