From a734b2da97c32c752cba9ee75708d776d27e1655 Mon Sep 17 00:00:00 2001
From: Eemeli Aro <eemeli@mozilla.com>
Date: Tue, 10 Sep 2024 19:03:18 +0000
Subject: [PATCH] Bug 1889417 - Fix minor Fluent bugs in various tests.
 r=fluent-reviewers,credential-management-reviewers,fxview-reviewers,places-reviewers,omc-reviewers,backup-reviewers,urlbar-reviewers,dimi,Standard8,nsharpley,mconley,flod,emcminn

Issues revealed by adding a `MOZ_ASSERT(false)` in Fluent error reporting and trawling through the resulting logs.

Differential Revision: https://phabricator.services.mozilla.com/D221421
---
 .../tests/browser/browser_aboutwelcome_mobile_downloads.js  | 4 +---
 .../backup/tests/chrome/test_disable_backup_encryption.html | 2 ++
 .../backup/tests/chrome/test_enable_backup_encryption.html  | 2 ++
 .../backup/tests/chrome/test_restore_from_backup.html       | 2 ++
 .../tests/chrome/test_turn_off_scheduled_backups.html       | 2 ++
 .../firefoxview/tests/chrome/test_card_container.html       | 1 +
 .../firefoxview/tests/chrome/test_fxview_tab_list.html      | 2 ++
 .../browser/browser_acknowledgeFeedbackAndDismissal.js      | 4 ++--
 .../formautofill/test/browser/browser_editAddressDialog.js  | 2 +-
 .../mochitest/chrome/file_first_focusable_in_scope.xhtml    | 6 +++++-
 netwerk/test/unit/xpcshell.toml                             | 5 +++--
 toolkit/components/places/tests/favicons/xpcshell.toml      | 1 +
 .../content/tests/chrome/test_mozinputbox_dictionary.xhtml  | 4 ++++
 13 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_mobile_downloads.js b/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_mobile_downloads.js
index bb94d575fe74..6450c57555ae 100644
--- a/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_mobile_downloads.js
+++ b/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_mobile_downloads.js
@@ -11,9 +11,7 @@ const BASE_CONTENT = {
           alt_text: "Test alt",
         },
         email: {
-          link_text: {
-            string_id: "spotlight-focus-promo-email-link",
-          },
+          link_text: "Email yourself a link",
         },
         marketplace_buttons: ["ios", "android"],
       },
diff --git a/browser/components/backup/tests/chrome/test_disable_backup_encryption.html b/browser/components/backup/tests/chrome/test_disable_backup_encryption.html
index 184fed2e12b5..8bbed1a79ce3 100644
--- a/browser/components/backup/tests/chrome/test_disable_backup_encryption.html
+++ b/browser/components/backup/tests/chrome/test_disable_backup_encryption.html
@@ -9,6 +9,8 @@
   src="chrome://browser/content/backup/disable-backup-encryption.mjs"
   type="module"
 ></script>
+  <link rel="localization" href="preview/backupSettings.ftl"/>
+  <link rel="localization" href="branding/brand.ftl"/>
   <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script>
 
diff --git a/browser/components/backup/tests/chrome/test_enable_backup_encryption.html b/browser/components/backup/tests/chrome/test_enable_backup_encryption.html
index 919f56a63e33..fdfa02f88fb8 100644
--- a/browser/components/backup/tests/chrome/test_enable_backup_encryption.html
+++ b/browser/components/backup/tests/chrome/test_enable_backup_encryption.html
@@ -10,6 +10,8 @@
   src="chrome://browser/content/backup/enable-backup-encryption.mjs"
   type="module"
 ></script>
+  <link rel="localization" href="preview/backupSettings.ftl"/>
+  <link rel="localization" href="branding/brand.ftl"/>
   <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script>
 
diff --git a/browser/components/backup/tests/chrome/test_restore_from_backup.html b/browser/components/backup/tests/chrome/test_restore_from_backup.html
index f0432d9db20b..9fc1a2c89b33 100644
--- a/browser/components/backup/tests/chrome/test_restore_from_backup.html
+++ b/browser/components/backup/tests/chrome/test_restore_from_backup.html
@@ -9,6 +9,8 @@
   src="chrome://browser/content/backup/restore-from-backup.mjs"
   type="module"
   ></script>
+  <link rel="localization" href="preview/backupSettings.ftl"/>
+  <link rel="localization" href="branding/brand.ftl"/>
   <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script>
 
diff --git a/browser/components/backup/tests/chrome/test_turn_off_scheduled_backups.html b/browser/components/backup/tests/chrome/test_turn_off_scheduled_backups.html
index 266fc46dceb3..cc2e11dbd0b7 100644
--- a/browser/components/backup/tests/chrome/test_turn_off_scheduled_backups.html
+++ b/browser/components/backup/tests/chrome/test_turn_off_scheduled_backups.html
@@ -9,6 +9,8 @@
   src="chrome://browser/content/backup/turn-off-scheduled-backups.mjs"
   type="module"
 ></script>
+  <link rel="localization" href="preview/backupSettings.ftl"/>
+  <link rel="localization" href="branding/brand.ftl"/>
   <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script>
 
diff --git a/browser/components/firefoxview/tests/chrome/test_card_container.html b/browser/components/firefoxview/tests/chrome/test_card_container.html
index c54a70faaf1c..f8a7987fbcce 100644
--- a/browser/components/firefoxview/tests/chrome/test_card_container.html
+++ b/browser/components/firefoxview/tests/chrome/test_card_container.html
@@ -7,6 +7,7 @@
   <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
