Bug 2069345 - Remove test.wait300msAfterTabSwitch from tests fixed by waiting for the tab to be reflowed. r=firefox-desktop-core-reviewers ,search-reviewers,tabbrowser-reviewers,layout-reviewers,nsharpley,dshin,scunnane,Gijs

Depends on D323604 Differential Revision: https://phabricator.services.mozilla.com/D323605
2026-09-05 06:09:56 +00:00
parent 4ec29ad679
commit a2ae8bedb3
51 changed files with 16 additions and 248 deletions
@@ -3,12 +3,6 @@

 "use strict";

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 /**
 * Check that we show the inspect item(s) as appropriate.
 */
@@ -19,12 +19,6 @@ function mockPromptService() {
  return promptService;
 }

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function test_save_link_blocked_by_extension() {
  let ext = ExtensionTestUtils.loadExtension({
    manifest: {
@@ -4,12 +4,6 @@

 "use strict";

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 // Adapted from widget/tests/file_test_clipboard_pngPreservesTransparency.js
 async function getPNGFromClipboard(clipboard) {
  let trans = Cc["@mozilla.org/widget/transferable;1"].createInstance(
@@ -10,10 +10,7 @@ let url =

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["privacy.query_stripping.strip_list", "stripParam"],
-    ],
+    set: [["privacy.query_stripping.strip_list", "stripParam"]],
  });

  // Get the list service so we can wait for it to be fully initialized before running tests.
@@ -10,10 +10,7 @@ const TEST_URL =

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["privacy.query_stripping.strip_list", "stripParam"],
-    ],
+    set: [["privacy.query_stripping.strip_list", "stripParam"]],
  });

  // Get the list service so we can wait for it to be fully initialized before running tests.
@@ -288,10 +288,7 @@ async function doSelectTests(contentType, content) {

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["dom.forms.select.customstyling", true],
-    ],
+    set: [["dom.forms.select.customstyling", true]],
  });
 });

@@ -15,10 +15,7 @@ const TESTS = [

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["dom.forms.select.customstyling", true],
-    ],
+    set: [["dom.forms.select.customstyling", true]],
  });
 });

