Bug 1441226 - Rename NoAlertOpenError to NoSuchAlertError. r?whimboo
To match the WebDriver specification error code names, this patch
renames the NoAlertOpenError type to NoSuchAlertError.
Its string error code (the status property) is still correct.
MozReview-Commit-ID: DhWz1tn6DsT
--- a/testing/marionette/doc/internals/error.rst
+++ b/testing/marionette/doc/internals/error.rst
@@ -14,17 +14,17 @@ error module
.. js:autoclass:: InsecureCertificateError
.. js:autoclass:: InvalidArgumentError
.. js:autoclass:: InvalidCookieDomainError
.. js:autoclass:: InvalidElementStateError
.. js:autoclass:: InvalidSelectorError
.. js:autoclass:: InvalidSessionIDError
.. js:autoclass:: JavaScriptError
.. js:autoclass:: MoveTargetOutOfBoundsError
-.. js:autoclass:: NoAlertOpenError
+.. js:autoclass:: NoSuchAlertError
.. js:autoclass:: NoSuchElementError
.. js:autoclass:: NoSuchFrameError
.. js:autoclass:: NoSuchWindowError
.. js:autoclass:: ScriptTimeoutError
.. js:autoclass:: SessionNotCreatedError
.. js:autoclass:: StaleElementReferenceError
.. js:autoclass:: TimeoutError
.. js:autoclass:: UnableToSetCookieError
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -27,17 +27,17 @@ const {
element,
WebElement,
} = ChromeUtils.import("chrome://marionette/content/element.js", {});
const {
InsecureCertificateError,
InvalidArgumentError,
InvalidCookieDomainError,
InvalidSelectorError,
- NoAlertOpenError,
+ NoSuchAlertError,
NoSuchFrameError,
NoSuchWindowError,
SessionNotCreatedError,
UnknownError,
UnsupportedOperationError,
WebDriverError,
} = ChromeUtils.import("chrome://marionette/content/error.js", {});
ChromeUtils.import("chrome://marionette/content/evaluate.js");
@@ -3157,17 +3157,17 @@ GeckoDriver.prototype.sendKeysToDialog =
// see toolkit/components/prompts/content/commonDialog.js
let {loginTextbox} = this.dialog.ui;
await interaction.sendKeysToElement(
loginTextbox, cmd.parameters.text, this.a11yChecks);
};
GeckoDriver.prototype._checkIfAlertIsPresent = function() {
if (!this.dialog || !this.dialog.ui) {
- throw new NoAlertOpenError("No modal dialog is currently open");
+ throw new NoSuchAlertError("No modal dialog is currently open");
}
};
GeckoDriver.prototype._assertAndDismissModal = function() {
try {
assert.noUserPrompt(this.dialog);
} catch (e) {
this.dismissDialog();
--- a/testing/marionette/error.js
+++ b/testing/marionette/error.js
@@ -13,17 +13,17 @@ const ERRORS = new Set([
"InsecureCertificateError",
"InvalidArgumentError",
"InvalidCookieDomainError",
"InvalidElementStateError",
"InvalidSelectorError",
"InvalidSessionIDError",
"JavaScriptError",
"MoveTargetOutOfBoundsError",
- "NoAlertOpenError",
+ "NoSuchAlertError",
"NoSuchElementError",
"NoSuchFrameError",
"NoSuchWindowError",
"ScriptTimeoutError",
"SessionNotCreatedError",
"StaleElementReferenceError",
"TimeoutError",
"UnableToSetCookieError",
@@ -413,17 +413,17 @@ class MoveTargetOutOfBoundsError extends
this.status = "move target out of bounds";
}
}
/**
* An attempt was made to operate on a modal dialog when one was
* not open.
*/
-class NoAlertOpenError extends WebDriverError {
+class NoSuchAlertError extends WebDriverError {
constructor(message) {
super(message);
this.status = "no such alert";
}
}
/**
* An element could not be located on the page using the given
@@ -549,17 +549,17 @@ const STATUSES = new Map([
["insecure certificate", InsecureCertificateError],
["invalid argument", InvalidArgumentError],
["invalid cookie domain", InvalidCookieDomainError],
["invalid element state", InvalidElementStateError],
["invalid selector", InvalidSelectorError],
["invalid session id", InvalidSessionIDError],
["javascript error", JavaScriptError],
["move target out of bounds", MoveTargetOutOfBoundsError],
- ["no alert open", NoAlertOpenError],
+ ["no such alert", NoSuchAlertError],
["no such element", NoSuchElementError],
["no such frame", NoSuchFrameError],
["no such window", NoSuchWindowError],
["script timeout", ScriptTimeoutError],
["session not created", SessionNotCreatedError],
["stale element reference", StaleElementReferenceError],
["timeout", TimeoutError],
["unable to set cookie", UnableToSetCookieError],
--- a/testing/marionette/test_error.js
+++ b/testing/marionette/test_error.js
@@ -10,17 +10,17 @@ const {
InsecureCertificateError,
InvalidArgumentError,
InvalidCookieDomainError,
InvalidElementStateError,
InvalidSelectorError,
InvalidSessionIDError,
JavaScriptError,
MoveTargetOutOfBoundsError,
- NoAlertOpenError,
+ NoSuchAlertError,
NoSuchElementError,
NoSuchFrameError,
NoSuchWindowError,
ScriptTimeoutError,
SessionNotCreatedError,
stack,
StaleElementReferenceError,
TimeoutError,
@@ -328,19 +328,19 @@ add_test(function test_JavaScriptError()
equal("funcname @file, line line",
new JavaScriptError("message", {fnName: "funcname", file: "file", line: "line"}).stack);
// TODO(ato): More exhaustive tests for JS stack computation
run_next_test();
});
-add_test(function test_NoAlertOpenError() {
- let err = new NoAlertOpenError("foo");
- equal("NoAlertOpenError", err.name);
+add_test(function test_NoSuchAlertError() {
+ let err = new NoSuchAlertError("foo");
+ equal("NoSuchAlertError", err.name);
equal("foo", err.message);
equal("no such alert", err.status);
ok(err instanceof WebDriverError);
run_next_test();
});
add_test(function test_NoSuchElementError() {