From 790e635c39bfa087d32e327b712c738b18c5af02 Mon Sep 17 00:00:00 2001 From: Sandor Molnar Date: Tue, 13 Feb 2024 11:40:04 +0200 Subject: [PATCH] Backed out changeset 695f3d06ec64 (bug 1879637) for causing bc failures at browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_yelp.js CLOSED TREE --- .../urlbar/content/enUS-searchFeatures.ftl | 11 ++----- .../urlbar/private/YelpSuggestions.sys.mjs | 30 +++--------------- .../browser/browser_quicksuggest_yelp.js | 36 +++------------------- 3 files changed, 11 insertions(+), 66 deletions(-) diff --git a/browser/components/urlbar/content/enUS-searchFeatures.ftl b/browser/components/urlbar/content/enUS-searchFeatures.ftl index daddc22378a3..b808b203b7f5 100644 --- a/browser/components/urlbar/content/enUS-searchFeatures.ftl +++ b/browser/components/urlbar/content/enUS-searchFeatures.ftl @@ -15,7 +15,6 @@ -mdn-brand-name = MDN Web Docs -mdn-brand-short-name = MDN --yelp-brand-name = Yelp ## These strings are used in the urlbar panel. @@ -74,16 +73,10 @@ firefox-suggest-dismissal-acknowledgment-all = Thanks for your feedback. You won # suggestion. firefox-suggest-dismissal-acknowledgment-one-mdn = Thanks for your feedback. You won’t see this { -mdn-brand-short-name } suggestion again. -# A message that replaces a result when the user dismisses all MDN suggestions. +# A message that replaces a result when the user dismisses all MDN suggestions of +# a particular type. firefox-suggest-dismissal-acknowledgment-all-mdn = Thanks for your feedback. You won’t see { -mdn-brand-short-name } suggestions anymore. -# A message that replaces a result when the user dismisses a single Yelp -# suggestion. -firefox-suggest-dismissal-acknowledgment-one-yelp = Thanks for your feedback. You won’t see this { -yelp-brand-name } suggestion again. - -# A message that replaces a result when the user dismisses all Yelp suggestions. -firefox-suggest-dismissal-acknowledgment-all-yelp = Thanks for your feedback. You won’t see { -yelp-brand-name } suggestions anymore. - ## These strings are used for weather suggestions in the urlbar. # This string is displayed above the current temperature diff --git a/browser/components/urlbar/private/YelpSuggestions.sys.mjs b/browser/components/urlbar/private/YelpSuggestions.sys.mjs index 79121d3b068d..1c6e2c958970 100644 --- a/browser/components/urlbar/private/YelpSuggestions.sys.mjs +++ b/browser/components/urlbar/private/YelpSuggestions.sys.mjs @@ -7,7 +7,6 @@ import { BaseFeature } from "resource:///modules/urlbar/private/BaseFeature.sys. const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs", MerinoClient: "resource:///modules/MerinoClient.sys.mjs", UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", @@ -18,7 +17,6 @@ const RESULT_MENU_COMMAND = { HELP: "help", INACCURATE_LOCATION: "inaccurate_location", NOT_INTERESTED: "not_interested", - NOT_RELEVANT: "not_relevant", SHOW_LESS_FREQUENTLY: "show_less_frequentry", }; @@ -117,23 +115,10 @@ export class YelpSuggestions extends BaseFeature { commands.push( { + name: RESULT_MENU_COMMAND.NOT_INTERESTED, l10n: { id: "firefox-suggest-command-dont-show-this", }, - children: [ - { - name: RESULT_MENU_COMMAND.NOT_RELEVANT, - l10n: { - id: "firefox-suggest-command-not-relevant", - }, - }, - { - name: RESULT_MENU_COMMAND.NOT_INTERESTED, - l10n: { - id: "firefox-suggest-command-not-interested", - }, - }, - ], }, { name: "separator" }, { @@ -159,22 +144,15 @@ export class YelpSuggestions extends BaseFeature { // `inaccurate_location`. view.acknowledgeFeedback(result); break; - // selType == "dismiss" when the user presses the dismiss key shortcut. - case "dismiss": - case RESULT_MENU_COMMAND.NOT_RELEVANT: - lazy.QuickSuggest.blockedSuggestions.add(result.payload.url); - result.acknowledgeDismissalL10n = { - id: "firefox-suggest-dismissal-acknowledgment-one-yelp", - }; - view.controller.removeResult(result); - break; case RESULT_MENU_COMMAND.NOT_INTERESTED: lazy.UrlbarPrefs.set("suggest.yelp", false); result.acknowledgeDismissalL10n = { - id: "firefox-suggest-dismissal-acknowledgment-all-yelp", + id: "firefox-suggest-dismissal-acknowledgment-all", }; view.controller.removeResult(result); break; + // selType == "dismiss" when the user presses the dismiss key shortcut. + case "dismiss": case RESULT_MENU_COMMAND.SHOW_LESS_FREQUENTLY: view.acknowledgeFeedback(result); this.#incrementShowLessFrequentlyCount(); diff --git a/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_yelp.js b/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_yelp.js index 209508c2e5bf..a267a1ac2e88 100644 --- a/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_yelp.js +++ b/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_yelp.js @@ -208,34 +208,8 @@ async function doShowLessFrequently({ UrlbarPrefs.set("yelp.showLessFrequentlyCount", 0); } -// Tests the "Not relevant" result menu dismissal command. +// Tests the "Don't show this again" result menu dismissal command. add_task(async function resultMenu_not_interested() { - await doDismiss({ - menu: "not_relevant", - assert: resuilt => { - Assert.ok( - QuickSuggest.blockedSuggestions.has(resuilt.payload.url), - "The URL should be register as blocked" - ); - }, - }); - - QuickSuggest.blockedSuggestions.clear(); -}); - -// Tests the "Not interested" result menu dismissal command. -add_task(async function resultMenu_not_interested() { - await doDismiss({ - menu: "not_interested", - assert: () => { - Assert.ok(!UrlbarPrefs.get("suggest.yelp")); - }, - }); - - UrlbarPrefs.clear("suggest.yelp"); -}); - -async function doDismiss({ menu, assert }) { await UrlbarTestUtils.promiseAutocompleteResultPopup({ window, value: "ramen", @@ -245,10 +219,9 @@ async function doDismiss({ menu, assert }) { let resultIndex = 1; let details = await UrlbarTestUtils.getDetailsOfResultAt(window, resultIndex); Assert.equal(details.result.payload.provider, "Yelp"); - let result = details.result; // Click the command. - await UrlbarTestUtils.openResultMenuAndClickItem(window, menu, { + await UrlbarTestUtils.openResultMenuAndClickItem(window, "not_interested", { resultIndex, openByMouse: true, }); @@ -305,10 +278,11 @@ async function doDismiss({ menu, assert }) { ); } - assert(result); + Assert.ok(!UrlbarPrefs.get("suggest.yelp")); await UrlbarTestUtils.promisePopupClose(window); -} + UrlbarPrefs.clear("suggest.yelp"); +}); // Tests the row/group label. add_task(async function rowLabel() { -- 2.11.4.GIT