test: Support window switching without mocha server

Our E2E driver class now allows the methods `switchWindow` and
`switchToWindowWithTitle` methods to be used in tests that have the
Mocha background server disabled (such as those that use a production
build, or those that involve the extension resetting).

Previously the `switchToWindowWithTitleWithoutSocket` driver method
served this purpose, but the test author had to know to use this
alternative method. Plus it didn't allow switching to a window handle,
or any of the other switch methods that internally use `switchWindow`.

There are a couple of switch methods still not supported, but in these
cases an error will be thrown so that the failure reason will be clear.

This unblocks #31435

Author: Gudahtt

test/e2e/helpers.js

@@ -273,7 +273,10 @@ async function withFixtures(options, testSuite) {
 
     await setManifestFlags(manifestFlags);
 
-    const wd = await buildWebDriver(driverOptions);
+    const wd = await buildWebDriver({
+      ...driverOptions,
+      disableServerMochaToBackground,
+    });
     driver = wd.driver;
     extensionId = wd.extensionId;
     webDriver = driver.driver;

test/e2e/tests/update-modal/update-modal.spec.ts

@@ -100,9 +100,7 @@ describe('Update modal', function (this: Suite) {
         const updateModal = new UpdateModal(driver);
         await updateModal.check_pageIsLoaded();
         await updateModal.confirm();
-        await driver.switchToWindowByTitleWithoutSocket(
-          WINDOW_TITLES.ExtensionUpdating,
-        );
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionUpdating);
       },
     );
   });

test/e2e/vault-decryption-chrome.spec.ts

