Merging upstream version 125.0.1.

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

1 files changed, 17 insertions, 4 deletions

diff --git a/browser/components/reportbrokensite/test/browser/head.js b/browser/components/reportbrokensite/test/browser/head.js
index e3f4451b5b..7cc1d51a21 100644
--- a/browser/components/reportbrokensite/test/browser/head.js
+++ b/browser/components/reportbrokensite/test/browser/head.js
@@ -28,13 +28,20 @@ const PREFS = {
   NEW_REPORT_ENDPOINT: "ui.new-webcompat-reporter.new-report-endpoint",
   REPORT_SITE_ISSUE_ENABLED: "extensions.webcompat-reporter.enabled",
   PREFERS_CONTRAST_ENABLED: "layout.css.prefers-contrast.enabled",
+  TOUCH_EVENTS: "dom.w3c_touch_events.enabled",
   USE_ACCESSIBILITY_THEME: "ui.useAccessibilityTheme",
 };
 
 function add_common_setup() {
   add_setup(async function () {
     await SpecialPowers.pushPrefEnv({
-      set: [[PREFS.NEW_REPORT_ENDPOINT, NEW_REPORT_ENDPOINT_TEST_URL]],
+      set: [
+        [PREFS.NEW_REPORT_ENDPOINT, NEW_REPORT_ENDPOINT_TEST_URL],
+
+        // set touch events to auto-detect, as the pref gets set to 1 somewhere
+        // while tests are running, making hasTouchScreen checks unreliable.
+        [PREFS.TOUCH_EVENTS, 2],
+      ],
     });
     registerCleanupFunction(function () {
       for (const prefName of Object.values(PREFS)) {
@@ -551,11 +558,17 @@ class MenuHelper {
     return true;
   }
 
-  get reportBrokenSite() {}
+  get reportBrokenSite() {
+    throw new Error("Should be defined in derived class");
+  }
 
-  get reportSiteIssue() {}
+  get reportSiteIssue() {
+    throw new Error("Should be defined in derived class");
+  }
 
-  get popup() {}
+  get popup() {
+    throw new Error("Should be defined in derived class");
+  }
 
   get opened() {
     return this.popup?.hasAttribute("panelopen");