Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 15 insertions, 3 deletions

diff --git a/devtools/client/shared/test-helpers/jest-fixtures/ChromeUtils.js b/devtools/client/shared/test-helpers/jest-fixtures/ChromeUtils.js
index 2fee8bc01c..d396777223 100644
--- a/devtools/client/shared/test-helpers/jest-fixtures/ChromeUtils.js
+++ b/devtools/client/shared/test-helpers/jest-fixtures/ChromeUtils.js
@@ -4,9 +4,21 @@
 
 "use strict";
 
+const mockedESM = {
+  BinarySearch: {
+    insertionIndexOf() {
+      return 0;
+    },
+  },
+};
+
 module.exports = {
   import: () => ({}),
   addProfilerMarker: () => {},
-  defineESModuleGetters: () => {},
+  defineESModuleGetters: (lazy, dict) => {
+    for (const key in dict) {
+      lazy[key] = mockedESM[key];
+    }
+  },
   importESModule: () => ({}),
 };
diff --git a/devtools/client/shared/test-helpers/jest-fixtures/Services.js b/devtools/client/shared/test-helpers/jest-fixtures/Services.js
index 85d0bce5e0..d6198c8d2d 100644
--- a/devtools/client/shared/test-helpers/jest-fixtures/Services.js
+++ b/devtools/client/shared/test-helpers/jest-fixtures/Services.js
@@ -541,9 +541,9 @@ const Services = {
   appinfo: "",
   obs: { addObserver: () => {} },
   strings: {
-    createBundle(bundle) {
+    createBundle() {
       return {
-        GetStringFromName(str) {
+        GetStringFromName() {
           return "NodeTest";
         },
       };