rb - update w3c error handling

Author: titusfortner

rb/lib/selenium/webdriver/common/w3c_error.rb

@@ -80,7 +80,7 @@ class InvalidSessionIdError < WebDriverError; end
       # An error occurred while executing JavaScript supplied by the user.
       #
 
-      class JavascriptErrorError < WebDriverError; end
+      class JavascriptError < WebDriverError; end
 
       #
       # The target for mouse interaction is not in the browser’s viewport and
@@ -164,7 +164,7 @@ class UnexpectedAlertOpenError < WebDriverError; end
       # the command.
       #
 
-      class UnknownErrorError < WebDriverError; end
+      class UnknownError < WebDriverError; end
 
       #
       # The requested command matched a known URL but did not match a
@@ -179,6 +179,15 @@ class UnknownMethodError < WebDriverError; end
 
       class UnsupportedOperationError < WebDriverError; end
 
+      # aliased for backwards compatibility
+      NoAlertPresentError       = NoSuchAlertError
+      ScriptTimeOutError        = ScriptTimeoutError
+      ObsoleteElementError      = StaleElementReferenceError
+      UnhandledError            = UnknownError
+      UnexpectedJavascriptError = JavascriptError
+      NoAlertOpenError          = NoAlertPresentError
+      ElementNotDisplayedError  = ElementNotVisibleError
+
 
     end # Error
   end # WebDriver

rb/lib/selenium/webdriver/firefox/service.rb

@@ -98,7 +98,7 @@ def start_process
           server_command = [@executable_path, "--binary=#{Firefox::Binary.path}", "--webdriver-port=#{@port}", *@extra_args]
           @process       = ChildProcess.build(*server_command)
 
-          @process.io.inherit! if $DEBUG == true
+          @process.io.inherit!
           @process.start
         end
 

rb/spec/integration/selenium/webdriver/driver_spec.rb

@@ -280,15 +280,10 @@
       # Edge BUG - https://connect.microsoft.com/IE/feedback/details/1849991/
       not_compliant_on :browser => :edge do
         it "times out if the callback is not invoked" do
-          expected_error = Selenium::WebDriver::Error::ScriptTimeoutError
-          not_compliant_on :w3c => true do
-            expected_error = Selenium::WebDriver::Error::ScriptTimeOutError
-          end
-
           expect {
             # Script is expected to be async and explicitly callback, so this should timeout.
             driver.execute_async_script "return 1 + 2;"
-          }.to raise_error(expected_error)
+          }.to raise_error(Selenium::WebDriver::Error::ScriptTimeoutError)
         end
       end
     end

rb/spec/integration/selenium/webdriver/target_locator_spec.rb

@@ -274,30 +274,18 @@
       end
 
       it "raises when calling #text on a closed alert" do
-        expected_alert = Selenium::WebDriver::Error::NoSuchAlertError
-
-        not_compliant_on :w3c => true do
-          expected_alert = Selenium::WebDriver::Error::NoAlertPresentError
-        end
-
         driver.navigate.to url_for("alerts.html")
         driver.find_element(:id => "alert").click
 
         alert = wait_for_alert
         alert.accept
 
-        expect { alert.text }.to raise_error(expected_alert)
+        expect { alert.text }.to raise_error(Selenium::WebDriver::Error::NoSuchAlertError)
       end
 
       not_compliant_on :browser => :ie do
         it "raises NoAlertOpenError if no alert is present" do
-          expected_alert = Selenium::WebDriver::Error::NoSuchAlertError
-          not_compliant_on :w3c => true do
-            expected_alert = Selenium::WebDriver::Error::NoAlertPresentError
-          end
-
-          expect { driver.switch_to.alert }.to raise_error(
-                                                   expected_alert, /alert|modal/i)
+          expect { driver.switch_to.alert }.to raise_error(Selenium::WebDriver::Error::NoSuchAlertError, /alert|modal/i)
         end
       end
 

rb/spec/integration/selenium/webdriver/timeout_spec.rb

@@ -63,14 +63,16 @@
       expect(driver.find_elements(:class_name => "redbox")).to be_empty
     end
 
-    it "should return after first attempt to find many after disabling implicit waits" do
-      add = driver.find_element(:id => "adder")
+    not_compliant_on(:w3c => true, :platform => :windows) do
+      it "should return after first attempt to find many after disabling implicit waits" do
+        add = driver.find_element(:id => "adder")
 
-      driver.manage.timeouts.implicit_wait = 3
-      driver.manage.timeouts.implicit_wait = 0
-      add.click
+        driver.manage.timeouts.implicit_wait = 3
+        driver.manage.timeouts.implicit_wait = 0
+        add.click
 
-      expect(driver.find_elements(:class_name => "redbox")).to be_empty
+        expect(driver.find_elements(:class_name => "redbox")).to be_empty
+      end
     end
   end