Merge branch 'develop' into chore/sentry-upgrade-8

.circleci/config.yml

@@ -227,9 +227,6 @@ workflows:
       - test-e2e-mmi-playwright - OPTIONAL:
           requires:
             - prep-build-test-mmi-playwright
-      - test-e2e-swap-playwright - OPTIONAL:
-          requires:
-            - prep-build
       - test-e2e-chrome-rpc-mmi:
           requires:
             - prep-build-test-mmi

.circleci/scripts/git-diff-develop.ts

@@ -86,7 +86,7 @@ async function storeGitDiffOutput() {
 
     // Store the output of git diff
     const outputPath = path.resolve(outputDir, 'changed-files.txt');
-    fs.writeFileSync(outputPath, diffOutput);
+    fs.writeFileSync(outputPath, diffOutput.trim());
 
     console.log(`Git diff results saved to ${outputPath}`);
     process.exit(0);

app/scripts/background.js

@@ -41,6 +41,7 @@ import { checkForLastErrorAndLog } from '../../shared/modules/browser-runtime.ut
 import { isManifestV3 } from '../../shared/modules/mv3.utils';
 import { maskObject } from '../../shared/modules/object.utils';
 import { FIXTURE_STATE_METADATA_VERSION } from '../../test/e2e/default-fixture';
+import { getSocketBackgroundToMocha } from '../../test/e2e/background-socket/socket-background-to-mocha';
 import {
   OffscreenCommunicationTarget,
   OffscreenCommunicationEvents,
@@ -401,6 +402,14 @@ async function initialize() {
 
     let isFirstMetaMaskControllerSetup;
 
+    // We only want to start this if we are running a test build, not for the release build.
+    // `navigator.webdriver` is true if Selenium, Puppeteer, or Playwright are running.
+    // In MV3, the Service Worker sees `navigator.webdriver` as `undefined`, so this will trigger from
+    // an Offscreen Document message instead. Because it's a singleton class, it's safe to start multiple times.
+    if (process.env.IN_TEST && window.navigator?.webdriver) {
+      getSocketBackgroundToMocha();
+    }
+
     if (isManifestV3) {
       // Save the timestamp immediately and then every `SAVE_TIMESTAMP_INTERVAL`
       // miliseconds. This keeps the service worker alive.

app/scripts/offscreen.js

@@ -1,5 +1,6 @@
 import { captureException } from '@sentry/browser';
 import { OffscreenCommunicationTarget } from '../../shared/constants/offscreen-communication';
+import { getSocketBackgroundToMocha } from '../../test/e2e/background-socket/socket-background-to-mocha';
 
 /**
  * Creates an offscreen document that can be used to load additional scripts
@@ -25,6 +26,12 @@ export async function createOffscreen() {
           offscreenDocumentLoadedListener,
         );
         resolve();
+
+        // If the Offscreen Document sees `navigator.webdriver === true` and we are in a test environment,
+        // start the SocketBackgroundToMocha.
+        if (process.env.IN_TEST && msg.webdriverPresent) {
+          getSocketBackgroundToMocha();
+        }
       }
     };
     chrome.runtime.onMessage.addListener(offscreenDocumentLoadedListener);

development/build/manifest.js

@@ -71,6 +71,7 @@ function createManifestTasks({
       ...manifest.permissions,
       'webRequestBlocking',
       'http://localhost/*',
+      'tabs', // test builds need tabs permission for switchToWindowWithTitle
     ];
   });
 
@@ -80,6 +81,7 @@ function createManifestTasks({
       ...manifest.permissions,
       'webRequestBlocking',
       'http://localhost/*',
+      'tabs', // test builds need tabs permission for switchToWindowWithTitle
     ];
   });