Bug 1865840 - AbuseReport button should be shown for dictionaries when the AMO port is enabled. r=willdurand

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

Author: rpl

toolkit/mozapps/extensions/AbuseReporter.sys.mjs

@@ -27,6 +27,10 @@ const SUPPORTED_ADDON_TYPES = [
   "sitepermission-deprecated",
 ];
 
+// An expanded set of addon types supported when the abuse report hosted on AMO is enabled
+// (based on the "extensions.abuseReport.amoFormEnabled" pref).
+const AMO_SUPPORTED_ADDON_TYPES = [...SUPPORTED_ADDON_TYPES, "dictionary"];
+
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
@@ -47,6 +51,16 @@ XPCOMUtils.defineLazyPreferenceGetter(
   PREF_AMO_DETAILS_API_URL
 );
 
+// Whether the abuse report feature should open a form hosted by the url
+// derived from the one set on the extensions.abuseReport.amoFormURL pref
+// or use the abuse report panel integrated in Firefox.
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  "ABUSE_REPORT_AMO_FORM_ENABLED",
+  "extensions.abuseReport.amoFormEnabled",
+  true
+);
+
 const PRIVATE_REPORT_PROPS = Symbol("privateReportProps");
 
 const ERROR_TYPES = Object.freeze([
@@ -99,6 +113,10 @@ async function responseToErrorInfo(response) {
 export const AbuseReporter = {
   _lastReportTimestamp: null,
 
+  get amoFormEnabled() {
+    return lazy.ABUSE_REPORT_AMO_FORM_ENABLED;
+  },
+
   // Error types.
   updateLastReportTimestamp() {
     this._lastReportTimestamp = Date.now();
@@ -119,6 +137,9 @@ export const AbuseReporter = {
   },
 
   isSupportedAddonType(addonType) {
+    if (this.amoFormEnabled) {
+      return AMO_SUPPORTED_ADDON_TYPES.includes(addonType);
+    }
     return SUPPORTED_ADDON_TYPES.includes(addonType);
   },
 

toolkit/mozapps/extensions/content/abuse-reports.js

@@ -16,16 +16,6 @@ const { AbuseReporter } = ChromeUtils.importESModule(
   "resource://gre/modules/AbuseReporter.sys.mjs"
 );
 
-// Whether the abuse report feature should open a form hosted on
-// addons.mozilla.org or use the abuse report panel integrated
-// in Firefox.
-XPCOMUtils.defineLazyPreferenceGetter(
-  this,
-  "ABUSE_REPORT_AMO_FORM_ENABLED",
-  "extensions.abuseReport.amoFormEnabled",
-  true
-);
-
 // Message Bars definitions.
 const ABUSE_REPORT_MESSAGE_BARS = {
   // Idle message-bar (used while the submission is still ongoing).
@@ -206,7 +196,7 @@ async function openAbuseReportAMOForm({ addonId, reportEntryPoint }) {
   });
 }
 
-window.openAbuseReport = ABUSE_REPORT_AMO_FORM_ENABLED
+window.openAbuseReport = AbuseReporter.amoFormEnabled
   ? openAbuseReportAMOForm
   : openAbuseReport;
 

toolkit/mozapps/extensions/test/browser/browser_amo_abuse_report.js

@@ -5,7 +5,7 @@
 
 loadTestSubscript("head_abuse_report.js");
 
-add_task(async function test_opens_amo_form_in_a_tab() {
+add_setup(async () => {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["extensions.abuseReport.amoFormEnabled", true],
@@ -16,14 +16,24 @@ add_task(async function test_opens_amo_form_in_a_tab() {
     ],
   });
 
-  await openAboutAddons();
+  const { AbuseReporter } = ChromeUtils.importESModule(
+    "resource://gre/modules/AbuseReporter.sys.mjs"
+  );
 
   Assert.equal(
-    gManagerWindow.ABUSE_REPORT_AMO_FORM_ENABLED,
+    AbuseReporter.amoFormEnabled,
     true,
-    "Expect AMO abuse report form to be enabled by default"
+    "Expect AMO abuse report form to be enabled"
   );
 
+  // Setting up MockProvider to mock various addon types
+  // as installed.
+  await AbuseReportTestUtils.setup();
+});
+
+add_task(async function test_opens_amo_form_in_a_tab() {
+  await openAboutAddons();
+
   const ADDON_ID = "test-ext@mochitest";
   const expectedUrl = Services.urlFormatter
     .formatURLPref("extensions.abuseReport.amoFormURL")
@@ -48,3 +58,21 @@ add_task(async function test_opens_amo_form_in_a_tab() {
   await closeAboutAddons();
   await SpecialPowers.popPrefEnv();
 });
+
+add_task(async function test_report_button_shown_on_dictionary_addons() {
+  await openAboutAddons("dictionary");
+  await AbuseReportTestUtils.assertReportActionShown(
+    gManagerWindow,
+    EXT_DICTIONARY_ADDON_ID
+  );
+  await closeAboutAddons();
+});
+
+add_task(async function test_report_action_hidden_on_langpack_addons() {
+  await openAboutAddons("locale");
+  await AbuseReportTestUtils.assertReportActionHidden(
+    gManagerWindow,
+    EXT_LANGPACK_ADDON_ID
+  );
+  await closeAboutAddons();
+});

toolkit/mozapps/extensions/test/browser/head_abuse_report.js

@@ -390,17 +390,33 @@ const AbuseReportTestUtils = {
     }
   },
 
-  // Assert that the report action is hidden on the addon card
+  // Assert that the report action visibility on the addon card
   // for the given about:addons windows and extension id.
-  async assertReportActionHidden(gManagerWindow, extId) {
+  async assertReportActionVisibility(gManagerWindow, extId, expectShown) {
     let addonCard = gManagerWindow.document.querySelector(
       `addon-list addon-card[addon-id="${extId}"]`
     );
     ok(addonCard, `Got the addon-card for the ${extId} test extension`);
 
     let reportButton = addonCard.querySelector("[action=report]");
     ok(reportButton, `Got the report action for ${extId}`);
-    ok(reportButton.hidden, `${extId} report action should be hidden`);
+    Assert.equal(
+      reportButton.hidden,
+      !expectShown,
+      `${extId} report action should be ${expectShown ? "shown" : "hidden"}`
+    );
+  },
+
+  // Assert that the report action is hidden on the addon card
+  // for the given about:addons windows and extension id.
+  assertReportActionHidden(gManagerWindow, extId) {
+    return this.assertReportActionVisibility(gManagerWindow, extId, false);
+  },
+
+  // Assert that the report action is shown on the addon card
+  // for the given about:addons windows and extension id.
+  assertReportActionShown(gManagerWindow, extId) {
+    return this.assertReportActionVisibility(gManagerWindow, extId, true);
   },
 
   // Assert that the report panel is hidden (or closed if the report