Bug 1874917 - Rename SearchTestUtils.promiseNewSearchEngine to SearchTestUtils.installOpenSearchEngine r=Standard8

Differential Revision: https://phabricator.services.mozilla.com/D211309
This commit is contained in:
ujas.thakkar
2024-05-23 16:17:00 +00:00
parent 8f544459da
commit 7acd32b983
74 changed files with 99 additions and 99 deletions

View File

@@ -22,7 +22,7 @@ add_task(async function () {
async browser => {
let engine;
await promiseContentSearchChange(browser, async () => {
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: "https://example.com/browser/browser/base/content/test/about/POSTSearchEngine.xml",
setAsDefault: true,
});

View File

@@ -22,7 +22,7 @@ add_task(async function () {
// Add a test engine that provides suggestions and switch to it.
let engine;
await promiseContentSearchChange(browser, async () => {
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
setAsDefault: true,
});

View File

@@ -23,7 +23,7 @@ add_task(async function () {
// Add a test engine that provides suggestions and switch to it.
let engine;
await promiseContentSearchChange(browser, async () => {
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
setAsDefault: true,
});

View File

@@ -23,7 +23,7 @@ add_task(async function () {
async function (browser) {
let engine;
await promiseContentSearchChange(browser, async () => {
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
setAsDefault: true,
});

View File

@@ -43,7 +43,7 @@ async function addBookmark(bookmark) {
async function prepareSearchEngine() {
let suggestionsEnabled = Services.prefs.getBoolPref(SUGGEST_URLBAR_PREF);
Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, true);
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -86,7 +86,7 @@ add_setup(async function () {
await gCUITestUtils.addSearchBar();
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: "http://mochi.test:8888/browser/browser/components/search/test/browser/426329.xml",
setAsDefault: true,
});

View File

@@ -37,17 +37,17 @@ add_setup(async function () {
],
});
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: "chrome://mochitests/content/browser/browser/components/search/test/browser/testEngine.xml",
setAsDefault: true,
});
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: "chrome://mochitests/content/browser/browser/components/search/test/browser/testEngine_diacritics.xml",
setAsDefaultPrivate: true,
});
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "testEngine_chromeicon.xml",
});
@@ -443,7 +443,7 @@ async function waitForNewEngine(browser, basename) {
// There are two events triggerd by engine-added and engine-loaded
let statePromise = await waitForTestMsg(browser, "CurrentState");
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + basename,
});
return [engine, await statePromise.donePromise];

View File

@@ -5,7 +5,7 @@
let engine;
add_setup(async function () {
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "testEngine.xml",
setAsDefault: true,
});

View File

@@ -22,7 +22,7 @@ add_setup(async function () {
searchIcon = searchbar.querySelector(".searchbar-search-button");
let defaultEngine = await Services.search.getDefault();
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "testEngine_diacritics.xml",
});
registerCleanupFunction(async () => {

View File

@@ -13,7 +13,7 @@ add_setup(async function () {
});
searchIcon = searchbar.querySelector(".searchbar-search-button");
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
});
});

View File

@@ -34,7 +34,7 @@ add_setup(async function () {
await resetEngines();
});
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
});
});

View File

@@ -4,7 +4,7 @@
add_setup(async function () {
await gCUITestUtils.addSearchBar();
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "426329.xml",
setAsDefault: true,
});

View File

@@ -43,7 +43,7 @@ add_setup(async function () {
searchbar = await gCUITestUtils.addSearchBar();
textbox = searchbar.textbox;
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "testEngine.xml",
setAsDefault: true,
});

View File

@@ -40,7 +40,7 @@ add_setup(async function () {
searchIcon = searchbar.querySelector(".searchbar-search-button");
goButton = searchbar.querySelector(".search-go-button");
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "testEngine.xml",
setAsDefault: true,
});

View File

@@ -31,7 +31,7 @@ add_setup(async function () {
textbox = searchbar.textbox;
searchIcon = searchbar.querySelector(".searchbar-search-button");
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "testEngine.xml",
setAsDefault: true,
});

View File

