Bug 1900443 - Prefs that link to AMO shouldn't use %APP%. r=rpl

Differential Revision: https://phabricator.services.mozilla.com/D212471
This commit is contained in:
William Durand 2024-06-04 08:22:03 +00:00
parent 9089193485
commit 270e8e6672
6 changed files with 7 additions and 7 deletions

View file

@ -73,7 +73,7 @@ add_setup(async function test_setup() {
set: [
[
"extensions.abuseReport.amoFormURL",
"https://example.org/%LOCALE%/%APP%/feedback/addon/%addonID%/",
"https://example.org/%LOCALE%/firefox/feedback/addon/%addonID%/",
],
],
});

View file

@ -131,7 +131,7 @@ add_setup(async () => {
["extensions.abuseReport.enabled", true],
[
"extensions.abuseReport.amoFormURL",
"https://example.org/%LOCALE%/%APP%/feedback/addon/%addonID%/",
"https://example.org/%LOCALE%/firefox/feedback/addon/%addonID%/",
],
],
});

View file

@ -1861,14 +1861,14 @@ pref("services.common.uptake.sampleRate", 1); // 1%
pref("extensions.abuseReport.enabled", false);
// Whether Firefox integrated abuse reporting feature should be opening the new abuse report form hosted on AMO.
pref("extensions.abuseReport.amoFormURL", "https://addons.mozilla.org/%LOCALE%/%APP%/feedback/addon/%addonID%/");
pref("extensions.abuseReport.amoFormURL", "https://addons.mozilla.org/%LOCALE%/firefox/feedback/addon/%addonID%/");
pref("extensions.addonAbuseReport.url", "https://services.addons.mozilla.org/api/v5/abuse/report/addon/");
// Blocklist preferences
pref("extensions.blocklist.enabled", true);
pref("extensions.blocklist.detailsURL", "https://blocked.cdn.mozilla.net/");
pref("extensions.blocklist.itemURL", "https://blocked.cdn.mozilla.net/%blockID%.html");
pref("extensions.blocklist.addonItemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked-addon/%addonID%/%addonVersion%/");
pref("extensions.blocklist.addonItemURL", "https://addons.mozilla.org/%LOCALE%/firefox/blocked-addon/%addonID%/%addonVersion%/");
// Controls what level the blocklist switches from warning about items to forcibly
// blocking them.
pref("extensions.blocklist.level", 2);

View file

@ -10,7 +10,7 @@ add_setup(async () => {
set: [
[
"extensions.abuseReport.amoFormURL",
"https://example.org/%LOCALE%/%APP%/feedback/addon/%addonID%/",
"https://example.org/%LOCALE%/firefox/feedback/addon/%addonID%/",
],
],
});

View file

@ -78,7 +78,7 @@ add_task(async function signed_xpi_initially_unblocked() {
await Blocklist.getAddonBlocklistEntry(addon),
{
state: Ci.nsIBlocklistService.STATE_BLOCKED,
url: `https://addons.mozilla.org/en-US/xpcshell/blocked-addon/${SIGNED_ADDON_ID}/${SIGNED_ADDON_VERSION}/`,
url: `https://addons.mozilla.org/en-US/firefox/blocked-addon/${SIGNED_ADDON_ID}/${SIGNED_ADDON_VERSION}/`,
},
"Blocked addon should have blocked entry"
);

View file

@ -94,7 +94,7 @@ add_task(async function public_api_uses_mlbf() {
await Blocklist.getAddonBlocklistEntry(blockedAddon),
{
state: Ci.nsIBlocklistService.STATE_BLOCKED,
url: "https://addons.mozilla.org/en-US/xpcshell/blocked-addon/@blocked/1/",
url: "https://addons.mozilla.org/en-US/firefox/blocked-addon/@blocked/1/",
},
"Blocked addon should have blocked entry"
);