forked from mirrors/gecko-dev
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
114 lines
3.2 KiB
JavaScript
114 lines
3.2 KiB
JavaScript
/**
|
|
* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/
|
|
**/
|
|
|
|
var gTests = [
|
|
{
|
|
name: "normal search (search service)",
|
|
testText: "test search",
|
|
searchURL: Services.search.defaultEngine.getSubmission("test search", null, "keyword").uri.spec,
|
|
},
|
|
{
|
|
name: "?-prefixed search (search service)",
|
|
testText: "? foo ",
|
|
searchURL: Services.search.defaultEngine.getSubmission("foo", null, "keyword").uri.spec,
|
|
},
|
|
];
|
|
|
|
function test() {
|
|
waitForExplicitFinish();
|
|
|
|
let windowObserver = {
|
|
observe(aSubject, aTopic, aData) {
|
|
if (aTopic == "domwindowopened") {
|
|
ok(false, "Alert window opened");
|
|
let win = aSubject;
|
|
win.addEventListener("load", function() {
|
|
win.close();
|
|
}, {once: true});
|
|
executeSoon(finish);
|
|
}
|
|
},
|
|
};
|
|
|
|
Services.ww.registerNotification(windowObserver);
|
|
|
|
let tab = gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
|
|
|
|
// We use a web progress listener in the content process to cancel
|
|
// the request. For everything else, we can do the work in the
|
|
// parent, since it's easier.
|
|
ContentTask.spawn(gBrowser.selectedBrowser, null, function* gen() {
|
|
let listener = {
|
|
onStateChange: function onLocationChange(webProgress, req, flags, status) {
|
|
let docStart = Ci.nsIWebProgressListener.STATE_IS_DOCUMENT |
|
|
Ci.nsIWebProgressListener.STATE_START;
|
|
if (!(flags & docStart)) {
|
|
return;
|
|
}
|
|
|
|
req.cancel(Cr.NS_ERROR_FAILURE);
|
|
},
|
|
|
|
QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener", "nsIWebProgressListener2", "nsISupportsWeakReference"]),
|
|
};
|
|
|
|
let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
|
|
.getInterface(Ci.nsIWebProgress);
|
|
webProgress.addProgressListener(listener,
|
|
Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
|
|
|
|
addEventListener("unload", () => {
|
|
webProgress.removeProgressListener(listener);
|
|
});
|
|
});
|
|
|
|
let listener = {
|
|
onStateChange: function onLocationChange(webProgress, req, flags, status) {
|
|
// Only care about document starts
|
|
let docStart = Ci.nsIWebProgressListener.STATE_IS_DOCUMENT |
|
|
Ci.nsIWebProgressListener.STATE_START;
|
|
if (!(flags & docStart))
|
|
return;
|
|
|
|
info("received document start");
|
|
|
|
ok(req instanceof Ci.nsIChannel, "req is a channel");
|
|
is(req.originalURI.spec, gCurrTest.searchURL, "search URL was loaded");
|
|
info("Actual URI: " + req.URI.spec);
|
|
|
|
executeSoon(nextTest);
|
|
},
|
|
};
|
|
|
|
gBrowser.addProgressListener(listener);
|
|
|
|
registerCleanupFunction(function() {
|
|
Services.ww.unregisterNotification(windowObserver);
|
|
|
|
gBrowser.removeProgressListener(listener);
|
|
gBrowser.removeTab(tab);
|
|
});
|
|
|
|
Services.search.init().then(nextTest);
|
|
}
|
|
|
|
var gCurrTest;
|
|
function nextTest() {
|
|
if (gTests.length) {
|
|
gCurrTest = gTests.shift();
|
|
doTest();
|
|
} else {
|
|
finish();
|
|
}
|
|
}
|
|
|
|
function doTest() {
|
|
info("Running test: " + gCurrTest.name);
|
|
|
|
// Simulate a user entering search terms
|
|
gURLBar.value = gCurrTest.testText;
|
|
gURLBar.focus();
|
|
EventUtils.synthesizeKey("KEY_Enter");
|
|
}
|