Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1333721 : Converted utility functions in browser_contentSearchUI.js to async r=Standard8

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D40280

--HG--
extra : moz-landing-system : lando
This commit is contained in:
ruchikabgosain 2019-08-02 19:58:42 +00:00
parent 5d0a507d0c
commit 2c97b7733b
1 changed files with 39 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
browser/base/content/test/general/browser_contentSearchUI.js
View File

@ -681,27 +681,24 @@ add_task(async function settings() {
var gDidInitialSetUp = false;
function setUp(aNoEngine) {
return (async function() {
if (!gDidInitialSetUp) {
var { ContentSearch } = ChromeUtils.import(
"resource:///modules/ContentSearch.jsm"
);
let originalOnMessageSearch = ContentSearch._onMessageSearch;
let originalOnMessageManageEngines =
ContentSearch._onMessageManageEngines;
ContentSearch._onMessageSearch = () => {};
ContentSearch._onMessageManageEngines = () => {};
registerCleanupFunction(() => {
ContentSearch._onMessageSearch = originalOnMessageSearch;
ContentSearch._onMessageManageEngines = originalOnMessageManageEngines;
});
await setUpEngines();
await promiseTab();
gDidInitialSetUp = true;
}
await msg("focus");
})();
async function setUp(aNoEngine) {
if (!gDidInitialSetUp) {
var { ContentSearch } = ChromeUtils.import(
"resource:///modules/ContentSearch.jsm"
);
let originalOnMessageSearch = ContentSearch._onMessageSearch;
let originalOnMessageManageEngines = ContentSearch._onMessageManageEngines;
ContentSearch._onMessageSearch = () => {};
ContentSearch._onMessageManageEngines = () => {};
registerCleanupFunction(() => {
ContentSearch._onMessageSearch = originalOnMessageSearch;
ContentSearch._onMessageManageEngines = originalOnMessageManageEngines;
});
await setUpEngines();
await promiseTab();
gDidInitialSetUp = true;
}
await msg("focus");
}
function msg(type, data = null) {
@ -790,41 +787,26 @@ async function promiseTab() {
return deferred.promise;
}
function promiseMsg(name, type, msgMan) {
return new Promise(resolve => {
info("Waiting for " + name + " message " + type + "...");
msgMan.addMessageListener(name, function onMsg(msgObj) {
info("Received " + name + " message " + msgObj.data.type + "\n");
if (msgObj.data.type == type) {
msgMan.removeMessageListener(name, onMsg);
resolve(msgObj);
}
});
async function setUpEngines() {
info("Removing default search engines");
let currentEngineName = (await Services.search.getDefault()).name;
let currentEngines = await Services.search.getVisibleEngines();
info("Adding test search engines");
let rootDir = getRootDirectory(gTestPath);
let engine1 = await SearchTestUtils.promiseNewSearchEngine(
rootDir + TEST_ENGINE_BASENAME
);
await SearchTestUtils.promiseNewSearchEngine(
rootDir + TEST_ENGINE_2_BASENAME
);
await Services.search.setDefault(engine1);
for (let engine of currentEngines) {
await Services.search.removeEngine(engine);
}
registerCleanupFunction(async () => {
Services.search.restoreDefaultEngines();
await Services.search.setDefault(
Services.search.getEngineByName(currentEngineName)
);
});
}
function setUpEngines() {
return (async function() {
info("Removing default search engines");
let currentEngineName = (await Services.search.getDefault()).name;
let currentEngines = await Services.search.getVisibleEngines();
info("Adding test search engines");
let rootDir = getRootDirectory(gTestPath);
let engine1 = await SearchTestUtils.promiseNewSearchEngine(
rootDir + TEST_ENGINE_BASENAME
);
await SearchTestUtils.promiseNewSearchEngine(
rootDir + TEST_ENGINE_2_BASENAME
);
await Services.search.setDefault(engine1);
for (let engine of currentEngines) {
await Services.search.removeEngine(engine);
}
registerCleanupFunction(async () => {
Services.search.restoreDefaultEngines();
await Services.search.setDefault(
Services.search.getEngineByName(currentEngineName)
);
});
})();
}