mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fx-compat: Pass dialog as second argument to waitForDialog() in tests

Browse source 
Makes it easier to run dialog.getButton(), etc.
This commit is contained in:
Dan Stillman 2022-06-20 19:30:28 -04:00
parent 96f6b871ce
commit 54529ab461
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/content/support.js
View file

@ -174,7 +174,7 @@ function waitForWindow(uri, callback) {
/** /**
* Wait for an alert or confirmation dialog to pop up and then close it * Wait for an alert or confirmation dialog to pop up and then close it
* *
* @param {Function} [onOpen] - Function that is passed the dialog once it is opened. * @param {Function} [onOpen] - Function that is passed the window and dialog once it is opened.
* Can be used to make assertions on the dialog contents * Can be used to make assertions on the dialog contents
* (e.g., with dialog.document.documentElement.textContent) * (e.g., with dialog.document.documentElement.textContent)
* @param {String} [button='accept'] - Button in dialog to press (e.g., 'cancel', 'extra1') * @param {String} [button='accept'] - Button in dialog to press (e.g., 'cancel', 'extra1')
@ -182,10 +182,11 @@ function waitForWindow(uri, callback) {
*/ */
function waitForDialog(onOpen, button='accept', url) { function waitForDialog(onOpen, button='accept', url) {
return waitForWindow(url || "chrome://global/content/commonDialog.xhtml", Zotero.Promise.method(function (win) { return waitForWindow(url || "chrome://global/content/commonDialog.xhtml", Zotero.Promise.method(function (win) {
var dialog = win.document.querySelector('dialog');
var failure = false; var failure = false;
if (onOpen) { if (onOpen) {
try { try {
onOpen(win); onOpen(win, dialog);
} }
catch (e) { catch (e) {
failure = e; failure = e;
@ -200,13 +201,13 @@ function waitForDialog(onOpen, button='accept', url) {
let deferred = Zotero.Promise.defer(); let deferred = Zotero.Promise.defer();
function acceptWhenEnabled() { function acceptWhenEnabled() {
// Handle delayed buttons // Handle delayed buttons
if (win.document.querySelector('dialog').getButton(button).disabled) { if (dialog.getButton(button).disabled) {
win.setTimeout(function () { win.setTimeout(function () {
acceptWhenEnabled(); acceptWhenEnabled();
}, 250); }, 250);
} }
else { else {
win.document.querySelector('dialog').getButton(button).click(); dialog.getButton(button).click();
if (failure) { if (failure) {
deferred.reject(failure); deferred.reject(failure);
} }
@ -219,7 +220,7 @@ function waitForDialog(onOpen, button='accept', url) {
return deferred.promise; return deferred.promise;
} }
else { else {
win.document.querySelector('dialog').getButton(button).click(); dialog.getButton(button).click();
if (failure) { if (failure) {
throw failure; throw failure;
} }