diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:29 +0000 |
commit | 59203c63bb777a3bacec32fb8830fba33540e809 (patch) | |
tree | 58298e711c0ff0575818c30485b44a2f21bf28a0 /browser/tools/mozscreenshots | |
parent | Adding upstream version 126.0.1. (diff) | |
download | firefox-59203c63bb777a3bacec32fb8830fba33540e809.tar.xz firefox-59203c63bb777a3bacec32fb8830fba33540e809.zip |
Adding upstream version 127.0.upstream/127.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/tools/mozscreenshots')
-rw-r--r-- | browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.sys.mjs | 10 | ||||
-rw-r--r-- | browser/tools/mozscreenshots/permissionPrompts/browser.toml | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.sys.mjs index b49f1be949..00a8f5d318 100644 --- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.sys.mjs +++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.sys.mjs @@ -154,6 +154,11 @@ async function clickOn(selector, beforeContentFn) { await SpecialPowers.spawn(lastTab.linkedBrowser, [], beforeContentFn); } + let popupShownPromise = BrowserTestUtils.waitForEvent( + browserWindow.PopupNotifications.panel, + "popupshown" + ); + await SpecialPowers.spawn(lastTab.linkedBrowser, [selector], arg => { /* eslint-env mozilla/chrome-script */ let element = content.document.querySelector(arg); @@ -161,8 +166,5 @@ async function clickOn(selector, beforeContentFn) { }); // Wait for the popup to actually be shown before making the screenshot - await BrowserTestUtils.waitForEvent( - browserWindow.PopupNotifications.panel, - "popupshown" - ); + await popupShownPromise; } diff --git a/browser/tools/mozscreenshots/permissionPrompts/browser.toml b/browser/tools/mozscreenshots/permissionPrompts/browser.toml index 0ddc6302ed..96e59c1b6b 100644 --- a/browser/tools/mozscreenshots/permissionPrompts/browser.toml +++ b/browser/tools/mozscreenshots/permissionPrompts/browser.toml @@ -7,4 +7,3 @@ prefs = [ ] ["browser_permissionPrompts.js"] -skip-if = ["os == 'mac'"] # times out on macosx1014, see 1570098 |