[rb] remove remaining Edge workarounds for remote server

Author: titusfortner

rb/lib/selenium/webdriver/edge/bridge.rb

@@ -51,6 +51,20 @@ def driver_extensions
           ]
         end
 
+        def commands(command)
+          unsupported = %i[execute_script execute_async_script submit_element double_click
+           mouse_down mouse_up mouse_move_to click
+           send_keys_to_active_element get_window_handles get_current_window_handle
+           get_window_size set_window_size get_window_position set_window_position
+           maximize_window get_alert_text accept_alert dismiss_alert]
+          if unsupported.include? command
+            Remote::Bridge::COMMANDS[command]
+          else
+            super
+          end
+
+        end
+
         def capabilities
           @capabilities ||= Remote::Capabilities.edge
         end
@@ -61,6 +75,87 @@ def quit
           @service.stop if @service
         end
 
+        def execute_script(script, *args)
+          result = execute :execute_script, {}, {script: script, args: args}
+          unwrap_script_result result
+        end
+
+        def execute_async_script(script, *args)
+          result = execute :execute_async_script, {}, {script: script, args: args}
+          unwrap_script_result result
+        end
+
+        def submit_element(element)
+          execute :submit_element, id: element['ELEMENT']
+        end
+
+        def double_click
+          execute :double_click
+        end
+
+        def click
+          execute :click, {}, {button: 0}
+        end
+
+        def context_click
+          execute :click, {}, {button: 2}
+        end
+
+        def mouse_down
+          execute :mouse_down
+        end
+
+        def mouse_up
+          execute :mouse_up
+        end
+
+        def mouse_move_to(element, x = nil, y = nil)
+          element_id = element['ELEMENT'] if element
+          params = {element: element_id}
+
+          if x && y
+            params[:xoffset] = x
+            params[:yoffset] = y
+          end
+
+          execute :mouse_move_to, {}, params
+        end
+
+        def send_keys_to_active_element(key)
+          execute :send_keys_to_active_element, {}, {value: key}
+        end
+
+        def window_handle
+          execute :get_current_window_handle
+        end
+
+        def window_size(handle = :current)
+          data = execute :get_window_size, window_handle: handle
+
+          Dimension.new data['width'], data['height']
+        end
+
+        def resize_window(width, height, handle = :current)
+          execute :set_window_size, {window_handle: handle},
+                  {width: width,
+                   height: height}
+        end
+
+        def window_position(handle = :current)
+          data = execute :get_window_position, window_handle: handle
+
+          Point.new data['x'], data['y']
+        end
+
+        def reposition_window(x, y, handle = :current)
+          execute :set_window_position, {window_handle: handle},
+                  {x: x, y: y}
+        end
+
+        def maximize_window(handle = :current)
+          execute :maximize_window, window_handle: handle
+        end
+
         private
 
         def extract_service_args(args = {})

rb/lib/selenium/webdriver/edge/legacy_support.rb

@@ -93,6 +93,10 @@ def driver_extensions
           ]
         end
 
+        def commands(command)
+          COMMANDS[command]
+        end
+
         #
         # Returns the current session ID.
         #
@@ -628,7 +632,7 @@ def execute(*args)
         #
 
         def raw_execute(command, opts = {}, command_hash = nil)
-          verb, path = COMMANDS[command] || raise(ArgumentError, "unknown command: #{command.inspect}")
+          verb, path = commands(command) || raise(ArgumentError, "unknown command: #{command.inspect}")
           path = path.dup
 
           path[':session_id'] = @session_id if path.include?(':session_id')

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

@@ -212,7 +212,7 @@ class Bridge
 
             get_available_log_types: [:get, 'session/:session_id/log/types'.freeze],
             get_log: [:post, 'session/:session_id/log'.freeze]
-        }
+        }.freeze
       end
     end # Remote
   end # WebDriver

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

@@ -44,7 +44,6 @@ class W3CBridge
         #
 
         def initialize(opts = {})
-          edge_check(opts)
 
           opts = opts.dup
 
@@ -78,13 +77,6 @@ def browser
           )
         end
 
-        def edge_check(opts)
-          caps = opts[:desired_capabilities]
-          return unless caps && caps[:browser_name] && caps[:browser_name] == 'MicrosoftEdge'
-          require_relative '../edge/legacy_support'
-          extend Edge::LegacySupport
-        end
-
         def driver_extensions
           [
             DriverExtensions::HasInputDevices,
@@ -98,6 +90,15 @@ def driver_extensions
           ]
         end
 
+        def commands(command)
+          case command
+          when :status, :is_element_displayed
+            Bridge::COMMANDS[command]
+          else
+            COMMANDS[command]
+          end
+        end
+
         #
         # Returns the current session ID.
         #
@@ -118,8 +119,6 @@ def create_session(desired_capabilities)
         end
 
         def status
-          jwp = Selenium::WebDriver::Remote::Bridge::COMMANDS[:status]
-          self.class.command(:status, jwp.first, jwp.last)
           execute :status
         end
 
@@ -546,8 +545,6 @@ def element_selected?(element)
         end
 
         def element_displayed?(element)
-          jwp = Selenium::WebDriver::Remote::Bridge::COMMANDS[:is_element_displayed]
-          self.class.command(:is_element_displayed, jwp.first, jwp.last)
           execute :is_element_displayed, id: element.values.first
         end
 
@@ -626,7 +623,7 @@ def execute(*args)
         #
 
         def raw_execute(command, opts = {}, command_hash = nil)
-          verb, path = COMMANDS[command] || raise(ArgumentError, "unknown command: #{command.inspect}")
+          verb, path = commands(command) || raise(ArgumentError, "unknown command: #{command.inspect}")
           path = path.dup
 
           path[':session_id'] = @session_id if path.include?(':session_id')

rb/lib/selenium/webdriver/remote/w3c_bridge.rb

@@ -132,7 +132,7 @@ class W3CBridge
 
             take_screenshot: [:get, 'session/:session_id/screenshot'.freeze],
             take_element_screenshot: [:get, 'session/:session_id/element/:id/screenshot'.freeze]
-        }
+        }.freeze
       end
     end # Remote
   end # WebDriver