Commit 7e3d5604 authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1791974 - Use setAsDefault* parameters where appropriate for consumers of...

Bug 1791974 - Use setAsDefault* parameters where appropriate for consumers of SearchTestUtils.installSearchExtension. r=mcheang

Differential Revision: https://phabricator.services.mozilla.com/D161045
parent fcf359aa
Loading
Loading
Loading
Loading
+7 −15
Original line number Diff line number Diff line
@@ -10,28 +10,20 @@ registerCleanupFunction(async function cleanup() {
  while (gBrowser.tabs.length > 1) {
    BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
  }
  await Services.search.setDefault(
    originalEngine,
    Ci.nsISearchService.CHANGE_REASON_UNKNOWN
  );
});

let originalEngine;
add_task(async function test_setup() {
  // This test opens multiple tabs and some confirm dialogs, that takes long.
  requestLongerTimeout(2);

  // Stop search-engine loads from hitting the network
  await SearchTestUtils.installSearchExtension({
  await SearchTestUtils.installSearchExtension(
    {
      name: "MozSearch",
      search_url: "https://example.com/",
      search_url_get_params: "q={searchTerms}",
  });
  let engine = Services.search.getEngineByName("MozSearch");
  originalEngine = await Services.search.getDefault();
  await Services.search.setDefault(
    engine,
    Ci.nsISearchService.CHANGE_REASON_UNKNOWN
    },
    { setAsDefault: true }
  );
});

+7 −18
Original line number Diff line number Diff line
@@ -4,29 +4,18 @@ const { SearchTestUtils } = ChromeUtils.importESModule(

SearchTestUtils.init(this);

registerCleanupFunction(async function cleanup() {
  await Services.search.setDefault(
    originalEngine,
    Ci.nsISearchService.CHANGE_REASON_UNKNOWN
  );
});

let originalEngine;
add_task(async function test_setup() {
  // Opening multiple windows on debug build takes too long time.
  requestLongerTimeout(10);

  // Stop search-engine loads from hitting the network
  await SearchTestUtils.installSearchExtension({
  await SearchTestUtils.installSearchExtension(
    {
      name: "MozSearch",
      search_url: "https://example.com/",
      search_url_get_params: "q={searchTerms}",
  });
  let engine = Services.search.getEngineByName("MozSearch");
  originalEngine = await Services.search.getDefault();
  await Services.search.setDefault(
    engine,
    Ci.nsISearchService.CHANGE_REASON_UNKNOWN
    },
    { setAsDefault: true }
  );

  // Move New Window button to nav bar, to make it possible to drag and drop.
+7 −15
Original line number Diff line number Diff line
@@ -13,25 +13,17 @@ registerCleanupFunction(async function cleanup() {
  while (gBrowser.tabs.length > 1) {
    BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
  }
  await Services.search.setDefault(
    originalEngine,
    Ci.nsISearchService.CHANGE_REASON_UNKNOWN
  );
});

let originalEngine;
add_task(async function test_setup() {
  // Stop search-engine loads from hitting the network
  await SearchTestUtils.installSearchExtension({
  await SearchTestUtils.installSearchExtension(
    {
      name: "MozSearch",
      search_url: "https://example.com/",
      search_url_get_params: "q={searchTerms}",
  });
  let engine = Services.search.getEngineByName("MozSearch");
  originalEngine = await Services.search.getDefault();
  await Services.search.setDefault(
    engine,
    Ci.nsISearchService.CHANGE_REASON_UNKNOWN
    },
    { setAsDefault: true }
  );
});

+7 −18
Original line number Diff line number Diff line
@@ -17,25 +17,14 @@ add_setup(async function() {
  });

  // Create an engine to use for the test.
  await SearchTestUtils.installSearchExtension({
  await SearchTestUtils.installSearchExtension(
    {
      name: "MozSearch",
      search_url: "https://example.com/",
      search_url_get_params: "q={searchTerms}",
  });

  let originalEngine = await Services.search.getDefault();
  let engineDefault = Services.search.getEngineByName("MozSearch");
  await Services.search.setDefault(
    engineDefault,
    Ci.nsISearchService.CHANGE_REASON_UNKNOWN
    },
    { setAsDefault: true }
  );

  registerCleanupFunction(async function() {
    await Services.search.setDefault(
      originalEngine,
      Ci.nsISearchService.CHANGE_REASON_UNKNOWN
    );
  });
});

/*
+7 −7
Original line number Diff line number Diff line
@@ -70,13 +70,13 @@ add_task(async function startup() {
  // Add a test engine and make it default so that when we do searches below,
  // Firefox doesn't try to include search suggestions from the actual default
  // engine from over the network.
  await SearchTestUtils.installSearchExtension({
  await SearchTestUtils.installSearchExtension(
    {
      name: "Test engine",
      keyword: "@testengine",
      search_url_get_params: "s={searchTerms}",
  });
  Services.search.defaultEngine = Services.search.getEngineByName(
    "Test engine"
    },
    { setAsDefault: true }
  );
});

Loading