+  <link rel="localization" href="browser/preferences/preferences.ftl"/>
   <link rel="localization" href="browser/firefoxView.ftl"/>
   <script type="module" src="chrome://browser/content/firefoxview/card-container.mjs"></script>
 </head>
diff --git a/browser/components/firefoxview/tests/chrome/test_fxview_tab_list.html b/browser/components/firefoxview/tests/chrome/test_fxview_tab_list.html
index abea8725eeb1..d517b9bc2001 100644
--- a/browser/components/firefoxview/tests/chrome/test_fxview_tab_list.html
+++ b/browser/components/firefoxview/tests/chrome/test_fxview_tab_list.html
@@ -5,6 +5,8 @@
   <title>FxviewTabList Tests</title>
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="localization" href="browser/firefoxView.ftl">
+  <link rel="localization" href="browser/fxviewTabList.ftl">
   <link rel="localization" href="browser/places.ftl">
   <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
diff --git a/browser/components/urlbar/tests/browser/browser_acknowledgeFeedbackAndDismissal.js b/browser/components/urlbar/tests/browser/browser_acknowledgeFeedbackAndDismissal.js
index 1a484332099a..0a3e3366772f 100644
--- a/browser/components/urlbar/tests/browser/browser_acknowledgeFeedbackAndDismissal.js
+++ b/browser/components/urlbar/tests/browser/browser_acknowledgeFeedbackAndDismissal.js
@@ -377,13 +377,13 @@ class TestProvider extends UrlbarTestUtils.TestProvider {
       {
         name: DISMISS_ONE_COMMAND,
         l10n: {
-          id: "firefox-suggest-weather-command-not-interested",
+          id: "firefox-suggest-command-not-interested",
         },
       },
       {
         name: DISMISS_ALL_COMMAND,
         l10n: {
-          id: "firefox-suggest-weather-command-not-interested",
+          id: "firefox-suggest-command-not-interested",
         },
       },
     ];
diff --git a/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js b/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js
index 4eef67f36a3a..07e371334be0 100644
--- a/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js
+++ b/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js
@@ -440,7 +440,7 @@ add_task(async function test_countryAndStateFieldLabels() {
     for (let countryOption of doc.querySelector("#country").options) {
       // Clear L10N textContent to not leave leftovers between country tests
       for (const labelEl of doc.querySelectorAll(".label-text")) {
-        doc.l10n.setAttributes(labelEl, "");
+        delete labelEl.dataset["l10n-id"];
         labelEl.textContent = "";
       }
 
diff --git a/dom/tests/mochitest/chrome/file_first_focusable_in_scope.xhtml b/dom/tests/mochitest/chrome/file_first_focusable_in_scope.xhtml
index 7d7cd2f5ee8b..ab90230eaa59 100644
--- a/dom/tests/mochitest/chrome/file_first_focusable_in_scope.xhtml
+++ b/dom/tests/mochitest/chrome/file_first_focusable_in_scope.xhtml
@@ -2,8 +2,12 @@
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
 
 <window onload="start()"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml">
 
+<linkset>
+  <html:link rel="localization" href="browser/places.ftl"/>
+</linkset>
 <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
 
 <hbox id="sidebar-search-container" align="center">
diff --git a/netwerk/test/unit/xpcshell.toml b/netwerk/test/unit/xpcshell.toml
index fe0fffe5c2ce..eb5af8b19434 100644
--- a/netwerk/test/unit/xpcshell.toml
+++ b/netwerk/test/unit/xpcshell.toml
@@ -315,11 +315,11 @@ skip-if = [
   "os != 'android'",
 ]
 
-["test_bug1913022.js"]
-
 ["test_bug1889130.js"]
 skip-if = ["os == 'win'"] # skip because 0.0.0.0 is invalid in windows platform
 
+["test_bug1913022.js"]
+
 ["test_cache-control_request.js"]
 
 ["test_cache-entry-id.js"]
@@ -619,6 +619,7 @@ run-sequentially = "node server exceptions dont replay well"
 ["test_hpke_config_manager.js"]
 
 ["test_hpke_out_of_process.js"]
+firefox-appdir = "browser"
 skip-if = ["os == 'android'"] # Bug 1904406
 
 ["test_http1-proxy.js"]
diff --git a/toolkit/components/places/tests/favicons/xpcshell.toml b/toolkit/components/places/tests/favicons/xpcshell.toml
index 7a4e86a49681..1a9eecdac04e 100644
--- a/toolkit/components/places/tests/favicons/xpcshell.toml
+++ b/toolkit/components/places/tests/favicons/xpcshell.toml
@@ -54,6 +54,7 @@ support-files = [
 ["test_multiple_frames.js"]
 
 ["test_page-icon_protocol.js"]
+firefox-appdir = "browser"
 prefs = ["dom.security.https_first=false"]
 
 ["test_query_result_favicon_changed_on_child.js"]
diff --git a/toolkit/content/tests/chrome/test_mozinputbox_dictionary.xhtml b/toolkit/content/tests/chrome/test_mozinputbox_dictionary.xhtml
index c2ed8a4787c2..8cdbd3f85e9a 100644
--- a/toolkit/content/tests/chrome/test_mozinputbox_dictionary.xhtml
+++ b/toolkit/content/tests/chrome/test_mozinputbox_dictionary.xhtml
@@ -7,6 +7,10 @@
 <window title="Textbox Add and Undo Add to Dictionary Test" width="500" height="600"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
+  <linkset>
+    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
+  </linkset>
+
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>