Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1884135 - Button to add exception in Manage DNS-over-HTTPS subdialog is enabled when input box is empty. r=mossop,settings-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D204033
This commit is contained in:
Javier Rueda 2024-03-11 13:21:37 +00:00
parent ce103e8022
commit 70d764860d
2 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/preferences/dialogs/dohExceptions.js
View File

@ -31,7 +31,6 @@ var gDoHExceptionsManager = {
"network.trr.excluded-domains"
);
this._btnAddException.disabled = this._prefLocked;
document.getElementById("exceptionDialog").getButton("accept").disabled =
this._prefLocked;
this._urlField.disabled = this._prefLocked;

55
browser/components/preferences/tests/browser_dns_over_https_exceptions_subdialog.js
View File

@ -15,18 +15,19 @@ function acceptDoHExceptionsSubdialog(win) {
button.doCommand();
}
function cancelDoHExceptionsSubdialog(win) {
const button = win.document.querySelector("dialog").getButton("cancel");
button.doCommand();
}
function addNewException(domain, dialog) {
let url = dialog.document.getElementById("url");
let addButton = dialog.document.getElementById("btnAddException");
if (dialog.document.getElementById("permissionsBox").itemCount > 0) {
// This fails when list is empty after opening the dialog (Bug 1884135).
// Move outside the if block along the fix to that bug.
ok(
addButton.disabled,
"The Add button is disabled when domain's input box is empty"
);
}
ok(
addButton.disabled,
"The Add button is disabled when domain's input box is empty"
);
url.focus();
EventUtils.sendString(domain);
@ -49,6 +50,41 @@ function addNewException(domain, dialog) {
);
}
add_task(async function () {
Services.prefs.lockPref("network.trr.excluded-domains");
await openPreferencesViaOpenPreferencesAPI("panePrivacy", {
leaveOpen: true,
});
let dialogOverlay = content.gSubDialog._preloadDialog._overlay;
let win = await dohExceptionsSubdialogOpened(dialogOverlay);
ok(
win.document.getElementById("btnAddException").disabled,
"The Add button is disabled when preference is locked"
);
ok(
win.document.getElementById("url").disabled,
"The url input box is disabled when preference is locked"
);
cancelDoHExceptionsSubdialog(win);
Services.prefs.unlockPref("network.trr.excluded-domains");
win = await dohExceptionsSubdialogOpened(dialogOverlay);
ok(
win.document.getElementById("btnAddException").disabled,
"The Add button is disabled when preference is not locked"
);
ok(
!win.document.getElementById("url").disabled,
"The url input box is enabled when preference is not locked"
);
cancelDoHExceptionsSubdialog(win);
gBrowser.removeCurrentTab();
});
add_task(async function () {
await openPreferencesViaOpenPreferencesAPI("panePrivacy", {
leaveOpen: true,
@ -74,8 +110,7 @@ add_task(async function () {
win.document.getElementById("removeAllExceptions").disabled,
"The Remove All button is disabled when there are no exceptions on the list"
);
//Bug 1884135
todo(
ok(
win.document.getElementById("btnAddException").disabled,
"The Add button is disabled when dialog box has just been opened"
);