From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- .../test/tabPrompts/browser_abort_when_in_modal_state.js | 8 ++------ .../test/tabPrompts/browser_auth_spoofing_protection.js | 4 ++-- .../content/test/tabPrompts/browser_contentOrigins.js | 6 ------ .../base/content/test/tabPrompts/browser_windowPrompt.js | 16 ---------------- 4 files changed, 4 insertions(+), 30 deletions(-) (limited to 'browser/base/content/test/tabPrompts') diff --git a/browser/base/content/test/tabPrompts/browser_abort_when_in_modal_state.js b/browser/base/content/test/tabPrompts/browser_abort_when_in_modal_state.js index cb3a1f72d6..d6d2434017 100644 --- a/browser/base/content/test/tabPrompts/browser_abort_when_in_modal_state.js +++ b/browser/base/content/test/tabPrompts/browser_abort_when_in_modal_state.js @@ -8,14 +8,10 @@ const { PromiseTestUtils } = ChromeUtils.importESModule( ); /** - * Check that if we're using a window-modal prompt, - * the next synchronous window-internal modal prompt aborts rather than - * leaving us in a deadlock about how to enter modal state. + * Check that the next synchronous window-internal modal prompt aborts rather + * than leaving us in a deadlock about how to enter modal state. */ add_task(async function test_check_multiple_prompts() { - await SpecialPowers.pushPrefEnv({ - set: [["prompts.windowPromptSubDialog", true]], - }); let container = document.getElementById("window-modal-dialog"); let dialogPromise = BrowserTestUtils.promiseAlertDialogOpen(); diff --git a/browser/base/content/test/tabPrompts/browser_auth_spoofing_protection.js b/browser/base/content/test/tabPrompts/browser_auth_spoofing_protection.js index 86d7c992c5..1211694973 100644 --- a/browser/base/content/test/tabPrompts/browser_auth_spoofing_protection.js +++ b/browser/base/content/test/tabPrompts/browser_auth_spoofing_protection.js @@ -119,7 +119,7 @@ async function waitForDialog(doConfirmPrompt, crossDomain, prefEnabled) { } else { Assert.equal( dialog._overlay.getAttribute("hideContent"), - "", + null, "Dialog overlay does not hide the current sites content" ); Assert.equal( @@ -137,7 +137,7 @@ async function waitForDialog(doConfirmPrompt, crossDomain, prefEnabled) { } else { Assert.equal( dialog._overlay.getAttribute("hideContent"), - "", + null, "Dialog overlay does not hide the current sites content" ); Assert.equal( diff --git a/browser/base/content/test/tabPrompts/browser_contentOrigins.js b/browser/base/content/test/tabPrompts/browser_contentOrigins.js index 2bf4ba6039..0c40763a99 100644 --- a/browser/base/content/test/tabPrompts/browser_contentOrigins.js +++ b/browser/base/content/test/tabPrompts/browser_contentOrigins.js @@ -127,12 +127,6 @@ async function checkDialog( }); } -add_setup(async function () { - await SpecialPowers.pushPrefEnv({ - set: [["prompts.modalType.httpAuth", Ci.nsIPrompt.MODAL_TYPE_TAB]], - }); -}); - add_task(async function test_check_prompt_origin_display() { await checkAlert("https://example.com/", { value: "example.com" }); // eslint-disable-next-line @microsoft/sdl/no-insecure-url diff --git a/browser/base/content/test/tabPrompts/browser_windowPrompt.js b/browser/base/content/test/tabPrompts/browser_windowPrompt.js index 535142f485..0aca489b50 100644 --- a/browser/base/content/test/tabPrompts/browser_windowPrompt.js +++ b/browser/base/content/test/tabPrompts/browser_windowPrompt.js @@ -7,9 +7,6 @@ * Check that the in-window modal dialogs work correctly. */ add_task(async function test_check_window_modal_prompt_service() { - await SpecialPowers.pushPrefEnv({ - set: [["prompts.windowPromptSubDialog", true]], - }); let dialogPromise = BrowserTestUtils.promiseAlertDialogOpen(); // Avoid blocking the test on the (sync) alert by sticking it in a timeout: setTimeout( @@ -69,9 +66,6 @@ add_task(async function test_check_window_modal_prompt_service() { * Check that the dialog's own closing methods being invoked don't break things. */ add_task(async function test_check_window_modal_prompt_service() { - await SpecialPowers.pushPrefEnv({ - set: [["prompts.windowPromptSubDialog", true]], - }); let dialogPromise = BrowserTestUtils.promiseAlertDialogOpen(); // Avoid blocking the test on the (sync) alert by sticking it in a timeout: setTimeout( @@ -105,9 +99,6 @@ add_task(async function test_check_window_modal_prompt_service() { }); add_task(async function test_check_multiple_prompts() { - await SpecialPowers.pushPrefEnv({ - set: [["prompts.windowPromptSubDialog", true]], - }); let container = document.getElementById("window-modal-dialog"); let dialogPromise = BrowserTestUtils.promiseAlertDialogOpen(); @@ -173,9 +164,6 @@ add_task(async function test_check_minimize_response() { if (AppConstants.platform == "linux") { return; } - await SpecialPowers.pushPrefEnv({ - set: [["prompts.windowPromptSubDialog", true]], - }); let promiseSizeModeChange = BrowserTestUtils.waitForEvent( window, @@ -235,10 +223,6 @@ add_task(async function test_check_minimize_response() { * underlying SubDialog has fully opened. */ add_task(async function test_closed_callback() { - await SpecialPowers.pushPrefEnv({ - set: [["prompts.windowPromptSubDialog", true]], - }); - let promptClosedPromise = Services.prompt.asyncAlert( window.browsingContext, Services.prompt.MODAL_TYPE_INTERNAL_WINDOW, -- cgit v1.2.3