Adding upstream version 125.0.1.upstream/125.0.1

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

1 files changed, 16 insertions, 6 deletions

diff --git a/toolkit/components/search/tests/xpcshell/test_webextensions_install.js b/toolkit/components/search/tests/xpcshell/test_webextensions_install.js
index 6183d6f95a..a05218824a 100644
--- a/toolkit/components/search/tests/xpcshell/test_webextensions_install.js
+++ b/toolkit/components/search/tests/xpcshell/test_webextensions_install.js
@@ -80,7 +80,9 @@ add_task(async function test_install_duplicate_engine() {
   let submission = engine.getSubmission("foo");
   Assert.equal(
     submission.uri.spec,
-    "https://duckduckgo.com/?q=foo&t=ffsb",
+    SearchUtils.newSearchConfigEnabled
+      ? "https://duckduckgo.com/?t=ffsb&q=foo"
+      : "https://duckduckgo.com/?q=foo&t=ffsb",
     "Should have not changed the app provided engine."
   );
 
@@ -127,7 +129,7 @@ add_task(
 
     let engine = await Services.search.getEngineByName("Multilocale AN");
     Assert.ok(
-      engine.getIconURL().endsWith("favicon-an.ico"),
+      (await engine.getIconURL()).endsWith("favicon-an.ico"),
       "Should have the correct favicon for an extension of one locale using a different locale."
     );
     Assert.equal(
@@ -156,7 +158,11 @@ add_task(async function test_load_favicon_invalid() {
   await observed;
 
   let engine = await Services.search.getEngineByName("Example");
-  Assert.equal(null, engine.getIconURL(), "Should not have set an iconURI");
+  Assert.equal(
+    null,
+    await engine.getIconURL(),
+    "Should not have set an iconURI"
+  );
 
   // User uninstalls their engine
   await extension.awaitStartup();
@@ -182,7 +188,11 @@ add_task(async function test_load_favicon_invalid_redirect() {
   await observed;
 
   let engine = await Services.search.getEngineByName("Example");
-  Assert.equal(null, engine.getIconURL(), "Should not have set an iconURI");
+  Assert.equal(
+    null,
+    await engine.getIconURL(),
+    "Should not have set an iconURI"
+  );
 
   // User uninstalls their engine
   await extension.awaitStartup();
@@ -208,9 +218,9 @@ add_task(async function test_load_favicon_redirect() {
 
   await promiseEngineChanged;
 
-  Assert.ok(engine.getIconURL(), "Should have set an iconURI");
+  Assert.ok(await engine.getIconURL(), "Should have set an iconURI");
   Assert.ok(
-    engine.getIconURL().startsWith("data:image/x-icon;base64,"),
+    (await engine.getIconURL()).startsWith("data:image/x-icon;base64,"),
     "Should have saved the expected content type for the icon"
   );