Bug 1488096 - Give changeBlockListLink the same search-l10n-ids as ch…

…angeBlockList; r=johannh Differential Revision: https://phabricator.services.mozilla.com/D4827
mozilla-spidermonkey · Sep 3, 2018 · 95050e8 · 95050e8
1 parent e01bbd5
commit 95050e8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
@@ -379,7 +379,10 @@
                      data-l10n-id="content-blocking-tracking-protection-option-always"
                      flex="1" />
             </radiogroup>
-            <label id="changeBlockListLink" data-l10n-id="content-blocking-tracking-protection-change-block-list" class="text-link"/>
+            <label id="changeBlockListLink"
+                   data-l10n-id="content-blocking-tracking-protection-change-block-list"
+                   class="text-link"
+                   search-l10n-ids="blocklist-window.title, blocklist-desc, blocklist-button-cancel.label, blocklist-button-ok.label"/>
           </vbox>
         </hbox>
       </vbox>

diff --git a/...components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_6.js b/...components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_6.js
@@ -13,9 +13,21 @@ add_task(async function() {
  * Test for searching for the "Block Lists" subdialog.
  */
 add_task(async function() {
-  await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
-  await evaluateSearchResults("block Web elements", "trackingGroup");
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  async function doTest() {
+    await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
+    await evaluateSearchResults("block Web elements", "trackingGroup");
+    BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  }
+  await SpecialPowers.pushPrefEnv({"set": [
+    ["browser.contentblocking.ui.enabled", true],
+  ]});
+  info("Run the test with Content Blocking UI enabled");
+  await doTest();
+  await SpecialPowers.pushPrefEnv({"set": [
+    ["browser.contentblocking.ui.enabled", false],
+  ]});
+  info("Run the test with Content Blocking UI disabled");
+  await doTest();
 });
 
 /**