corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1876779 - Fix issue with last screenshot method. r=sfoster

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D199747
This commit is contained in:
Niklas Baumgardner
2024-01-30 20:05:53 +00:00
parent b3dfa7a67a
commit f37dadc23b
2 changed files with 91 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/screenshots/ScreenshotsUtils.sys.mjs
View File

@@ -732,7 +732,7 @@ export var ScreenshotsUtils = {
Services.prefs.setStringPref(
SCREENSHOTS_LAST_SCREENSHOT_METHOD_PREF,
"fullpage"
lastUsedMethod
);
this.methodsUsed[lastUsedMethod] += 1;
this.recordTelemetryEvent("selected", type, {});

104
browser/components/screenshots/tests/browser/browser_screenshots_focus_test.js
View File

@@ -186,9 +186,25 @@ add_task(async function test_focusLastUsedMethod() {
set: [
[SCREENSHOTS_LAST_SCREENSHOT_METHOD_PREF, ""],
[SCREENSHOTS_LAST_SAVED_METHOD_PREF, ""],
["browser.download.useDownloadDir", true],
],
});
let publicDownloads = await Downloads.getList(Downloads.PUBLIC);
// First ensure we catch the download finishing.
let downloadFinishedPromise = new Promise(resolve => {
publicDownloads.addView({
onDownloadChanged(download) {
info("Download changed!");
if (download.succeeded || download.error) {
info("Download succeeded or errored");
publicDownloads.removeView(this);
resolve(download);
}
},
});
});
await BrowserTestUtils.withNewTab(
{
gBrowser,
@@ -214,14 +230,17 @@ add_task(async function test_focusLastUsedMethod() {
"The visible button in the panel should have focus"
);
helper.triggerUIFromToolbar();
await helper.waitForOverlayClosed();
let screenshotReady = TestUtils.topicObserved(
"screenshots-preview-ready"
);
let fullpageButton = await helper.getPanelButton(".full-page");
fullpageButton.click();
await screenshotReady;
await SpecialPowers.pushPrefEnv({
set: [[SCREENSHOTS_LAST_SCREENSHOT_METHOD_PREF, "fullpage"]],
});
let dialog = helper.getDialog();
let retryButton = dialog._frame.contentDocument.getElementById("retry");
retryButton.click();
helper.triggerUIFromToolbar();
await helper.waitForOverlay();
expectedFocusedButton = await helper.getPanelButton(".full-page");
@@ -239,13 +258,37 @@ add_task(async function test_focusLastUsedMethod() {
"The full button in the panel should have focus"
);
let screenshotReady = TestUtils.topicObserved(
"screenshots-preview-ready"
screenshotReady = TestUtils.topicObserved("screenshots-preview-ready");
let visiblepageButton = await helper.getPanelButton(".visible-page");
visiblepageButton.click();
await screenshotReady;
dialog = helper.getDialog();
retryButton = dialog._frame.contentDocument.getElementById("retry");
retryButton.click();
await helper.waitForOverlay();
expectedFocusedButton = await helper.getPanelButton(".visible-page");
await BrowserTestUtils.waitForCondition(() => {
return (
expectedFocusedButton.getRootNode().activeElement ===
expectedFocusedButton
);
}, "The visible button in the panel should have focus");
is(
Services.focus.focusedElement,
expectedFocusedButton,
"The visible button in the panel should have focus"
);
screenshotReady = TestUtils.topicObserved("screenshots-preview-ready");
expectedFocusedButton.click();
await screenshotReady;
let dialog = helper.getDialog();
dialog = helper.getDialog();
expectedFocusedButton =
dialog._frame.contentDocument.getElementById("download");
@@ -264,13 +307,10 @@ add_task(async function test_focusLastUsedMethod() {
);
let screenshotExit = TestUtils.topicObserved("screenshots-exit");
helper.triggerUIFromToolbar();
let copyButton = dialog._frame.contentDocument.getElementById("copy");
copyButton.click();
await screenshotExit;
await SpecialPowers.pushPrefEnv({
set: [[SCREENSHOTS_LAST_SAVED_METHOD_PREF, "copy"]],
});
helper.triggerUIFromToolbar();
await helper.waitForOverlay();
@@ -298,6 +338,42 @@ add_task(async function test_focusLastUsedMethod() {
"The copy button in the preview dialog should have focus"
);
screenshotExit = TestUtils.topicObserved("screenshots-exit");
let downloadButton =
dialog._frame.contentDocument.getElementById("download");
downloadButton.click();
await Promise.all([screenshotExit, downloadFinishedPromise]);
await publicDownloads.removeFinished();
helper.triggerUIFromToolbar();
await helper.waitForOverlay();
visibleButton = await helper.getPanelButton(".visible-page");
screenshotReady = TestUtils.topicObserved("screenshots-preview-ready");
visibleButton.click();
await screenshotReady;
dialog = helper.getDialog();
expectedFocusedButton =
dialog._frame.contentDocument.getElementById("download");
await BrowserTestUtils.waitForCondition(() => {
return (
expectedFocusedButton.getRootNode().activeElement ===
expectedFocusedButton
);
}, "The download button in the preview dialog should have focus");
is(
Services.focus.focusedElement,
expectedFocusedButton,
"The download button in the preview dialog should have focus"
);
screenshotExit = TestUtils.topicObserved("screenshots-exit");
helper.triggerUIFromToolbar();
await screenshotExit;