rb: Refactor IE server to use shared service class

Author: p0deje

rb/lib/selenium/webdriver/ie.rb

@@ -17,8 +17,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'selenium/webdriver/ie/server'
 require 'selenium/webdriver/ie/bridge'
+require 'selenium/webdriver/ie/service'
 
 module Selenium
   module WebDriver

rb/lib/selenium/webdriver/ie/bridge.rb

@@ -27,41 +27,28 @@ module IE
 
       class Bridge < Remote::Bridge
 
-        HOST            = Platform.localhost
-        DEFAULT_PORT    = 5555
-        DEFAULT_TIMEOUT = 30
-
         def initialize(opts = {})
           caps           = opts.delete(:desired_capabilities) { Remote::Capabilities.internet_explorer }
-          timeout        = opts.delete(:timeout) { DEFAULT_TIMEOUT }
-          port           = opts.delete(:port) { DEFAULT_PORT }
+          port           = opts.delete(:port) { Service::DEFAULT_PORT }
           http_client    = opts.delete(:http_client)
           ignore_mode    = opts.delete(:introduce_flakiness_by_ignoring_security_domains)
           native_events  = opts.delete(:native_events) != false
-          implementation = opts.delete(:implementation)
-
-          @server = Server.get(:implementation => implementation)
 
-          @server.log_level = opts.delete(:log_level) if opts[:log_level]
-          @server.log_file  = opts.delete(:log_file) if opts[:log_file]
+          @service = Service.new(IE.driver_path, port, *extract_service_args(opts))
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
-          @port = @server.start Integer(port), timeout
-
-          if ignore_mode
-            caps['ignoreProtectedModeSettings'] = true
-          end
+          @service.start
 
+          caps['ignoreProtectedModeSettings'] = true if ignore_mode
           caps['nativeEvents'] = native_events
 
           remote_opts = {
-            :url => @server.uri,
+            :url => @service.uri,
             :desired_capabilities => caps
           }
-
           remote_opts[:http_client] = http_client if http_client
 
           super(remote_opts)
@@ -77,9 +64,18 @@ def driver_extensions
 
         def quit
           super
-          nil
         ensure
-          @server.stop
+          @service.stop if @service
+        end
+
+        private
+
+        def extract_service_args(opts)
+          args = []
+          args << "--log-level=#{opts.delete(:log_level).to_s.upcase}" if opts[:log_level]
+          args << "--log-file=#{opts.delete(:log_file)}" if opts[:log_file]
+          args << "--implementation=#{opts.delete(:implementation).to_s.upcase}" if opts[:implementation]
+          args
         end
 
       end # Bridge

rb/lib/selenium/webdriver/ie/server.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+#
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    module IE
+
+      #
+      # @api private
+      #
+
+      class Service < WebDriver::Service
+        DEFAULT_PORT = 5555
+
+        private
+
+        def stop_server
+          # server can only be stopped as process
+        end
+
+        def start_process
+          server_command = [@executable_path, "--port=#{@port}", *@extra_args]
+          @process       = ChildProcess.new(*server_command)
+
+          @process.io.inherit! if $DEBUG
+          @process.start
+        end
+
+        def cannot_connect_error_text
+          "unable to connect to IE server #{@host}:#{@port}"
+        end
+
+      end # Server
+    end # IE
+  end # WebDriver
+end # Selenium