Bug 1863869 Add default preferences alwaysTranslateLanguages, neverTr…

…anslateLanguages, and permissionsUrls in loadTestPage. r=nordzilla,translations-reviewers Differential Revision: https://phabricator.services.mozilla.com/D193206
dothq · Nov 15, 2023 · 0a9c3af · 0a9c3af
1 parent 69e2bc0
commit 0a9c3af
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 34 deletions.
diff --git a/...sts/browser/browser_translations_about_preferences_settings_always_translate_languages.js b/...sts/browser/browser_translations_about_preferences_settings_always_translate_languages.js
@@ -8,9 +8,7 @@ add_task(
     const {
       cleanup,
       elements: { settingsButton },
-    } = await setupAboutPreferences(LANGUAGE_PAIRS, {
-      prefs: [["browser.translations.alwaysTranslateLanguages", ""]],
-    });
+    } = await setupAboutPreferences(LANGUAGE_PAIRS);
 
     info("Ensuring the list of always-translate languages is empty");
     is(

diff --git a/...ests/browser/browser_translations_about_preferences_settings_never_translate_languages.js b/...ests/browser/browser_translations_about_preferences_settings_never_translate_languages.js
@@ -8,9 +8,7 @@ add_task(
     const {
       cleanup,
       elements: { settingsButton },
-    } = await setupAboutPreferences(LANGUAGE_PAIRS, {
-      prefs: [["browser.translations.neverTranslateLanguages", ""]],
-    });
+    } = await setupAboutPreferences(LANGUAGE_PAIRS);
 
     info("Ensuring the list of never-translate languages is empty");
     is(

diff --git a/.../translations/tests/browser/browser_translations_panel_always_translate_language_basic.js b/.../translations/tests/browser/browser_translations_panel_always_translate_language_basic.js
@@ -12,7 +12,6 @@ add_task(async function test_toggle_always_translate_language_menuitem() {
   const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
     page: SPANISH_PAGE_URL,
     languagePairs: LANGUAGE_PAIRS,
-    prefs: [["browser.translations.alwaysTranslateLanguages", "pl,fr"]],
   });
 
   await assertTranslationsButton(

diff --git a/...translations/tests/browser/browser_translations_panel_always_translate_language_manual.js b/...translations/tests/browser/browser_translations_panel_always_translate_language_manual.js
@@ -13,7 +13,6 @@ add_task(
     const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
       page: SPANISH_PAGE_URL,
       languagePairs: LANGUAGE_PAIRS,
-      prefs: [["browser.translations.alwaysTranslateLanguages", "pl,fr"]],
     });
 
     await assertTranslationsButton(

diff --git a/...ranslations/tests/browser/browser_translations_panel_always_translate_language_restore.js b/...ranslations/tests/browser/browser_translations_panel_always_translate_language_restore.js
@@ -13,7 +13,6 @@ add_task(
     const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
       page: SPANISH_PAGE_URL,
       languagePairs: LANGUAGE_PAIRS,
-      prefs: [["browser.translations.alwaysTranslateLanguages", "pl,fr"]],
     });
 
     await assertTranslationsButton(

diff --git a/...ts/translations/tests/browser/browser_translations_panel_app_menu_never_translate_site.js b/...ts/translations/tests/browser/browser_translations_panel_app_menu_never_translate_site.js
@@ -12,7 +12,6 @@ add_task(async function test_uncheck_never_translate_site_shows_button() {
   const { cleanup, runInPage } = await loadTestPage({
     page: SPANISH_PAGE_URL,
     languagePairs: LANGUAGE_PAIRS,
-    permissionsUrls: [SPANISH_PAGE_URL],
   });
 
   await assertPageIsUntranslated(runInPage);
@@ -53,7 +52,6 @@ add_task(
     const { cleanup, runInPage, resolveDownloads } = await loadTestPage({
       page: BLANK_PAGE,
       languagePairs: LANGUAGE_PAIRS,
-      permissionsUrls: [SPANISH_PAGE_URL],
       prefs: [["browser.translations.alwaysTranslateLanguages", "es"]],
     });
 

diff --git a/...onents/translations/tests/browser/browser_translations_panel_auto_translate_error_view.js b/...onents/translations/tests/browser/browser_translations_panel_auto_translate_error_view.js
@@ -27,7 +27,6 @@ add_task(
           { fromLang: "en", toLang: "es" },
           { fromLang: "es", toLang: "en" },
         ],
-        prefs: [["browser.translations.alwaysTranslateLanguages", ""]],
       });
 
     await assertTranslationsButton(

diff --git a/...ents/translations/tests/browser/browser_translations_panel_auto_translate_revisit_view.js b/...ents/translations/tests/browser/browser_translations_panel_auto_translate_revisit_view.js
@@ -22,7 +22,6 @@ add_task(
         { fromLang: "en", toLang: "es" },
         { fromLang: "es", toLang: "en" },
       ],
-      prefs: [["browser.translations.alwaysTranslateLanguages", ""]],
     });
 
     await assertTranslationsButton(

diff --git a/...ponents/translations/tests/browser/browser_translations_panel_never_translate_language.js b/...ponents/translations/tests/browser/browser_translations_panel_never_translate_language.js
@@ -12,7 +12,6 @@ add_task(async function test_toggle_never_translate_language_menuitem() {
   const { cleanup, runInPage } = await loadTestPage({
     page: SPANISH_PAGE_URL,
     languagePairs: LANGUAGE_PAIRS,
-    prefs: [["browser.translations.neverTranslateLanguages", "pl,fr"]],
   });
 
   await assertTranslationsButton(
@@ -55,7 +54,6 @@ add_task(
     const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
       page: SPANISH_PAGE_URL,
       languagePairs: LANGUAGE_PAIRS,
-      prefs: [["browser.translations.neverTranslateLanguages", "pl,fr"]],
     });
 
     await assertTranslationsButton(
@@ -102,10 +100,6 @@ add_task(
     const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
       page: SPANISH_PAGE_URL,
       languagePairs: LANGUAGE_PAIRS,
-      prefs: [
-        ["browser.translations.alwaysTranslateLanguages", "uk,it"],
-        ["browser.translations.neverTranslateLanguages", "pl,fr"],
-      ],
     });
 
     await assertTranslationsButton(

diff --git a/.../components/translations/tests/browser/browser_translations_panel_never_translate_site.js b/.../components/translations/tests/browser/browser_translations_panel_never_translate_site.js
@@ -13,7 +13,6 @@ add_task(async function test_toggle_never_translate_site_menuitem() {
   const { cleanup, runInPage } = await loadTestPage({
     page: SPANISH_PAGE_URL,
     languagePairs: LANGUAGE_PAIRS,
-    permissionsUrls: [SPANISH_PAGE_URL],
   });
 
   await assertTranslationsButton(
@@ -66,7 +65,6 @@ add_task(
     const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
       page: SPANISH_PAGE_URL,
       languagePairs: LANGUAGE_PAIRS,
-      permissionsUrls: [SPANISH_PAGE_URL],
     });
 
     await assertTranslationsButton(
@@ -134,8 +132,6 @@ add_task(
     const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
       page: SPANISH_PAGE_URL,
       languagePairs: LANGUAGE_PAIRS,
-      prefs: [["browser.translations.alwaysTranslateLanguages", "uk,it"]],
-      permissionsUrls: [SPANISH_PAGE_URL],
     });
 
     await assertTranslationsButton(

diff --git a/...onents/translations/tests/browser/browser_translations_panel_never_translate_site_auto.js b/...onents/translations/tests/browser/browser_translations_panel_never_translate_site_auto.js
@@ -16,8 +16,6 @@ add_task(
     const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
       page: SPANISH_PAGE_URL,
       languagePairs: LANGUAGE_PAIRS,
-      prefs: [["browser.translations.alwaysTranslateLanguages", "uk,it"]],
-      permissionsUrls: [SPANISH_PAGE_URL],
     });
 
     await assertTranslationsButton(

diff --git a/...nents/translations/tests/browser/browser_translations_panel_never_translate_site_basic.js b/...nents/translations/tests/browser/browser_translations_panel_never_translate_site_basic.js
@@ -13,7 +13,6 @@ add_task(async function test_toggle_never_translate_site_menuitem() {
   const { cleanup, runInPage } = await loadTestPage({
     page: SPANISH_PAGE_URL,
     languagePairs: LANGUAGE_PAIRS,
-    permissionsUrls: [SPANISH_PAGE_URL],
   });
 
   await assertTranslationsButton(

diff --git a/...ents/translations/tests/browser/browser_translations_panel_never_translate_site_manual.js b/...ents/translations/tests/browser/browser_translations_panel_never_translate_site_manual.js
@@ -15,7 +15,6 @@ add_task(
     const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
       page: SPANISH_PAGE_URL,
       languagePairs: LANGUAGE_PAIRS,
-      permissionsUrls: [SPANISH_PAGE_URL],
     });
 
     await assertTranslationsButton(

diff --git a/...onents/translations/tests/browser/browser_translations_panel_settings_unsupported_lang.js b/...onents/translations/tests/browser/browser_translations_panel_settings_unsupported_lang.js
@@ -19,7 +19,6 @@ add_task(async function test_unsupported_language_settings_menu_checkboxes() {
       { fromLang: "en", toLang: "es" },
       { fromLang: "es", toLang: "en" },
     ],
-    prefs: [["browser.translations.alwaysTranslateLanguages", ""]],
   });
 
   await assertTranslationsButton(

diff --git a/...ents/translations/tests/browser/browser_translations_telemetry_firstrun_auto_translate.js b/...ents/translations/tests/browser/browser_translations_telemetry_firstrun_auto_translate.js
@@ -11,10 +11,7 @@ add_task(async function test_translations_telemetry_firstrun_auto_translate() {
   const { cleanup, resolveDownloads, runInPage } = await loadTestPage({
     page: SPANISH_PAGE_URL,
     languagePairs: LANGUAGE_PAIRS,
-    prefs: [
-      ["browser.translations.panelShown", false],
-      ["browser.translations.alwaysTranslateLanguages", ""],
-    ],
+    prefs: [["browser.translations.panelShown", false]],
   });
 
   await assertTranslationsButton({ button: true }, "The button is available.");

diff --git a/toolkit/components/translations/tests/browser/shared-head.js b/toolkit/components/translations/tests/browser/shared-head.js
@@ -469,7 +469,7 @@ async function loadTestPage({
   page,
   prefs,
   autoOffer,
-  permissionsUrls = [],
+  permissionsUrls,
 }) {
   info(`Loading test page starting at url: ${page}`);
   // Ensure no engine is being carried over from a previous test.
@@ -482,11 +482,21 @@ async function loadTestPage({
       ["browser.translations.logLevel", "All"],
       ["browser.translations.panelShown", true],
       ["browser.translations.automaticallyPopup", true],
+      ["browser.translations.alwaysTranslateLanguages", ""],
+      ["browser.translations.neverTranslateLanguages", ""],
       ...(prefs ?? []),
     ],
   });
   await SpecialPowers.pushPermissions(
-    permissionsUrls.map(url => ({
+    [
+      ENGLISH_PAGE_URL,
+      FRENCH_PAGE_URL,
+      NO_LANGUAGE_URL,
+      SPANISH_PAGE_URL,
+      SPANISH_PAGE_URL_2,
+      SPANISH_PAGE_URL_DOT_ORG,
+      ...(permissionsUrls || []),
+    ].map(url => ({
       type: TRANSLATIONS_PERMISSION,
       allow: true,
       context: url,