mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 21:28:04 +02:00
481ae95c00
This is a rollup of all the patches that have landed on the cedar project branch:891252fdd0Bug 1492475 - Part 1: Migrate most, if not all nsSearchService consumers to use async APIs. r=florian79b2eb2367Bug 1492475 - Part 2: Move nsIBrowserSearchService.idl to toolkit/components/search/nsISearchService.idl and update references. r=floriana947d3cdf0Bug 1492475 - Part 3: The search service init() method should simply return a Promise. r=florianc1e172dfacBug 1492475 - Part 4: Remove the synchronous initialization flow. r=floriancd41189eacBug 1492475 - Part 5: Since async initialization of the search service now is implicit behavior, remove the distinctive verbiage used internally. r=florian2ae7189dfaBug 1492475 - Part 6: Update the cache build task to work with an actual Promise and re-initialize only once at the same time - all to fix race conditions here. r=florianc8ee92973fBug 1492475 - Part 7: Make the region fetch not block the init flow, to ensure it's as fast as possible. r=florianc44e674e16Bug 1492475 - Part 8: Introduce an init flag, which can only be used privately, that allows to explicitly skip waiting for the region check process to complete. r=florian6c79eaf1d3Bug 1492475 - Part 9: Update unit tests to stop using 'currentEngine', in favor of 'defaultEngine'. r=Standard821b3aa17eeBug 1492475 - Part 10: Update unit tests to be fully aware of the new, async signatures of the search service API and remove sync init flow tests. r=mkaply,floriance5ba69019Bug 1492475 - Part 11: Repair incorrect usage of the `identifier` property of nsISearchEngine instances. r=florianfd177a7994Bug 1518543 - Fix up the Android (Fennec) nsISearchService shim to work with the new asynchronous API. r=florian3653d8ee22Bug 1523708 - Change the search service interaction in the show-heartbeat action to use the new async API. r=florian Differential Revision: https://phabricator.services.mozilla.com/D18355 --HG-- rename : netwerk/base/nsIBrowserSearchService.idl => toolkit/components/search/nsISearchService.idl extra : moz-landing-system : lando
50 lines
1.7 KiB
JavaScript
50 lines
1.7 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
"use strict";
|
|
|
|
const kSearchEngineID = "browser_urifixup_search_engine";
|
|
const kSearchEngineURL = "http://example.com/?search={searchTerms}";
|
|
|
|
add_task(async function setup() {
|
|
// Add a new fake search engine.
|
|
await Services.search.addEngineWithDetails(kSearchEngineID, "", "", "", "get", kSearchEngineURL);
|
|
|
|
let oldDefaultEngine = await Services.search.getDefault();
|
|
await Services.search.setDefault(Services.search.getEngineByName(kSearchEngineID));
|
|
|
|
// Remove the fake engine when done.
|
|
registerCleanupFunction(async () => {
|
|
if (oldDefaultEngine) {
|
|
await Services.search.setDefault(oldDefaultEngine);
|
|
}
|
|
|
|
let engine = Services.search.getEngineByName(kSearchEngineID);
|
|
if (engine) {
|
|
await Services.search.removeEngine(engine);
|
|
}
|
|
});
|
|
});
|
|
|
|
add_task(async function test() {
|
|
for (let searchParams of ["foo bar", "brokenprotocol:somethingelse"]) {
|
|
// Add a new blank tab.
|
|
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, "about:blank");
|
|
await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
|
|
|
|
// Enter search terms and start a search.
|
|
gURLBar.value = searchParams;
|
|
gURLBar.focus();
|
|
EventUtils.synthesizeKey("KEY_Enter");
|
|
await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
|
|
|
|
// Check that we arrived at the correct URL.
|
|
let escapedParams = encodeURIComponent(searchParams).replace("%20", "+");
|
|
let expectedURL = kSearchEngineURL.replace("{searchTerms}", escapedParams);
|
|
is(gBrowser.selectedBrowser.currentURI.spec, expectedURL,
|
|
"New tab should have loaded with expected url.");
|
|
|
|
// Cleanup.
|
|
gBrowser.removeCurrentTab();
|
|
}
|
|
});
|