DanielWagnerHall: Adding missing error codes

r13256
kostyukdg · Aug 5, 2011 · d9cbeff · d9cbeff
1 parent 5781cf7
commit d9cbeff
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/java/client/src/org/openqa/selenium/remote/ErrorCodes.java b/java/client/src/org/openqa/selenium/remote/ErrorCodes.java
@@ -43,6 +43,7 @@ public class ErrorCodes {
   public static final int NO_SUCH_WINDOW = 23;
   public static final int INVALID_COOKIE_DOMAIN = 24;
   public static final int UNABLE_TO_SET_COOKIE = 25;
+  public static final int UNEXPECTED_ALERT_PRESENT = 26;
   public static final int NO_ALERT_PRESENT = 27;
   public static final int ASYNC_SCRIPT_TIMEOUT = 28;
   public static final int INVALID_ELEMENT_COORDINATES = 29;

diff --git a/py/selenium/webdriver/remote/errorhandler.py b/py/selenium/webdriver/remote/errorhandler.py
@@ -45,6 +45,8 @@ class ErrorCode(object):
     NO_SUCH_WINDOW = 23
     INVALID_COOKIE_DOMAIN = 24
     UNABLE_TO_SET_COOKIE = 25
+    UNEXPECTED_ALERT_OPEN = 26
+    NO_ALERT_OPEN = 27
     SCRIPT_TIMEOUT = 28
     INVALID_ELEMENT_COORDINATES = 29
     INVALID_SELECTOR = 32

diff --git a/rb/lib/selenium/webdriver/common/error.rb b/rb/lib/selenium/webdriver/common/error.rb
@@ -29,7 +29,7 @@ class NoSuchWindowError < WebDriverError; end              # 23
       class InvalidCookieDomainError < WebDriverError; end       # 24
       class UnableToSetCookieError < WebDriverError; end         # 25
                                                                  # 26
-      class NoModalDialogOpenError < WebDriverError; end         # 27
+      class NoAlertDialogOpenError < WebDriverError; end         # 27
       class ScriptTimeOutError < WebDriverError; end             # 28
       class InvalidElementCoordinatesError < WebDriverError; end # 29
                                                                  # 30
@@ -63,8 +63,8 @@ class UnsupportedOperationError < WebDriverError; end
         NoSuchWindowError,              # 23
         InvalidCookieDomainError,       # 24
         UnableToSetCookieError,         # 25
-        nil,                            # 26
-        NoModalDialogOpenError,         # 27
+        UnexpectedAlertError,           # 26
+        NoAlertOpenError,               # 27
         ScriptTimeOutError,             # 28
         InvalidElementCoordinatesError, # 29
         nil,                            # 30

diff --git a/rb/spec/integration/selenium/webdriver/target_locator_spec.rb b/rb/spec/integration/selenium/webdriver/target_locator_spec.rb
@@ -142,7 +142,7 @@
     not_compliant_on :browser => [:chrome, :ie] do
       it "raises UnhandledError if no alert is present" do
         lambda { driver.switch_to.alert }.should raise_error(
-          Selenium::WebDriver::Error::NoModalDialogOpenError, /alert/i)
+          Selenium::WebDriver::Error::NoAlertOpenError, /alert/i)
       end
     end
 

diff --git a/wire.py b/wire.py
@@ -389,10 +389,10 @@ def main():
 a cookie under a different domain than the current page.'),
       ErrorCode(25, 'UnableToSetCookie', 'A request to set a cookie\'s value \
 could not be satisfied.'),
-      ErrorCode(26, 'UnexpectedAlertOpen', 'An alert was open, blocking this \
-operation'),
-      ErrorCode(27, 'NoModalDialogOpenError', 'An attempt was made to operate \
-on a modal dialog when one was not open.'),
+      ErrorCode(26, 'UnexpectedAlertOpen', 'A modal dialog was open, blocking \
+this operation'),
+      ErrorCode(27, 'NoAlertOpenError', 'An attempt was made to operate on a \
+modal dialog when one was not open.'),
       ErrorCode(28, 'ScriptTimeout', 'A script did not complete before its \
 timeout expired.'),
       ErrorCode(29, 'InvalidElementCoordinates', 'The coordinates provided to \