Commit fcf359aa authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1791974 - Add set as default (private) search engine options to... 

Bug 1791974 - Add set as default (private) search engine options to SearchTestUtils.installSearchExtension. r=mcheang

and convert existing would-be-broken consumers to use the new format arguments

Differential Revision: https://phabricator.services.mozilla.com/D161044
parent 7dbd48b3

browser/components/urlbar/tests/browser/browser_searchMode_engineRemoval.js

+12 −3
Original line number Diff line number Diff line
@@ -10,7 +10,10 @@ 
// Tests that we exit search mode in the active tab when the search mode engine

// is removed.

add_task(async function activeTab() {

  let extension = await SearchTestUtils.installSearchExtension({}, true);

  let extension = await SearchTestUtils.installSearchExtension(

    {},

    { skipUnload: true }

  );

  let engine = Services.search.getEngineByName("Example");

  await Services.search.moveEngine(engine, 0);
@@ -32,7 +35,10 @@ add_task(async function activeTab() { 
// Tests that we exit search mode in a background tab when the search mode

// engine is removed.

add_task(async function backgroundTab() {

  let extension = await SearchTestUtils.installSearchExtension({}, true);

  let extension = await SearchTestUtils.installSearchExtension(

    {},

    { skipUnload: true }

  );

  let engine = Services.search.getEngineByName("Example");

  await Services.search.moveEngine(engine, 0);
@@ -67,7 +73,10 @@ add_task(async function backgroundTab() { 
// Tests that we exit search mode in a background window when the search mode

// engine is removed.

add_task(async function backgroundWindow() {

  let extension = await SearchTestUtils.installSearchExtension({}, true);

  let extension = await SearchTestUtils.installSearchExtension(

    {},

    { skipUnload: true }

  );

  let engine = Services.search.getEngineByName("Example");

  await Services.search.moveEngine(engine, 0);

browser/components/urlbar/tests/browser/browser_searchMode_switchTabs.js

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ add_task(async function slow_load() { 
    {

      name: engineName,

    },

    true

    { skipUnload: true }

  );



  const originalTab = gBrowser.selectedTab;
@@ -238,7 +238,7 @@ add_task(async function slow_load_guaranteed() { 
    {

      name: engineName,

    },

    true

    { skipUnload: true }

  );



  const backgroundTab = BrowserTestUtils.addTab(gBrowser);

browser/components/urlbar/tests/browser/browser_tabToSearch.js

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ add_task(async function onboard_multipleEnginesForHostname() { 
      name: `${TEST_ENGINE_NAME}Maps`,

      search_url: `https://${TEST_ENGINE_DOMAIN}/maps/`,

    },

    true

    { skipUnload: true }

  );



  await UrlbarTestUtils.promiseAutocompleteResultPopup({

browser/components/urlbar/tests/browser/browser_tokenAlias.js

+2 −2
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ add_task(async function nonPrefixedKeyword() { 
      name,

      keyword: alias,

    },

    true

    { skipUnload: true }

  );



  await UrlbarTestUtils.promiseAutocompleteResultPopup({
@@ -696,7 +696,7 @@ add_task(async function multipleMatchingEngines() { 
      name: "TestFoo",

      keyword: `${ALIAS}foo`,

    },

    true

    { skipUnload: true }

  );



  await UrlbarTestUtils.promiseAutocompleteResultPopup({

browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tabtosearch.js

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ async function impressions_test(isOnboarding) { 
        name: `${ENGINE_NAME}2`,

        search_url: `https://${firstEngineHost}-2.com/`,

      },

      true

      { skipUnload: true }

    );



    for (let i = 0; i < 3; i++) {