From cbfad78f9266f06a8d48058650a1fe4e2a81e992 Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Mon, 10 Oct 2022 22:22:02 +0000 Subject: [PATCH] Bug 1793227, part 9 - Automated fixes for js/xpconnect/tests/browser/. r=kmag Differential Revision: https://phabricator.services.mozilla.com/D158508 --- .eslintignore | 1 - .../browser_parent_process_hang_telemetry.js | 16 ++++++++--- ...browser_promise_userInteractionHandling.js | 28 +++++++++++++------ .../browser_realm_key_and_document_domain.js | 21 +++++++------- 4 files changed, 43 insertions(+), 23 deletions(-) diff --git a/.eslintignore b/.eslintignore index a25fa08809c6..754d372bd350 100644 --- a/.eslintignore +++ b/.eslintignore @@ -144,7 +144,6 @@ js/src/tests/ js/src/Y.js # Changes to XPConnect tests must be carefully audited. -js/xpconnect/tests/browser/ js/xpconnect/tests/mochitest/ js/xpconnect/tests/unit/ diff --git a/js/xpconnect/tests/browser/browser_parent_process_hang_telemetry.js b/js/xpconnect/tests/browser/browser_parent_process_hang_telemetry.js index dcfdb6bf077c..f9b325c2168b 100644 --- a/js/xpconnect/tests/browser/browser_parent_process_hang_telemetry.js +++ b/js/xpconnect/tests/browser/browser_parent_process_hang_telemetry.js @@ -12,7 +12,7 @@ add_task(async function test_browser_hang() { // Trip some testing code to ensure we can test this. Sadly, this is a magic // number corresponding to code in XPCJSContext.cpp await SpecialPowers.pushPrefEnv({ - set: [["dom.max_chrome_script_run_time", 2]] + set: [["dom.max_chrome_script_run_time", 2]], }); await SpecialPowers.promiseTimeout(0); @@ -39,14 +39,22 @@ add_task(async function test_browser_hang() { ); return events.parent?.some(e => e[1] == "slow_script_warning"); }, "Should find an event after doing this.").catch(e => ok(false, e)); - events = (events.parent || []); + events = events.parent || []; let event = events.find(e => e[1] == "slow_script_warning"); ok(event, "Should have registered an event."); if (event) { is(event[3], "browser", "Should register as browser hang."); let args = event[5]; is(args.uri_type, "browser", "Should register browser uri type."); - Assert.greater(duration + 1, parseFloat(args.hang_duration), "hang duration should not exaggerate."); - Assert.less(duration - 1, parseFloat(args.hang_duration), "hang duration should not undersell."); + Assert.greater( + duration + 1, + parseFloat(args.hang_duration), + "hang duration should not exaggerate." + ); + Assert.less( + duration - 1, + parseFloat(args.hang_duration), + "hang duration should not undersell." + ); } }); diff --git a/js/xpconnect/tests/browser/browser_promise_userInteractionHandling.js b/js/xpconnect/tests/browser/browser_promise_userInteractionHandling.js index 61fc8c8c1e74..c3b7aac09da2 100644 --- a/js/xpconnect/tests/browser/browser_promise_userInteractionHandling.js +++ b/js/xpconnect/tests/browser/browser_promise_userInteractionHandling.js @@ -6,28 +6,40 @@ "use strict"; add_task(async function test_explicit_object_prototype() { - const url = "http://mochi.test:8888/browser/js/xpconnect/tests/browser/browser_promise_userInteractionHandling.html"; + const url = + "http://mochi.test:8888/browser/js/xpconnect/tests/browser/browser_promise_userInteractionHandling.html"; await BrowserTestUtils.withNewTab(url, async browser => { await ContentTask.spawn(browser, {}, async () => { const { EventUtils } = ChromeUtils.import( "resource://specialpowers/SpecialPowersEventUtils.jsm" ); const DOMWindowUtils = EventUtils._getDOMWindowUtils(content.window); - is(DOMWindowUtils.isHandlingUserInput, false, - "not yet handling user input"); + is( + DOMWindowUtils.isHandlingUserInput, + false, + "not yet handling user input" + ); const button = content.document.getElementById("button"); let resolve; - const p = new Promise(r => { resolve = r; }); + const p = new Promise(r => { + resolve = r; + }); button.addEventListener("click", () => { is(DOMWindowUtils.isHandlingUserInput, true, "handling user input"); content.document.hasStorageAccess().then(() => { - is(DOMWindowUtils.isHandlingUserInput, true, - "still handling user input"); + is( + DOMWindowUtils.isHandlingUserInput, + true, + "still handling user input" + ); Promise.resolve().then(() => { - is(DOMWindowUtils.isHandlingUserInput, false, - "no more handling user input"); + is( + DOMWindowUtils.isHandlingUserInput, + false, + "no more handling user input" + ); resolve(); }); }); diff --git a/js/xpconnect/tests/browser/browser_realm_key_and_document_domain.js b/js/xpconnect/tests/browser/browser_realm_key_and_document_domain.js index d67a5314d64a..4ee8d4ae4022 100644 --- a/js/xpconnect/tests/browser/browser_realm_key_and_document_domain.js +++ b/js/xpconnect/tests/browser/browser_realm_key_and_document_domain.js @@ -6,22 +6,23 @@ "use strict"; async function test_document(url) { - await BrowserTestUtils.withNewTab(url, async function (browser) { - let result = await ContentTask.spawn( - browser, {}, - async function() { - let result = content.document.getElementById("result"); - return result.innerText; - } - ); + await BrowserTestUtils.withNewTab(url, async function(browser) { + let result = await ContentTask.spawn(browser, {}, async function() { + let result = content.document.getElementById("result"); + return result.innerText; + }); is(result, "OK", "test succeeds"); }); } add_task(async function test_explicit_object_prototype() { - await test_document("http://mochi.test:8888/browser/js/xpconnect/tests/browser/browser_realm_key_object_prototype_top.html"); + await test_document( + "http://mochi.test:8888/browser/js/xpconnect/tests/browser/browser_realm_key_object_prototype_top.html" + ); }); add_task(async function test_implicit_object_prototype() { - await test_document("http://mochi.test:8888/browser/js/xpconnect/tests/browser/browser_realm_key_promise_top.html"); + await test_document( + "http://mochi.test:8888/browser/js/xpconnect/tests/browser/browser_realm_key_promise_top.html" + ); });