rb - add support for w3c commands

Author: titusfortner

rb/lib/selenium/webdriver/common/search_context.rb

@@ -59,6 +59,9 @@ def find_element(*args)
         end
 
         bridge.find_element_by by, what.to_s, ref
+      rescue Selenium::WebDriver::Error::TimeOutError
+        # Implicit Wait times out in Edge
+        raise Selenium::WebDriver::Error::NoSuchElementError
       end
 
       #
@@ -79,6 +82,9 @@ def find_elements(*args)
         end
 
         bridge.find_elements_by by, what.to_s, ref
+      rescue Selenium::WebDriver::Error::TimeOutError
+        # Implicit Wait times out in Edge
+        []
       end
 
       private

rb/lib/selenium/webdriver/common/target_locator.rb

@@ -63,6 +63,10 @@ def window(id)
             nil
           end
 
+          unless @bridge.getWindowHandles.include? id
+            raise Error::NoSuchWindowError, "The specified identifier '#{id}' is not found in the window handle list"
+          end
+
           @bridge.switchToWindow id
 
           begin

rb/lib/selenium/webdriver/remote/bridge.rb

@@ -158,19 +158,23 @@ def getAlert
         end
 
         def acceptAlert
-          execute :acceptAlert
+          command = capabilities.browser_name == 'MicrosoftEdge' ? :acceptAlertW3C : :acceptAlert
+          execute command
         end
 
         def dismissAlert
-          execute :dismissAlert
+          command = capabilities.browser_name == 'MicrosoftEdge' ? :dismissAlertW3C : :dismissAlert
+          execute command
         end
 
         def setAlertValue(keys)
-          execute :setAlertValue, {}, :text => keys.to_s
+          command = capabilities.browser_name == 'MicrosoftEdge' ? :setAlertValueW3C : :setAlertValue
+          execute command, {}, :text => keys.to_s
         end
 
         def getAlertText
-          execute :getAlertText
+          command = capabilities.browser_name == 'MicrosoftEdge' ? :getAlertTextW3C : :getAlertText
+          execute command
         end
 
         #
@@ -206,7 +210,11 @@ def setVisible(bool)
         end
 
         def switchToWindow(name)
-          execute :switchToWindow, {}, :name => name
+          if capabilities.browser_name == 'MicrosoftEdge'
+            execute :switchToWindow, {}, :handle => name
+          else
+            execute :switchToWindow, {}, :name => name
+          end
         end
 
         def switchToFrame(id)

rb/lib/selenium/webdriver/remote/commands.rb

@@ -78,6 +78,11 @@ class Selenium::WebDriver::Remote::Bridge
   command :getAlertText,                           :get,     "session/:session_id/alert_text"
   command :setAlertValue,                          :post,    "session/:session_id/alert_text"
 
+  command :dismissAlertW3C,                           :post,    "session/:session_id/alert/dismiss"
+  command :acceptAlertW3C,                            :post,    "session/:session_id/alert/accept"
+  command :getAlertTextW3C,                           :get,     "session/:session_id/alert/text"
+  command :setAlertValueW3C,                          :post,    "session/:session_id/alert/text"
+
   #
   # target locator
   #