@@ -169,10 +169,8 @@ describe('Vault Decryptor Page', function () {
       },
       async ({ driver }) => {
         // we don't need to use navigate since MM will automatically open a new window in prod build
-        await driver.waitUntilXWindowHandles(2);
-
-        // we cannot use the customized driver functions as there is no socket for window communications in prod builds
-        await driver.switchToWindowByTitleWithoutSocket(
+        await driver.waitAndSwitchToWindowWithTitle(
+          2,
           WINDOW_TITLES.ExtensionInFullScreenView,
         );
 
@@ -229,10 +227,9 @@ describe('Vault Decryptor Page', function () {
       },
       async ({ driver }) => {
         // we don't need to use navigate since MM will automatically open a new window in prod build
-        await driver.waitUntilXWindowHandles(2);
 
-        // we cannot use the customized driver functions as there is no socket for window communications in prod builds
-        await driver.switchToWindowByTitleWithoutSocket(
+        await driver.waitAndSwitchToWindowWithTitle(
+          2,
           WINDOW_TITLES.ExtensionInFullScreenView,
         );
 

test/e2e/webdriver/driver.js

@@ -12,6 +12,7 @@ const {
 const cssToXPath = require('css-to-xpath');
 const { sprintf } = require('sprintf-js');
 const lodash = require('lodash');
+const { retry } = require('../../../development/lib/retry');
 const { quoteXPathText } = require('../../helpers/quoteXPathText');
 const { isManifestV3 } = require('../../../shared/modules/mv3.utils');
 const { WindowHandles } = require('../background-socket/window-handles');
@@ -118,27 +119,46 @@ until.foundElementCountIs = function foundElementCountIs(locator, n) {
   });
 };
 
+/**
+ * Error messages used by driver methods.
+ */
+const errorMessages = {
+  waitUntilXWindowHandlesTimeout:
+    'waitUntilXWindowHandles timed out polling window handles',
+};
+
 /**
  * This is MetaMask's custom E2E test driver, wrapping the Selenium WebDriver.
  * For Selenium WebDriver API documentation, see:
  * https://www.selenium.dev/selenium/docs/api/javascript/module/selenium-webdriver/index_exports_WebDriver.html
  */
 class Driver {
   /**
-   * @param {!ThenableWebDriver} driver - A {@code WebDriver} instance
-   * @param {string} browser - The type of browser this driver is controlling
-   * @param {string} extensionUrl
-   * @param {number} timeout - Defaults to 10000 milliseconds (10 seconds)
+   * @param {object} args - Constructor arguments.
+   * @param {!ThenableWebDriver} args.driver - A {@code WebDriver} instance
+   * @param {string} args.browser - The type of browser this driver is controlling
+   * @param {string} args.extensionUrl
+   * @param {number} args.timeout - Defaults to 10000 milliseconds (10 seconds)
+   * @param {boolean} args.disableServerMochaToBackground - Determines whether the background mocha
+   * server is used.
    */
-  constructor(driver, browser, extensionUrl, timeout = 10 * 1000) {
+  constructor({
+    driver,
+    browser,
+    extensionUrl,
+    timeout = 10 * 1000,
+    disableServerMochaToBackground,
+  }) {
     this.driver = driver;
     this.browser = browser;
     this.extensionUrl = extensionUrl;
     this.timeout = timeout;
     this.exceptions = [];
     this.errors = [];
     this.eventProcessingStack = [];
-    this.windowHandles = new WindowHandles(this.driver);
+    this.windowHandles = disableServerMochaToBackground
+      ? null
+      : new WindowHandles(this.driver);
 
     // The following values are found in
     // https://github.com/SeleniumHQ/selenium/blob/trunk/javascript/node/selenium-webdriver/lib/input.js#L50-L110
@@ -1053,7 +1073,9 @@ class Driver {
    */
   async switchToWindow(handle) {
     await this.driver.switchTo().window(handle);
-    await this.windowHandles.getCurrentWindowProperties(null, handle);
+    if (this.windowHandles) {
+      await this.windowHandles.getCurrentWindowProperties(null, handle);
+    }
   }
 
   /**
@@ -1082,7 +1104,10 @@ class Driver {
    *     be resolved with an array of window handles.
    */
   async getAllWindowHandles() {
-    return await this.windowHandles.getAllWindowHandles();
+    if (this.windowHandles) {
+      return await this.windowHandles.getAllWindowHandles();
+    }
+    return await this.driver.getAllWindowHandles();
   }
 
   /**
@@ -1153,7 +1178,7 @@ class Driver {
     }
 
     throw new Error(
-      `waitUntilXWindowHandles timed out polling window handles. Expected: ${x}, Actual: ${windowHandles.length}`,
+      `${errorMessages.waitUntilXWindowHandlesTimeout}. Expected: ${x}, Actual: ${windowHandles.length}`,
     );
   }
 
@@ -1193,7 +1218,42 @@ class Driver {
    * @throws {Error} throws an error if no window with the specified title is found
    */
   async switchToWindowWithTitle(title) {
-    return await this.windowHandles.switchToWindowWithProperty('title', title);
+    if (this.windowHandles) {
+      return await this.windowHandles.switchToWindowWithProperty(
+        'title',
+        title,
+      );
+    }
+
+    let windowHandles = await this.driver.getAllWindowHandles();
+    let timeElapsed = 0;
+
+    while (timeElapsed <= this.timeout) {
+      for (const handle of windowHandles) {
+        // Wait 25 x 200ms = 5 seconds for the title to match the target title
+        const handleTitle = await retry(
+          {
+            retries: 25,
+            delay: 200,
+          },
+          async () => {
+            await this.driver.switchTo().window(handle);
+            return await this.driver.getTitle();
+          },
+        );
+
+        if (handleTitle === title) {
+          return handle;
+        }
+      }
+      const delayTime = 1000;
+      await this.delay(delayTime);
+      timeElapsed += delayTime;
+      // refresh the window handles
+      windowHandles = await this.driver.getAllWindowHandles();
+    }
+
+    throw new Error(`No window with title: ${title}`);
   }
 
   /**
@@ -1217,6 +1277,11 @@ class Driver {
    * @throws {Error} throws an error if no window with the specified URL is found
    */
   async switchToWindowWithUrl(url) {
+    if (!this.windowHandles) {
+      throw new Error(
+        'This is only supported when the Mocha background server is enabled',
+      );
+    }
     return await this.windowHandles.switchToWindowWithProperty(
       'url',
       new URL(url).toString(), // Make sure the URL has a trailing slash
@@ -1233,6 +1298,11 @@ class Driver {
    * @throws {Error} throws an error if no window with the specified URL is found
    */
   async switchToWindowIfKnown(title) {
+    if (!this.windowHandles) {
+      throw new Error(
+        'This is only supported when the Mocha background server is enabled',
+      );
+    }
     return await this.windowHandles.switchToWindowIfKnown(title);
   }
 
@@ -1334,46 +1404,6 @@ class Driver {
     }
   }
 
-  /**
-   * Switches to a window by its title without using the background socket.
-   * To be used in specs that run against production builds.
-   *
-   * @param {string} title - The target window title to switch to
-   * @returns {Promise<void>}
-   * @throws {Error} Will throw an error if the target window is not found
-   */
-  async switchToWindowByTitleWithoutSocket(title) {
-    const windowHandles = await this.driver.getAllWindowHandles();
-    let targetWindowFound = false;
-
-    // Iterate through each window handle
-    for (const handle of windowHandles) {
-      await this.driver.switchTo().window(handle);
-      let currentTitle = await this.driver.getTitle();
-
-      // Wait 25 x 200ms = 5 seconds for the title to match the target title
-      for (let i = 0; i < 25; i++) {
-        if (currentTitle === title) {
-          targetWindowFound = true;
-          console.log(`Switched to ${title} window`);
-          break;
-        }
-        await this.driver.sleep(200);
-        currentTitle = await this.driver.getTitle();
-      }
-
-      // If the target window is found, break out of the outer loop
-      if (targetWindowFound) {
-        break;
-      }
-    }
-
-    // If target window is not found, throw an error
-    if (!targetWindowFound) {
-      throw new Error(`${title} window not found`);
-    }
-  }
-
   // Error handling
 
   async verboseReportOnFailure(testTitle, error) {
@@ -1625,4 +1655,4 @@ function sanitizeTestTitle(testTitle) {
     .replace(/^-+|-+$/gu, ''); // Trim leading/trailing dashes
 }
 
-module.exports = { Driver, PAGES };
+module.exports = { Driver, PAGES, errorMessages };

test/e2e/webdriver/index.js

@@ -10,6 +10,7 @@ async function buildWebDriver({
   port,
   timeOut,
   proxyPort,
+  disableServerMochaToBackground,
 } = {}) {
   const browser = process.env.SELENIUM_BROWSER;
 
@@ -24,7 +25,13 @@ async function buildWebDriver({
     constrainWindowSize,
     proxyPort,
   });
-  const driver = new Driver(seleniumDriver, browser, extensionUrl, timeOut);
+  const driver = new Driver({
+    seleniumDriver,
+    browser,
+    extensionUrl,
+    timeOut,
+    disableServerMochaToBackground,
+  });
 
   return {
     driver,