Merging upstream version 127.0.

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

2 files changed, 38 insertions, 5 deletions

diff --git a/toolkit/components/search/tests/xpcshell/searchconfigs/test_ebay.js b/toolkit/components/search/tests/xpcshell/searchconfigs/test_ebay.js
index ed8e5147ee..8162fffae8 100644
--- a/toolkit/components/search/tests/xpcshell/searchconfigs/test_ebay.js
+++ b/toolkit/components/search/tests/xpcshell/searchconfigs/test_ebay.js
@@ -56,6 +56,9 @@ const test = new SearchConfigTest({
         ],
       },
       {
+        regions: ["pl"],
+      },
+      {
         regions: ["au", "be", "ca", "ch", "gb", "ie", "nl", "us"],
         locales: ["en-US"],
       },
@@ -79,6 +82,7 @@ const test = new SearchConfigTest({
           locales: ["br", "unknown", "en-US", "fr", "fy-NL", "nl", "wo"],
         },
       ],
+      excluded: [{ regions: ["pl"] }],
       searchUrlCode: "mkrid=1553-53471-19255-0",
       suggestUrlCode: "sId=23",
     },
@@ -91,6 +95,7 @@ const test = new SearchConfigTest({
           locales: ["de", "dsb", "hsb"],
         },
       ],
+      excluded: [{ regions: ["pl"] }],
       searchUrlCode: "mkrid=5221-53469-19255-0",
       suggestUrlCode: "sId=16",
     },
@@ -117,6 +122,9 @@ const test = new SearchConfigTest({
             ...DOMAIN_LOCALES["ebay-uk"],
           ],
         },
+        {
+          regions: ["pl"],
+        },
       ],
       searchUrlCode: "mkrid=706-53473-19255-0",
       suggestUrlCode: "sId=2",
@@ -143,6 +151,9 @@ const test = new SearchConfigTest({
             ...DOMAIN_LOCALES["ebay-uk"],
           ],
         },
+        {
+          regions: ["pl"],
+        },
       ],
       searchUrlCode: "mkrid=5222-53480-19255-0",
       suggestUrlCode: "sId=193",
@@ -155,7 +166,7 @@ const test = new SearchConfigTest({
           locales: ["unknown", "en-US"],
         },
       ],
-      excluded: [{ regions: ["au", "be", "ca", "ch", "gb", "ie", "nl"] }],
+      excluded: [{ regions: ["au", "be", "ca", "ch", "gb", "ie", "nl", "pl"] }],
       searchUrlCode: "mkrid=711-53200-19255-0",
       suggestUrlCode: "sId=0",
     },
@@ -168,6 +179,7 @@ const test = new SearchConfigTest({
           locales: ["cy", "unknown", "en-GB", "en-US", "gd"],
         },
       ],
+      excluded: [{ regions: ["pl"] }],
       searchUrlCode: "mkrid=705-53470-19255-0",
       suggestUrlCode: "sId=15",
     },
@@ -183,6 +195,7 @@ const test = new SearchConfigTest({
           locales: ["cy", "unknown", "en-GB", "en-US", "gd"],
         },
       ],
+      excluded: [{ regions: ["pl"] }],
       searchUrlCode: "mkrid=5282-53468-19255-0",
       suggestUrlCode: "sId=205",
     },
@@ -198,7 +211,7 @@ const test = new SearchConfigTest({
           regions: ["gb"],
         },
       ],
-      excluded: [{ regions: ["au", "ie"] }],
+      excluded: [{ regions: ["au", "ie", "pl"] }],
       searchUrlCode: "mkrid=710-53481-19255-0",
       suggestUrlCode: "sId=3",
     },
@@ -210,7 +223,7 @@ const test = new SearchConfigTest({
           locales: DOMAIN_LOCALES["ebay-de"],
         },
       ],
-      excluded: [{ regions: ["at", "ch"] }],
+      excluded: [{ regions: ["at", "ch", "pl"] }],
       searchUrlCode: "mkrid=707-53477-19255-0",
       suggestUrlCode: "sId=77",
     },
@@ -222,6 +235,7 @@ const test = new SearchConfigTest({
           locales: DOMAIN_LOCALES["ebay-es"],
         },
       ],
+      excluded: [{ regions: ["pl"] }],
       searchUrlCode: "mkrid=1185-53479-19255-0",
       suggestUrlCode: "sId=186",
     },
@@ -233,7 +247,7 @@ const test = new SearchConfigTest({
           locales: ["br", "fr", "wo"],
         },
       ],
-      excluded: [{ regions: ["be", "ca", "ch"] }],
+      excluded: [{ regions: ["be", "ca", "ch", "pl"] }],
       searchUrlCode: "mkrid=709-53476-19255-0",
       suggestUrlCode: "sId=71",
     },
@@ -245,6 +259,7 @@ const test = new SearchConfigTest({
           locales: DOMAIN_LOCALES["ebay-it"],
         },
       ],
+      excluded: [{ regions: ["pl"] }],
       searchUrlCode: "mkrid=724-53478-19255-0",
       suggestUrlCode: "sId=101",
     },
@@ -260,10 +275,21 @@ const test = new SearchConfigTest({
           regions: ["nl"],
         },
       ],
-      excluded: [{ regions: ["be"] }],
+      excluded: [{ regions: ["be", "pl"] }],
       searchUrlCode: "mkrid=1346-53482-19255-0",
       suggestUrlCode: "sId=146",
     },
+    {
+      domain: "www.ebay.pl",
+      telemetryId: "ebay-pl",
+      included: [
+        {
+          regions: ["pl"],
+        },
+      ],
+      searchUrlCode: "mkrid=4908-226936-19255-0",
+      suggestUrlCode: "sId=212",
+    },
   ],
 });
 
diff --git a/toolkit/components/search/tests/xpcshell/searchconfigs/xpcshell.toml b/toolkit/components/search/tests/xpcshell/searchconfigs/xpcshell.toml
index 07567005d6..3bd896173c 100644
--- a/toolkit/components/search/tests/xpcshell/searchconfigs/xpcshell.toml
+++ b/toolkit/components/search/tests/xpcshell/searchconfigs/xpcshell.toml
@@ -28,7 +28,14 @@ requesttimeoutfactor = 2
 
 ["test_duckduckgo.js"]
 
+# The test_ebay needs newSearchConfig.enabled=true because there
+# are changes to ebay and locale pl for search-config-v2.
+# We have rolled out search-config-v2 100% to Beta 126 and the next Beta 127
+# will pick up newSearchConfig.enabled=true from Nimbus Settings but not
+# immediately, we need to turn the PREF on for this test to prevent failures
+# in the merge from central to Beta 127.
 ["test_ebay.js"]
+prefs = ["browser.search.newSearchConfig.enabled=true"]
 
 ["test_ecosia.js"]