@@ -49,7 +49,7 @@ function clickSearchbarSuggestion(entryName, clickOptions = {}) {
add_setup(async function () {
await gCUITestUtils.addSearchBar();
const url = getRootDirectory(gTestPath) + "telemetrySearchSuggestions.xml";
suggestionEngine = await SearchTestUtils.promiseNewSearchEngine({ url });
suggestionEngine = await SearchTestUtils.installOpenSearchEngine({ url });
registerCleanupFunction(() => {
gCUITestUtils.removeSearchBar();

View File

@@ -117,7 +117,7 @@ add_task(async function switchToTab() {
});
add_task(async function searchSuggestions() {
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -11,7 +11,7 @@
add_setup(async function () {
sandbox = sinon.createSandbox();
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
setAsDefault: true,
});

View File

@@ -80,7 +80,7 @@ add_task(async function checkCtrlWorks() {
add_task(async function checkPrefTurnsOffCanonize() {
// Add a dummy search engine to avoid hitting the network.
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -9,7 +9,7 @@ const ORIGINAL_CHUNK_RESULTS_DELAY =
UrlbarProvidersManager.CHUNK_RESULTS_DELAY_MS;
add_setup(async function setup() {
let suggestionsEngine = await SearchTestUtils.promiseNewSearchEngine({
let suggestionsEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
});
await SearchTestUtils.installSearchExtension(

View File

@@ -10,7 +10,7 @@ add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.suggest.quickactions", false]],
});
const engine = await SearchTestUtils.promiseNewSearchEngine({
const engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
setAsDefault: true,
});

View File

@@ -596,7 +596,7 @@ async function withSuggestions(
await SpecialPowers.pushPrefEnv({
set: [[SUGGESTIONS_PREF, true]],
});
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + engineBasename,
});
let oldDefaultEngine = await Services.search.getDefault();

View File

@@ -460,7 +460,7 @@ add_task(async function test_adaptive_mouse() {
add_task(async function test_adaptive_searchmode() {
info("Check adaptive history is not shown in search mode.");
let suggestionsEngine = await SearchTestUtils.promiseNewSearchEngine({
let suggestionsEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
});

View File

@@ -54,7 +54,7 @@ add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.suggest.searches", false]],
});
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
setAsDefault: true,
});

View File

@@ -17,7 +17,7 @@ var gTests = [
];
add_setup(async function () {
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
setAsDefault: true,
});

View File

@@ -22,7 +22,7 @@ var gTests = [
];
add_setup(async function () {
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "POSTSearchEngine.xml",
setAsDefault: true,
});

View File

@@ -21,7 +21,7 @@ add_setup(async function () {
// Add a search suggestion engine and move it to the front so that it appears
// as the first one-off.
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
});
await Services.search.moveEngine(engine, 0);

View File

@@ -31,7 +31,7 @@ async function searchAndOpenPopup(value) {
add_setup(async function () {
// Add a search suggestion engine and move it to the front so that it appears
// as the first one-off.
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
});
await Services.search.moveEngine(engine, 0);

View File

@@ -28,10 +28,10 @@ add_setup(async function () {
["browser.urlbar.maxHistoricalSearchSuggestions", 2],
],
});
gEngine = await SearchTestUtils.promiseNewSearchEngine({
gEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
});
gEngine2 = await SearchTestUtils.promiseNewSearchEngine({
gEngine2 = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE2_BASENAME,
});
let oldDefaultEngine = await Services.search.getDefault();

View File

@@ -19,7 +19,7 @@ const TEST_SPACES = [" ", "\u3000", " \u3000", "\u3000 "];
let defaultEngine, aliasEngine;
add_setup(async function () {
defaultEngine = await SearchTestUtils.promiseNewSearchEngine({
defaultEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -23,7 +23,7 @@ let suggestionsEngine;
let defaultEngine;
add_setup(async function () {
suggestionsEngine = await SearchTestUtils.promiseNewSearchEngine({
suggestionsEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + SUGGESTIONS_ENGINE_NAME,
});

View File

@@ -21,7 +21,7 @@ add_setup(async function () {
["browser.urlbar.shortcuts.quickactions", false],
],
});
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + SUGGESTIONS_ENGINE_NAME,
setAsDefault: true,
});

View File

@@ -236,7 +236,7 @@ add_task(async function backspaceRemainOpen() {
// Types a search alias and then a space to enter search mode, with no results.
// The one-offs should be shown.
add_task(async function spaceToEnterSearchMode() {
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
});
engine.alias = "@test";

View File

@@ -16,7 +16,7 @@ let suggestionsEngine;
let expectedFormHistoryResults = [];
add_setup(async function () {
suggestionsEngine = await SearchTestUtils.promiseNewSearchEngine({
suggestionsEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + SUGGESTIONS_ENGINE_NAME,
});
@@ -244,7 +244,7 @@ add_task(async function nonEmptySearch_nonMatching() {
});
add_task(async function nonEmptySearch_withHistory() {
let manySuggestionsEngine = await SearchTestUtils.promiseNewSearchEngine({
let manySuggestionsEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + MANY_SUGGESTIONS_ENGINE_NAME,
});
// URLs with the same host as the search engine.

View File

@@ -17,7 +17,7 @@ const MAX_CHARS_PREF = "browser.urlbar.maxCharsForSearchSuggestions";
add_task(async function prepare() {
let suggestionsEnabled = Services.prefs.getBoolPref(SUGGEST_URLBAR_PREF);
Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, true);
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -13,7 +13,7 @@ add_task(async function prepare() {
],
});
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -183,7 +183,7 @@ add_task(async function staleReplacedWithFresh() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.suggest.searches", true]],
});
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngineSlow.xml",
});
let oldDefaultEngine = await Services.search.getDefault();

View File

@@ -33,14 +33,14 @@ add_setup(async function () {
// Add a search suggestion engine and move it to the front so that it appears
// as the first one-off.
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
setAsDefault: true,
setAsDefaultPrivate: true,
});
// Add another engine in the first one-off position.
let engine2 = await SearchTestUtils.promiseNewSearchEngine({
let engine2 = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "POSTSearchEngine.xml",
});
await Services.search.moveEngine(engine2, 0);

View File

@@ -34,17 +34,17 @@ add_setup(async function () {
// Add a search suggestion engine and move it to the front so that it appears
// as the first one-off.
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine.xml",
setAsDefault: true,
});
gPrivateEngine = await SearchTestUtils.promiseNewSearchEngine({
gPrivateEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "searchSuggestionEngine2.xml",
setAsDefaultPrivate: true,
});
// Add another engine in the first one-off position.
let engine2 = await SearchTestUtils.promiseNewSearchEngine({
let engine2 = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "POSTSearchEngine.xml",
});
await Services.search.moveEngine(engine2, 0);

View File

@@ -42,7 +42,7 @@ add_setup(async function () {
},
]);
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -24,7 +24,7 @@ add_setup(async function () {
set: [["browser.urlbar.suggest.searches", true]],
});
// Add a test search engine that returns suggestions on a delay.
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -24,7 +24,7 @@ if (AppConstants.platform == "macosx") {
add_setup(async function () {
// Add a default engine with suggestions, to avoid hitting the network when
// fetching them.
let defaultEngine = await SearchTestUtils.promiseNewSearchEngine({
let defaultEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -71,7 +71,7 @@ async function clickURLBarSuggestion(resultTitle, button = 1) {
* The function to run with the new search engine as default.
*/
async function withNewSearchEngine(taskFn) {
let suggestionEngine = await SearchTestUtils.promiseNewSearchEngine({
let suggestionEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "urlbarTelemetrySearchSuggestions.xml",
});
let previousEngine = await Services.search.getDefault();

View File

@@ -92,7 +92,7 @@ add_setup(async function () {
// Create an engine to generate search suggestions and add it as default
// for this test.
let suggestionEngine = await SearchTestUtils.promiseNewSearchEngine({
let suggestionEngine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + "urlbarTelemetrySearchSuggestions.xml",
setAsDefault: true,
});

View File

@@ -44,7 +44,7 @@ add_setup(async function () {
],
});
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
setAsDefault: true,
});

View File

@@ -17,7 +17,7 @@ add_setup(async function () {
["browser.urlbar.showSearchTerms.featureGate", true],
],
});
const engine = await SearchTestUtils.promiseNewSearchEngine({
const engine = await SearchTestUtils.installOpenSearchEngine({
url: "chrome://mochitests/content/browser/browser/components/urlbar/tests/browser/searchSuggestionEngine.xml",
});
const originalDefaultEngine = await Services.search.getDefault();

View File

@@ -410,7 +410,7 @@ async function setup() {
],
});
const engine = await SearchTestUtils.promiseNewSearchEngine({
const engine = await SearchTestUtils.installOpenSearchEngine({
url: "chrome://mochitests/content/browser/browser/components/urlbar/tests/browser/searchSuggestionEngine.xml",
});
const originalDefaultEngine = await Services.search.getDefault();

View File

@@ -329,7 +329,7 @@ async function withSuggestions(callback) {
await SpecialPowers.pushPrefEnv({
set: [[SUGGESTIONS_PREF, true]],
});
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME,
});
let oldDefaultEngine = await Services.search.getDefault();

View File

@@ -125,13 +125,13 @@ async function addTestEngines() {
// This is a hack, ideally we should be setting up a configuration with
// built-in engines, but the `chrome_settings_overrides` section that
// WebExtensions need is only defined for browser/
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}/engine.xml`,
});
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}/enginePrivate.xml`,
});
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}/enginePost.xml`,
});
}

View File

@@ -51,7 +51,7 @@ export var SearchTestUtils = {
* @returns {Promise} Returns a promise that is resolved with the new engine
* or rejected if it fails.
*/
async promiseNewSearchEngine({
async installOpenSearchEngine({
url,
setAsDefault = false,
setAsDefaultPrivate = false,

View File

@@ -20,10 +20,10 @@ add_setup(async () => {
await Services.search.init();
engine1 = await SearchTestUtils.promiseNewSearchEngine({
engine1 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine.xml`,
});
engine2 = await SearchTestUtils.promiseNewSearchEngine({
engine2 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine2.xml`,
});
});
@@ -83,7 +83,7 @@ add_task(async function test_defaultEngine() {
});
add_task(async function test_telemetry_empty_submission_url() {
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}../opensearch/simple.xml`,
setAsDefaultPrivate: true,
});

View File

@@ -402,7 +402,7 @@ async function checkNonBuiltinFallback(checkPrivate) {
: SearchUtils.MODIFIED_TYPE.DEFAULT;
Services.search.restoreDefaultEngines();
let addedEngine = await SearchTestUtils.promiseNewSearchEngine({
let addedEngine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine2.xml`,
});

View File

@@ -233,7 +233,7 @@ add_task(async function test_defaultPrivateEngine() {
});
add_task(async function test_telemetry_private_empty_submission_url() {
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}simple.xml`,
setAsDefaultPrivate: true,
});

View File

@@ -142,7 +142,7 @@ add_task(async function test_user_engine_id() {
});
add_task(async function test_open_search_engine_id() {
let openSearchEngine = await SearchTestUtils.promiseNewSearchEngine({
let openSearchEngine = await SearchTestUtils.installOpenSearchEngine({
url: gDataUrl + "simple.xml",
});

View File

@@ -18,7 +18,7 @@ add_setup(async function () {
);
useHttpServer();
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine.xml`,
});
});

View File

@@ -13,7 +13,7 @@ add_setup(async function () {
});
add_task(async function test_migrateLegacyEngine() {
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: gDataUrl + "simple.xml",
});
@@ -50,7 +50,7 @@ add_task(async function test_migrateLegacyEngine() {
});
add_task(async function test_migrateLegacyEngineDifferentName() {
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: gDataUrl + "simple.xml",
});

View File

@@ -22,10 +22,10 @@ add_setup(async function () {
});
add_task(async function test_nodb_pluschanges() {
let engine1 = await SearchTestUtils.promiseNewSearchEngine({
let engine1 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine.xml`,
});
let engine2 = await SearchTestUtils.promiseNewSearchEngine({
let engine2 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine2.xml`,
});
await promiseAfterSettings();

View File

@@ -32,7 +32,7 @@ add_task(async function test_addingEngine_opensearch() {
SearchUtils.MODIFIED_TYPE.ADDED
);
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: gDataUrl + "engine.xml",
});

View File

@@ -82,7 +82,7 @@ for (const test of tests) {
SearchUtils.MODIFIED_TYPE.ADDED,
SearchUtils.TOPIC_ENGINE_MODIFIED
);
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: gDataUrl + test.file,
});
await promiseEngineAdded;

View File

@@ -48,7 +48,7 @@ add_task(async function test_icon_types() {
};
// The easiest way to test adding the icon is via a generated xml, otherwise
// we have to somehow insert the address of the server into it.
SearchTestUtils.promiseNewSearchEngine({
SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify(engineData)}`,
});
let engine = await promiseEngineAdded;
@@ -65,7 +65,7 @@ add_task(async function test_icon_types() {
});
add_task(async function test_multiple_icons_in_file() {
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineImages.xml`,
});

View File

@@ -13,11 +13,11 @@ add_setup(async function () {
add_task(async function test_installedresourceicon() {
// Attempts to load a resource:// url as an icon.
let engine1 = await SearchTestUtils.promiseNewSearchEngine({
let engine1 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}opensearch/resourceicon.xml`,
});
// Attempts to load a chrome:// url as an icon.
let engine2 = await SearchTestUtils.promiseNewSearchEngine({
let engine2 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}opensearch/chromeicon.xml`,
});
@@ -35,7 +35,7 @@ add_task(async function test_installedhttpplace() {
// The easiest way to test adding the icon is via a generated xml, otherwise
// we have to somehow insert the address of the server into it.
// Attempts to load a non-image page into an image icon.
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url:
`${gDataUrl}data/engineMaker.sjs?` +
JSON.stringify({

View File

@@ -46,7 +46,7 @@ add_setup(async function () {
await Services.search.init();
for (let file of openSearchEngineFiles) {
await SearchTestUtils.promiseNewSearchEngine({ url: gDataUrl + file });
await SearchTestUtils.installOpenSearchEngine({ url: gDataUrl + file });
}
registerCleanupFunction(async () => {

View File

@@ -33,7 +33,7 @@ add_task(async function test_installEngine_with_updates_disabled() {
"Should not have registered the update timer already"
);
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}data/engineMaker.sjs?${JSON.stringify(engineData)}`,
});
@@ -62,7 +62,7 @@ add_task(async function test_installEngine_with_updates_enabled() {
"Should not have registered the update timer already"
);
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}data/engineMaker.sjs?${JSON.stringify(engineData)}`,
});

View File

@@ -551,7 +551,7 @@ async function assertCorrectlySwitchedWhenExtended(
let engine;
if (testOpenSearch) {
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify({
baseURL: SEARCH_URL_BASE,
queryString: SEARCH_URL_PARAMS,

View File

@@ -13,10 +13,10 @@ add_task(async function setup() {
});
add_task(async function test_parseSubmissionURL() {
let engine1 = await SearchTestUtils.promiseNewSearchEngine({
let engine1 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine.xml`,
});
let engine2 = await SearchTestUtils.promiseNewSearchEngine({
let engine2 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine-fr.xml`,
});
@@ -36,7 +36,7 @@ add_task(async function test_parseSubmissionURL() {
// The following engine provides it's query keyword in
// its template in the form of q={searchTerms}
let engine5 = await SearchTestUtils.promiseNewSearchEngine({
let engine5 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine2.xml`,
});

View File

@@ -130,7 +130,7 @@ add_task(async function test_reload_engines_with_duplicate() {
);
// Simulate a user installing a search engine that shares the same name as an
// application provided search engine not currently installed in their browser.
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify({
baseURL: gDataUrl,
name: "engine-pref",

View File

@@ -19,10 +19,10 @@ add_setup(async function () {
});
add_task(async function test_save_sorted_engines() {
let engine1 = await SearchTestUtils.promiseNewSearchEngine({
let engine1 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine.xml`,
});
let engine2 = await SearchTestUtils.promiseNewSearchEngine({
let engine2 = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine2.xml`,
});
await promiseAfterSettings();

View File

@@ -72,16 +72,16 @@ add_setup(async function () {
alternativeJSONType: true,
};
getEngine = await SearchTestUtils.promiseNewSearchEngine({
getEngine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify(getEngineData)}`,
});
postEngine = await SearchTestUtils.promiseNewSearchEngine({
postEngine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify(postEngineData)}`,
});
unresolvableEngine = await SearchTestUtils.promiseNewSearchEngine({
unresolvableEngine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify(unresolvableEngineData)}`,
});
alternateJSONEngine = await SearchTestUtils.promiseNewSearchEngine({
alternateJSONEngine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify(
alternateJSONSuggestEngineData
)}`,

View File

@@ -79,14 +79,14 @@ add_setup(async function () {
let unicodeName = ["\u30a8", "\u30c9"].join("");
engines = [
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify({
baseURL: gDataUrl,
name: unicodeName,
method: "GET",
})}`,
}),
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify({
baseURL: gDataUrl,
name: "engine two",

View File

@@ -28,7 +28,7 @@ add_setup(async function () {
method: "GET",
};
engine = await SearchTestUtils.promiseNewSearchEngine({
engine = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engineMaker.sjs?${JSON.stringify(engineData)}`,
});
});

View File

@@ -158,7 +158,7 @@ add_task(async function test_searchTermFromResult() {
await useHttpServer();
// For ISO-8859-1 encoding testing.
let engineISOCharset = await SearchTestUtils.promiseNewSearchEngine({
let engineISOCharset = await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine-fr.xml`,
});

View File

@@ -17,7 +17,7 @@ add_setup(async function () {
// Check that the default engine matches the defaultenginename pref
add_task(async function test_defaultEngine() {
await Services.search.init();
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine.xml`,
});

View File

@@ -30,7 +30,7 @@ add_task(async function test_nosettings() {
settingsFile.append(SETTINGS_FILENAME);
Assert.ok(settingsFile.exists());
await SearchTestUtils.promiseNewSearchEngine({
await SearchTestUtils.installOpenSearchEngine({
url: `${gDataUrl}engine.xml`,
});

View File

@@ -267,7 +267,7 @@ add_task(async function test_defaultSearchEngine() {
resolve
);
});
let engine = await SearchTestUtils.promiseNewSearchEngine({
let engine = await SearchTestUtils.installOpenSearchEngine({
url: gDataRoot + "engine.xml",
setAsDefault: true,
skipReset: true,