@@ -475,10 +475,7 @@ let kDefaultSelectStyles = {};

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["dom.forms.select.customstyling", true],
-    ],
+    set: [["dom.forms.select.customstyling", true]],
  });
  kDefaultSelectStyles = await BrowserTestUtils.withNewTab(
    `data:text/html,<select>`,
@@ -6,12 +6,6 @@ const PAGE = `
 </select>
 `;

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function () {
  const url = "data:text/html," + encodeURI(PAGE);
  await BrowserTestUtils.withNewTab({ gBrowser, url }, async function () {
@@ -12,12 +12,6 @@ function tick() {
  );
 }

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function () {
  const url = "data:text/html," + encodeURI(PAGE);
  await BrowserTestUtils.withNewTab(
@@ -12,10 +12,7 @@ const PAGE_CONTENT = `
 // select is enabled, so the dropdown has to list every <option> either way.
 async function testOptionsInDiv(customizableSelect) {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["dom.select.customizable_select.enabled", customizableSelect],
-    ],
+    set: [["dom.select.customizable_select.enabled", customizableSelect]],
  });

  const pageUrl = "data:text/html," + encodeURIComponent(PAGE_CONTENT);
@@ -8,10 +8,7 @@ SELECT +=

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["dom.forms.selectSearch", true],
-    ],
+    set: [["dom.forms.selectSearch", true]],
  });
 });

@@ -6,12 +6,6 @@ const PAGE = `
 </select>
 `;

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [["dom.forms.select.customstyling", true]],
@@ -71,10 +71,7 @@ async function testHandlingUserInputOnChange(aTriggerFn) {

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["widget.macos.allow-native-select", false],
-    ],
+    set: [["widget.macos.allow-native-select", false]],
  });
 });

@@ -14,10 +14,7 @@ function tick() {

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["widget.macos.allow-native-select", false],
-    ],
+    set: [["widget.macos.allow-native-select", false]],
  });
 });

@@ -14,12 +14,6 @@ const PAGE = `<?xml version="1.0"?>
 </html>
 `;

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function () {
  const url = "data:application/xhtml+xml," + encodeURI(PAGE);
  await BrowserTestUtils.withNewTab(
@@ -4,12 +4,6 @@
 const PAGE =
  "data:text/html;charset=utf-8,<a href='%23xxx'><span>word1 <span> word2 </span></span><span> word3</span></a>";

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 /**
 * Tests that we correctly compute the text for context menu
 * selection of some content.
@@ -54,12 +54,6 @@ async function clean_up() {
  BrowserTestUtils.removeTab(gBrowser.selectedTab);
 }

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function test_alt_click() {
  await setup();

@@ -5,11 +5,7 @@ const middleMousePastePref = "middlemouse.contentLoadURL";
 const autoScrollPref = "general.autoScroll";

 add_task(async function () {
-  await pushPrefs(
-    ["test.wait300msAfterTabSwitch", true],
-    [middleMousePastePref, true],
-    [autoScrollPref, false]
-  );
+  await pushPrefs([middleMousePastePref, true], [autoScrollPref, false]);

  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);

@@ -7,12 +7,6 @@

 const PAGE = `data:text/html,<a id="target" href="%23" onclick="window.open('http://www.example.com', '_blank', 'width=100,height=100');">Click me</a>`;

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 /**
 * Test that when a new window is opened from content, focus moves
 * to the initial browser in that window once the window has finished
@@ -18,12 +18,6 @@ MockFilePicker.init();
 * they are.
 */

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 /**
 * Test the above with the "save image as" context menu.
 */
@@ -3,10 +3,6 @@
 "use strict";

 add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-
  await setupPolicyEngineWithJson({
    policies: {
      DisableSetDesktopBackground: true,
@@ -1,11 +1,5 @@
 "use strict";

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 // Test that different types of events are all considered
 // "handling user input".
 add_task(async function testSources() {
@@ -28,12 +28,6 @@ async function waitMenuState(menu, shouldHide, description) {
  }, description);
 }

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 registerCleanupFunction(() => {
  Services.prefs.clearUserPref("browser.ml.chat.page.menuBadge");
 });
@@ -112,12 +112,6 @@ function assertContextMenuStubResult(stub) {
 // Schedule reset to the initial sidebar state after the test.
 SidebarTestUtils.restoreStateAtCleanup(window);

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 /**
 * Check page, tab, and tool context menu have summarize prompt
 */
@@ -9,10 +9,6 @@ const TEST_TAG = "tag";

 // Setup.
 add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-
  let toolbar = document.getElementById("PersonalToolbar");
  let wasCollapsed = toolbar.collapsed;

@@ -4,12 +4,6 @@
 *   minimum values.
 */

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 OpenTest.run([
  {
    settingWidth: 199,
@@ -5,10 +5,7 @@

 add_task(async function test_download_shortcut() {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["browser.download.useDownloadDir", true],
-    ],
+    set: [["browser.download.useDownloadDir", true]],
  });

  let publicDownloads = await Downloads.getList(Downloads.PUBLIC);
@@ -185,7 +185,6 @@ add_setup(async function () {
  await IOUtils.makeDirectory(tmpDir);
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["test.wait300msAfterTabSwitch", true],
      ["browser.download.start_downloads_in_tmp_dir", true],
      ["browser.helperApps.deleteTempFileOnExit", true],
      ["browser.download.folderList", 2],
@@ -38,10 +38,6 @@ let oldDefaultEngine;
 let oldDefaultPrivateEngine;

 add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-
  await SearchService.init();

  for (let [name, search_url] of ENGINE_DATA) {
@@ -23,10 +23,7 @@ const kAboutPagesRegistered = Promise.all([
 add_task(async function test_principal_click() {
  await kAboutPagesRegistered;
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["dom.security.skip_about_page_has_csp_assert", true],
-    ],
+    set: [["dom.security.skip_about_page_has_csp_assert", true]],
  });
  await BrowserTestUtils.withNewTab(
    "about:test-about-principal-parent",
@@ -11,12 +11,6 @@ Services.scriptloader.loadSubScript(
  this
 );

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function normal_page__blank_target() {
  await doTestWithNewWindow({
    link: "wait-a-bit--blank-target",
@@ -422,12 +422,6 @@ async function doTest(
  await promiseBrowserStateRestored(oldState);
 }

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function test_settings_insertRelatedAfter() {
  // Firefox default settings.
  await doTest(true, false, false);
@@ -2,10 +2,7 @@

 add_setup(() =>
  SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["browser.tabs.groups.enabled", true],
-    ],
+    set: [["browser.tabs.groups.enabled", true]],
  })
 );

@@ -27,12 +27,6 @@ const middleShiftEvent = { button: 1, shiftKey: true };
 const middleMetaEvent = { button: 1, [metaKey]: true };
 const middleMetaShiftEvent = { button: 1, [metaKey]: true, shiftKey: true };

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function testMouse() {
  await BrowserTestUtils.withNewTab(TEST_URL, async function (browser) {
    const tests = [
@@ -12,10 +12,7 @@ add_task(async function () {
  await new Promise(resolve => {
    SpecialPowers.pushPrefEnv(
      {
-        set: [
-          ["test.wait300msAfterTabSwitch", true],
-          ["browser.link.open_newwindow", 2],
-        ],
+        set: [["browser.link.open_newwindow", 2]],
      },
      resolve
    );
@@ -22,12 +22,6 @@ const HTML = `
  </form>
 `;

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function bug_1790128() {
  await BrowserTestUtils.withNewTab(
    {
@@ -37,12 +37,6 @@ async function test_browser_outline_refocus(
  });
 }

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function browser_outline_refocus_mouse() {
  await test_browser_outline_refocus(
    "Link shouldn't show outlines since it was originally focused by mouse",
@@ -91,7 +91,6 @@ add_setup(async function init() {

  await SpecialPowers.pushPrefEnv({
    set: [
-      ["test.wait300msAfterTabSwitch", true],
      ["test.events.async.enabled", true],
      // This test aims to synthesize mousemove events at specific times, so
      // disable the automatically synthesized mousemove events during reflow.
@@ -34,12 +34,6 @@ async function waitForWarningState(aWarningElement, aExpectedState) {
  );
 }

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 // Make sure the pointerlock warning is shown and exited with the escape key
 add_task(async function show_pointerlock_warning_escape() {
  let urls = [TEST_URL, FRAME_TEST_URL];
@@ -22,12 +22,6 @@ const PAGE_URL =
  "data:text/html," +
  encodeURIComponent("<script>(" + pageScript.toSource() + ")();</script>");

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function doClick() {
  // The onbeforeunload dialog should appear.
  let dialogPromise = PromptTestUtils.waitForPrompt(null, {
@@ -61,10 +61,6 @@ async function test_clicking_select_window_open(aIsPopup) {

 // The select dropdown is created lazily, so initial it first.
 add_setup(async function init_select_popup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-
  await BrowserTestUtils.withNewTab(
    {
      gBrowser,
@@ -14,7 +14,6 @@ const TEST_PAGE = `data:text/html,
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["test.wait300msAfterTabSwitch", true],
      // Enable restriction feature.
      ["places.history.floodingPrevention.enabled", true],
      // Restrict from the second visit.
@@ -21,12 +21,6 @@ const OPEN_NOOPENER_WINDOW = `
  <a rel="noopener" target="_blank" href="${OPENED_URI}">Open the window</a>
 `;

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function test_bc_id_overflow() {
  is(document.querySelector(".printPreviewBrowser"), null);

@@ -1,12 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 /**
 * These tests ensure that capturing a sites's thumbnail, saving it and
 * retrieving it from the cache works.
@@ -14,12 +14,6 @@ function getSVGUrl(fill) {
  );
 }

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function test_capture_svg() {
  // Create a tab with a red background.
  await BrowserTestUtils.withNewTab(
@@ -5,12 +5,6 @@
 const frameSource = `<a href="about:mozilla">good</a>`;
 const source = `<html><iframe srcdoc='${frameSource}' id="f"></iframe></html>`;

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 add_task(async function () {
  let url = `data:text/html,${source}`;
  await BrowserTestUtils.withNewTab({ gBrowser, url }, checkFrameSource);
@@ -11,10 +11,7 @@ const SCRIPT_PAGE = `data:text/html,<script>window.open("about:blank", "_blank")
 // of a new tab.
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["test.wait300msAfterTabSwitch", true],
-      ["browser.link.open_newwindow", 2],
-    ],
+    set: [["browser.link.open_newwindow", 2]],
  });
 });

@@ -6,12 +6,6 @@
 * doggy.png in file picker dialog.
 */

-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
-
 let MockFilePicker = SpecialPowers.MockFilePicker;
 MockFilePicker.init();
 add_task(async function () {
@@ -1,11 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */

-add_task(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["test.wait300msAfterTabSwitch", true]],
-  });
-});
+add_task(async function () {});

 add_task(async function test_toTopLevelWidgetRect() {
  const tab = await BrowserTestUtils.openNewForegroundTab(
@@ -90,7 +90,6 @@ async function setupFilePicker() {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["test.wait300msAfterTabSwitch", true],
      ["browser.download.always_ask_before_handling_new_types", false],
      ["browser.download.useDownloadDir", false],
    ],