From 26a029d407be480d791972afb5975cf62c9360a6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 02:47:55 +0200 Subject: Adding upstream version 124.0.1. Signed-off-by: Daniel Baumann --- browser/base/content/test/statuspanel/browser.toml | 7 +++ .../statuspanel/browser_show_statuspanel_idn.js | 33 ++++++++++++ .../statuspanel/browser_show_statuspanel_twice.js | 29 +++++++++++ browser/base/content/test/statuspanel/head.js | 58 ++++++++++++++++++++++ 4 files changed, 127 insertions(+) create mode 100644 browser/base/content/test/statuspanel/browser.toml create mode 100644 browser/base/content/test/statuspanel/browser_show_statuspanel_idn.js create mode 100644 browser/base/content/test/statuspanel/browser_show_statuspanel_twice.js create mode 100644 browser/base/content/test/statuspanel/head.js (limited to 'browser/base/content/test/statuspanel') diff --git a/browser/base/content/test/statuspanel/browser.toml b/browser/base/content/test/statuspanel/browser.toml new file mode 100644 index 0000000000..3c08e73912 --- /dev/null +++ b/browser/base/content/test/statuspanel/browser.toml @@ -0,0 +1,7 @@ +[DEFAULT] +support-files = ["head.js"] + +["browser_show_statuspanel_idn.js"] +skip-if = ["verify"] + +["browser_show_statuspanel_twice.js"] diff --git a/browser/base/content/test/statuspanel/browser_show_statuspanel_idn.js b/browser/base/content/test/statuspanel/browser_show_statuspanel_idn.js new file mode 100644 index 0000000000..308321f8c2 --- /dev/null +++ b/browser/base/content/test/statuspanel/browser_show_statuspanel_idn.js @@ -0,0 +1,33 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", +}); + +const TEST_PAGE_URL = encodeURI( + `data:text/html;charset=utf-8,abcdef` +); +// eslint-disable-next-line @microsoft/sdl/no-insecure-url +const TEST_STATUS_TEXT = UrlbarTestUtils.trimURL("http://nic.\u4E16\u754C"); + +/** + * Test that if the StatusPanel displays an IDN + * (Bug 1450538). + */ +add_task(async function test_show_statuspanel_twice() { + let tab = await BrowserTestUtils.openNewForegroundTab( + gBrowser, + TEST_PAGE_URL + ); + + let promise = promiseStatusPanelShown(window, TEST_STATUS_TEXT); + SpecialPowers.spawn(tab.linkedBrowser, [], async () => { + content.document.links[0].focus(); + }); + await promise; + + await BrowserTestUtils.removeTab(tab); +}); diff --git a/browser/base/content/test/statuspanel/browser_show_statuspanel_twice.js b/browser/base/content/test/statuspanel/browser_show_statuspanel_twice.js new file mode 100644 index 0000000000..6ed9b6d3a8 --- /dev/null +++ b/browser/base/content/test/statuspanel/browser_show_statuspanel_twice.js @@ -0,0 +1,29 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +// eslint-disable-next-line @microsoft/sdl/no-insecure-url +const TEST_URL = "http://example.com"; + +/** + * Test that if the StatusPanel is shown for a link, and then + * hidden, that it can be shown again for that same link. + * (Bug 1445455). + */ +add_task(async function test_show_statuspanel_twice() { + let win = await BrowserTestUtils.openNewBrowserWindow(); + win.XULBrowserWindow.overLink = TEST_URL; + win.StatusPanel.update(); + await promiseStatusPanelShown(win, TEST_URL); + + win.XULBrowserWindow.overLink = ""; + win.StatusPanel.update(); + await promiseStatusPanelHidden(win); + + win.XULBrowserWindow.overLink = TEST_URL; + win.StatusPanel.update(); + await promiseStatusPanelShown(win, TEST_URL); + + await BrowserTestUtils.closeWindow(win); +}); diff --git a/browser/base/content/test/statuspanel/head.js b/browser/base/content/test/statuspanel/head.js new file mode 100644 index 0000000000..23df2e6271 --- /dev/null +++ b/browser/base/content/test/statuspanel/head.js @@ -0,0 +1,58 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +/** + * Returns a Promise that resolves when a StatusPanel for a + * window has finished being shown. Also asserts that the + * text content of the StatusPanel matches a value. + * + * @param win (browser window) + * The window that the StatusPanel belongs to. + * @param value (string) + * The value that the StatusPanel should show. + * @returns Promise + */ +async function promiseStatusPanelShown(win, value) { + let panel = win.StatusPanel.panel; + info("Waiting to show panel"); + await BrowserTestUtils.waitForEvent(panel, "transitionend", e => { + return ( + e.propertyName === "opacity" && + win.getComputedStyle(e.target).opacity == "1" + ); + }); + + Assert.equal(win.StatusPanel._labelElement.value, value); +} + +/** + * Returns a Promise that resolves when a StatusPanel for a + * window has finished being hidden. + * + * @param win (browser window) + * The window that the StatusPanel belongs to. + */ +async function promiseStatusPanelHidden(win) { + let panel = win.StatusPanel.panel; + info("Waiting to hide panel"); + await new Promise(resolve => { + let l = e => { + if ( + e.propertyName === "opacity" && + win.getComputedStyle(e.target).opacity == "0" + ) { + info("Panel hid after " + e.type + " event"); + panel.removeEventListener("transitionend", l); + panel.removeEventListener("transitioncancel", l); + is( + getComputedStyle(panel).display, + "none", + "Should be hidden for good" + ); + resolve(); + } + }; + panel.addEventListener("transitionend", l); + panel.addEventListener("transitioncancel", l); + }); +} -- cgit v1.2.3