Bug 1868527 - hide 'Site not working?' from the protections panel when the 'Report Broken Site' feature is active; r=pbz

Differential Revision: https://phabricator.services.mozilla.com/D196184

Author: wisniewskit

browser/base/content/test/protectionsUI/browser_protectionsUI_report_breakage.js

@@ -34,6 +34,11 @@ let { Preferences } = ChromeUtils.importESModule(
 add_setup(async function () {
   await UrlClassifierTestUtils.addTestTrackers();
 
+  // Disable Report Broken Site, as it hides "Site not working?" when enabled.
+  await SpecialPowers.pushPrefEnv({
+    set: [["ui.new-webcompat-reporter.enabled", false]],
+  });
+
   registerCleanupFunction(() => {
     // Clear prefs that are touched in this test again for sanity.
     Services.prefs.clearUserPref(TP_PREF);

browser/components/reportbrokensite/ReportBrokenSite.sys.mjs

@@ -394,6 +394,15 @@ export var ReportBrokenSite = new (class ReportBrokenSite {
       reportSiteIssue.hidden = this.enabled || !this.reportSiteIssueEnabledPref;
       reportSiteIssue.disabled = !canReportUrl;
     }
+
+    // "Site not working?" on the protections panel should be hidden when
+    // Report Broken Site is visible (bug 1868527).
+    const siteNotWorking = document.getElementById(
+      "protections-popup-tp-switch-section-footer"
+    );
+    if (siteNotWorking) {
+      siteNotWorking.hidden = this.enabled;
+    }
   }
 
   #checkPrefs(whichChanged) {

browser/components/reportbrokensite/test/browser/browser.toml

@@ -15,6 +15,8 @@ support-files = [
 
 ["browser_report_site_issue_fallback.js"]
 
+["browser_site_not_working_fallback.js"]
+
 ["browser_send_more_info.js"]
 
 ["browser_back_buttons.js"]

browser/components/reportbrokensite/test/browser/browser_site_not_working_fallback.js

@@ -0,0 +1,35 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* Tests that when Report Broken Site is active,
+ * "Site not working?" is hidden on the protections panel.
+ */
+
+"use strict";
+
+add_common_setup();
+
+const TP_PREF = "privacy.trackingprotection.enabled";
+
+const TRACKING_PAGE =
+  "https://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
+
+const SITE_NOT_WORKING = "protections-popup-tp-switch-section-footer";
+
+add_task(async function testSiteNotWorking() {
+  await SpecialPowers.pushPrefEnv({ set: [[TP_PREF, true]] });
+  await BrowserTestUtils.withNewTab(TRACKING_PAGE, async function () {
+    const menu = ProtectionsPanel();
+
+    ensureReportBrokenSitePreffedOn();
+    await menu.open();
+    const siteNotWorking = document.getElementById(SITE_NOT_WORKING);
+    isMenuItemHidden(siteNotWorking, "Site not working is hidden");
+    await menu.close();
+
+    ensureReportBrokenSitePreffedOff();
+    await menu.open();
+    isMenuItemEnabled(siteNotWorking, "Site not working is shown");
+    await menu.close();
+  });
+});