forked from mirrors/gecko-dev
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
69 lines
1.9 KiB
JavaScript
69 lines
1.9 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",
|
|
expectText: "test+search",
|
|
},
|
|
{
|
|
name: "?-prefixed search (search service)",
|
|
testText: "? foo ",
|
|
expectText: "foo",
|
|
},
|
|
];
|
|
|
|
add_task(async function setup() {
|
|
let engineAddedPromise = TestUtils.topicObserved("browser-search-engine-modified", (subject, data) => {
|
|
return data == "engine-added";
|
|
});
|
|
|
|
const url = "http://test:80/browser/browser/base/content/test/general/POSTSearchEngine.xml";
|
|
await Services.search.addEngine(url, null, false);
|
|
|
|
let [subject, data] = await engineAddedPromise;
|
|
|
|
let engine = subject.QueryInterface(Ci.nsISearchEngine);
|
|
info("Observer: " + data + " for " + engine.name);
|
|
|
|
if (engine.name != "POST Search") {
|
|
Assert.ok(false, "Wrong search engine added");
|
|
}
|
|
|
|
await Services.search.setDefault(engine);
|
|
|
|
registerCleanupFunction(async function() {
|
|
await Services.search.removeEngine(engine);
|
|
});
|
|
});
|
|
|
|
add_task(async function() {
|
|
for (let test of gTests) {
|
|
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
|
|
let browser = tab.linkedBrowser;
|
|
|
|
// Simulate a user entering search terms
|
|
gURLBar.value = test.testText;
|
|
gURLBar.focus();
|
|
EventUtils.synthesizeKey("KEY_Enter");
|
|
|
|
await BrowserTestUtils.browserLoaded(browser, false, url => {
|
|
return url != "about:blank";
|
|
});
|
|
|
|
info("Page loaded: " + browser.currentURI.spec);
|
|
|
|
let textContent = await ContentTask.spawn(browser, null, async () => {
|
|
return content.document.body.textContent;
|
|
});
|
|
|
|
Assert.ok(textContent, "search page loaded");
|
|
let needle = "searchterms=" + test.expectText;
|
|
Assert.equal(textContent, needle, "The query POST data should be returned in the response");
|
|
|
|
BrowserTestUtils.removeTab(tab);
|
|
}
|
|
});
|