Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1671803 - Add localized names for Baidu and Yandex to WEB_ENGINE_NAMES. r=mak

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D94012
This commit is contained in:
Harry Twyford 2020-10-19 18:33:51 +00:00
parent b5e41f1e7e
commit b19f066d1c
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/components/urlbar/UrlbarUtils.jsm
View File

@ -189,13 +189,14 @@ var UrlbarUtils = {
// TODO (Bug 1658661): Don't hardcode this list; store search engine category
// information someplace better.
WEB_ENGINE_NAMES: new Set([
"Baidu",
"百度", // Baidu
"Bing",
"DuckDuckGo",
"Ecosia",
"Google",
"Qwant",
"Yandex",
"Яндекс", // Yandex, non-EN
]),
// Valid entry points for search mode. If adding a value here, please update

45
browser/components/urlbar/tests/browser/browser_tabToSearch.js
View File

@ -643,3 +643,48 @@ add_task(async function onboard_oneInteraction_false() {
await UrlbarPrefs.set("tipShownCount.tabToSearch", 0);
await SpecialPowers.popPrefEnv();
});
// Tests that engines with names containing extended Unicode characters can be
// recognized as general-web engines and that their tab-to-search results
// display the correct string.
add_task(async function extended_unicode_in_engine() {
// Baidu's localized name. We expect this tab-to-search result shows the
// general-web engine string because Baidu is included in WEB_ENGINE_NAMES.
let engineName = "百度";
let engineDomain = "example-2.com";
let testEngine = await Services.search.addEngineWithDetails(engineName, {
template: `http://${engineDomain}/?search={searchTerms}`,
});
for (let i = 0; i < 3; i++) {
await PlacesTestUtils.addVisits([`https://${engineDomain}/`]);
}
await UrlbarTestUtils.promiseAutocompleteResultPopup({
window,
value: engineDomain.slice(0, 4),
});
let tabToSearchDetails = await UrlbarTestUtils.getDetailsOfResultAt(
window,
1
);
Assert.equal(
tabToSearchDetails.searchParams.engine,
engineName,
"The tab-to-search engine name contains extended Unicode characters."
);
let [actionTabToSearch] = await document.l10n.formatValues([
{
id: "urlbar-result-action-tabtosearch-web",
args: { engine: tabToSearchDetails.searchParams.engine },
},
]);
Assert.equal(
tabToSearchDetails.displayed.action,
actionTabToSearch,
"The correct action text is displayed in the tab-to-search result."
);
await UrlbarTestUtils.promisePopupClose(window);
await PlacesUtils.history.clear();
await Services.search.removeEngine(testEngine);
});