Update issue 7641

Adjust bot.ErrorCode values for alerts to be consistent with the spec.

Author: jleyba

javascript/atoms/error.js

@@ -46,7 +46,11 @@ bot.ErrorCode = {
   NO_SUCH_WINDOW: 23,
   INVALID_COOKIE_DOMAIN: 24,
   UNABLE_TO_SET_COOKIE: 25,
+  /** @deprecated */
   MODAL_DIALOG_OPENED: 26,
+  UNEXPECTED_ALERT_OPEN: 26,
+  NO_SUCH_ALERT: 27,
+  /** @deprecated */
   NO_MODAL_DIALOG_OPEN: 27,
   SCRIPT_TIMEOUT: 28,
   INVALID_ELEMENT_COORDINATES: 29,
@@ -173,6 +177,7 @@ goog.scope(function() {
   map[code.METHOD_NOT_ALLOWED] = state.UNSUPPORTED_OPERATION;
   map[code.MOVE_TARGET_OUT_OF_BOUNDS] = state.MOVE_TARGET_OUT_OF_BOUNDS;
   map[code.NO_MODAL_DIALOG_OPEN] = state.NO_SUCH_ALERT;
+  map[code.NO_SUCH_ALERT] = state.NO_SUCH_ALERT;
   map[code.NO_SUCH_ELEMENT] = state.NO_SUCH_ELEMENT;
   map[code.NO_SUCH_FRAME] = state.NO_SUCH_FRAME;
   map[code.NO_SUCH_WINDOW] = state.NO_SUCH_WINDOW;
@@ -183,6 +188,7 @@ goog.scope(function() {
   map[code.TIMEOUT] = state.TIMEOUT;
   map[code.UNABLE_TO_SET_COOKIE] = state.UNABLE_TO_SET_COOKIE;
   map[code.MODAL_DIALOG_OPENED] = state.UNEXPECTED_ALERT_OPEN;
+  map[code.UNEXPECTED_ALERT_OPEN] = state.UNEXPECTED_ALERT_OPEN
   map[code.UNKNOWN_ERROR] = state.UNKNOWN_ERROR;
   map[code.UNSUPPORTED_OPERATION] = state.UNKNOWN_COMMAND;
 });  // goog.scope

javascript/firefox-driver/js/firefoxDriver.js

@@ -879,7 +879,7 @@ FirefoxDriver.prototype.getAlert = function(respond) {
   fxdriver.modals.isModalPresent(
       function(present) {
         if (!present) {
-          respond.status = bot.ErrorCode.NO_MODAL_DIALOG_OPEN;
+          respond.status = bot.ErrorCode.NO_SUCH_ALERT;
           respond.value = { message: 'No alert is present' };
         }
         respond.send();
@@ -892,7 +892,7 @@ FirefoxDriver.prototype.dismissAlert = function(respond) {
   fxdriver.modals.isModalPresent(
       function(present) {
         if (!present) {
-          respond.status = bot.ErrorCode.NO_MODAL_DIALOG_OPEN;
+          respond.status = bot.ErrorCode.NO_SUCH_ALERT;
           respond.value = { message: 'No alert is present' };
         } else {
           fxdriver.modals.dismissAlert(self);
@@ -906,7 +906,7 @@ FirefoxDriver.prototype.acceptAlert = function(respond) {
   fxdriver.modals.isModalPresent(
       function(present) {
         if (!present) {
-          respond.status = bot.ErrorCode.NO_MODAL_DIALOG_OPEN;
+          respond.status = bot.ErrorCode.NO_SUCH_ALERT;
           respond.value = { message: 'No alert is present' };
         } else {
           fxdriver.modals.acceptAlert(self);
@@ -923,7 +923,7 @@ FirefoxDriver.prototype.getAlertText = function(respond) {
       if (present) {
         respond.value = fxdriver.modals.getText(driver);
       } else {
-        respond.status = bot.ErrorCode.NO_MODAL_DIALOG_OPEN;
+        respond.status = bot.ErrorCode.NO_SUCH_ALERT;
         respond.value = { message: 'No alert is present' };
       }
       respond.send();
@@ -935,7 +935,7 @@ FirefoxDriver.prototype.setAlertValue = function(respond, parameters) {
   fxdriver.modals.isModalPresent(
       function(present) {
         if (!present) {
-          respond.status = bot.ErrorCode.NO_MODAL_DIALOG_OPEN;
+          respond.status = bot.ErrorCode.NO_SUCH_ALERT;
           respond.value = { message: 'No alert is present' };
         } else {
           fxdriver.modals.setValue(parameters['text']);

javascript/firefox-driver/js/modals.js

@@ -179,7 +179,7 @@ fxdriver.modals.signalOpenModal = function(parent, text) {
         } else {
           errorMessage += ' The alert disappeared before it could be closed.';
         }
-        res.sendError(new WebDriverError(bot.ErrorCode.MODAL_DIALOG_OPENED,
+        res.sendError(new WebDriverError(bot.ErrorCode.UNEXPECTED_ALERT_OPEN,
             errorMessage, {alert: {text: text}}));
       }, 2000);
     } else {

javascript/firefox-driver/js/nsCommandProcessor.js

@@ -484,7 +484,7 @@ nsCommandProcessor.prototype.execute = function(jsonCommandString,
       }
       fxdriver.logging.error('Sending error from command ' +
         command.name + ' with alertText: ' + modalText);
-      response.sendError(new WebDriverError(bot.ErrorCode.MODAL_DIALOG_OPENED,
+      response.sendError(new WebDriverError(bot.ErrorCode.UNEXPECTED_ALERT_OPEN,
           'Modal dialog present', {alert: {text: modalText}}));
       return;
     }

javascript/firefox-driver/js/preconditions.js

@@ -78,7 +78,7 @@ fxdriver.preconditions.writable = function(doc, parameters) {
  */
 fxdriver.preconditions.noAlertPresent = function(driver) {
   if (driver.modalOpen) {
-    return new WebDriverError(bot.ErrorCode.MODAL_DIALOG_OPENED,
+    return new WebDriverError(bot.ErrorCode.UNEXPECTED_ALERT_OPEN,
         'A modal dialog, such as an alert, is open.');
   }
 };
@@ -91,7 +91,7 @@ fxdriver.preconditions.noAlertPresent = function(driver) {
  */
 fxdriver.preconditions.alertPresent = function(driver) {
   if (!driver.modalOpen) {
-    return new WebDriverError(bot.ErrorCode.NO_MODAL_DIALOG_OPEN,
+    return new WebDriverError(bot.ErrorCode.NO_SUCH_ALERT,
         'A modal dialog, such as an alert, is not open.');
   }
 };

javascript/node/selenium-webdriver/CHANGES.md

@@ -8,6 +8,10 @@
 * For consistency with other language bindings, deprecated
     `UnhandledAlertError#getAlert` and added `#getAlertText`.
     `getAlert` will be removed in `2.45.0`.
+* FIXED: 7641: Deprecated `ErrorCode.NO_MODAL_DIALOG_OPEN` and
+    `ErrorCode.MODAL_DIALOG_OPENED` in favor of the new
+    `ErrorCode.NO_SUCH_ALERT` and `ErrorCode.UNEXPECTED_ALERT_OPEN`,
+    respecitvely.
 * FIXED: 7563: Mocha integration no longer disables timeouts. Default Mocha
     timeouts apply (2000 ms) and may be changed using `this.timeout(ms)`.
 * FIXED: 7470: Make it easier to create WebDriver instances in custom flows for

javascript/safari-driver/alert.js

@@ -26,7 +26,7 @@ goog.require('bot.ErrorCode');
  */
 safaridriver.alert.createResponse = function(txt) {
   return {
-    'status': bot.ErrorCode.MODAL_DIALOG_OPENED,
+    'status': bot.ErrorCode.UNEXPECTED_ALERT_OPEN,
     'value': {
       'message':
           'A modal dialog was opened. The SafariDriver does not support ' +

javascript/safari-driver/extension/commands.js

@@ -488,7 +488,7 @@ safaridriver.extension.commands.executeAsyncScript = function(session,
  * @see http://code.google.com/p/selenium/issues/detail?id=3862
  */
 safaridriver.extension.commands.handleNoAlertsPresent = function() {
-  throw new bot.Error(bot.ErrorCode.NO_MODAL_DIALOG_OPEN,
+  throw new bot.Error(bot.ErrorCode.NO_SUCH_ALERT,
       'The SafariDriver does not support alert handling. To prevent tests ' +
           'from handing when an alert is opened, they are always immediately ' +
           'dismissed. For more information, see ' +

javascript/webdriver/test/webdriver_test.js

@@ -2101,7 +2101,7 @@ function testInterceptsAndTransformsUnhandledAlertErrors() {
   var testHelper = TestHelper.
       expectingSuccess().
       expect(CName.FIND_ELEMENT, {'using':'id', 'value':'foo'}).
-      andReturnError(ECode.MODAL_DIALOG_OPENED, {
+      andReturnError(ECode.UNEXPECTED_ALERT_OPEN, {
         'message': 'boom',
         'alert': {'text': 'hello'}
       }).
@@ -2125,7 +2125,7 @@ function testUnhandledAlertErrors_usesEmptyStringIfAlertTextOmittedFromResponse(
   var testHelper = TestHelper.
       expectingSuccess().
       expect(CName.FIND_ELEMENT, {'using':'id', 'value':'foo'}).
-      andReturnError(ECode.MODAL_DIALOG_OPENED, {'message': 'boom'}).
+      andReturnError(ECode.UNEXPECTED_ALERT_OPEN, {'message': 'boom'}).
       replayAll();
 
   var pair = callbackPair(null, function(e) {
@@ -2185,9 +2185,9 @@ function testWebElementsBelongToSameFlowAsParentDriver() {
 
 function testSwitchToAlertThatIsNotPresent() {
   var testHelper = TestHelper
-      .expectingFailure(expectedError(ECode.NO_MODAL_DIALOG_OPEN, 'no alert'))
+      .expectingFailure(expectedError(ECode.NO_SUCH_ALERT, 'no alert'))
       .expect(CName.GET_ALERT_TEXT)
-      .andReturnError(ECode.NO_MODAL_DIALOG_OPEN, {'message': 'no alert'})
+      .andReturnError(ECode.NO_SUCH_ALERT, {'message': 'no alert'})
       .replayAll();
 
   var driver = testHelper.createDriver();

javascript/webdriver/webdriver.js

@@ -294,7 +294,7 @@ webdriver.WebDriver.prototype.schedule = function(command, description) {
       bot.response.checkResponse(response);
     } catch (ex) {
       var value = response['value'];
-      if (ex.code === bot.ErrorCode.MODAL_DIALOG_OPENED) {
+      if (ex.code === bot.ErrorCode.UNEXPECTED_ALERT_OPEN) {
         var text = value && value['alert'] ? value['alert']['text'] : '';
         throw new webdriver.UnhandledAlertError(ex.message, text,
             new webdriver.Alert(self, text));
@@ -1469,8 +1469,8 @@ webdriver.WebDriver.TargetLocator.prototype.window = function(nameOrHandle) {
 
 /**
  * Schedules a command to change focus to the active alert dialog. This command
- * will return a {@link bot.ErrorCode.NO_MODAL_DIALOG_OPEN} error if a modal
- * dialog is not currently open.
+ * will return a {@link bot.ErrorCode.NO_SUCH_ALERT} error if an alert dialog
+ * is not currently open.
  * @return {!webdriver.AlertPromise} The open alert.
  */
 webdriver.WebDriver.TargetLocator.prototype.alert = function() {
@@ -2200,7 +2200,7 @@ goog.inherits(webdriver.AlertPromise, webdriver.Alert);
  * @extends {bot.Error}
  */
 webdriver.UnhandledAlertError = function(message, text, alert) {
-  goog.base(this, bot.ErrorCode.MODAL_DIALOG_OPENED, message);
+  goog.base(this, bot.ErrorCode.UNEXPECTED_ALERT_OPEN, message);
 
   /** @private {string} */
   this.text_ = text;