selenium-webdriver 2.53.4 → 3.0.0.beta1

data/lib/selenium/webdriver/firefox/profiles_ini.rb

@@ -20,12 +20,10 @@
 module Selenium
   module WebDriver
     module Firefox
-
       # @api private
       class ProfilesIni
-
         def initialize
-          @ini_path = File.join(Util.app_data_path, "profiles.ini")
+          @ini_path = File.join(Util.app_data_path, 'profiles.ini')
           @profile_paths = {}
 
           parse if File.exist?(@ini_path)
@@ -52,29 +50,24 @@ module Selenium
           string.split("\n").each do |line|
             case line
             when /^\[Profile/
-              if p = path_for(name, is_relative, path)
-                @profile_paths[name] = p
-                name, path = nil
-              end
+              name, path = nil if path_for(name, is_relative, path)
             when /^Name=(.+)$/
-              name = $1.strip
+              name = Regexp.last_match(1).strip
             when /^IsRelative=(.+)$/
-              is_relative = $1.strip == "1"
+              is_relative = Regexp.last_match(1).strip == '1'
             when /^Path=(.+)$/
-              path = $1.strip
+              path = Regexp.last_match(1).strip
             end
           end
 
-          if p = path_for(name, is_relative, path)
-            @profile_paths[name] = p
-          end
+          p = path_for(name, is_relative, path)
+          @profile_paths[name] = p if p
         end
 
         def path_for(name, is_relative, path)
           return unless [name, path].any?
-          path = is_relative ? File.join(Util.app_data_path, path) : path
+          is_relative ? File.join(Util.app_data_path, path) : path
         end
-
       end # ProfilesIni
     end # Firefox
   end # WebDriver

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

@@ -20,104 +20,48 @@
 module Selenium
   module WebDriver
     module Firefox
-
       #
       # @api private
       #
-      class Service
-        START_TIMEOUT       = 20
-        SOCKET_LOCK_TIMEOUT = 45
-        STOP_TIMEOUT        = 5
-        DEFAULT_PORT        = 4444
-        MISSING_TEXT        = "Unable to find geckodriver. Please download the executable from https://github.com/mozilla/geckodriver/releases"
-
-        def self.executable_path
-          @executable_path ||= (
-            path = Platform.find_binary("geckodriver*") || Platform.find_binary("wires*")
-            path or raise Error::WebDriverError, MISSING_TEXT
-            Platform.assert_executable path
-
-            path
-          )
-        end
-
-        def self.executable_path=(path)
-          Platform.assert_executable path
-          @executable_path = path
-        end
-
-        def self.default_service(*extra_args)
-          new executable_path, DEFAULT_PORT, *extra_args
-        end
 
-        def initialize(executable_path, port, *extra_args)
-          @executable_path = executable_path
-          @host            = Platform.localhost
-          @port            = Integer(port)
-
-          raise Error::WebDriverError, "invalid port: #{@port}" if @port < 1
-
-          @extra_args = extra_args
-        end
-
-        def start
-          Platform.exit_hook { stop } # make sure we don't leave the server running
-
-          socket_lock.locked do
-            find_free_port
-            start_process
-            connect_until_stable
-          end
-        end
+      class Service < WebDriver::Service
+        DEFAULT_PORT = 4444
 
-        def stop
-          return if @process.nil? || @process.exited?
-
-          Net::HTTP.start(@host, @port) do |http|
-            http.open_timeout = STOP_TIMEOUT / 2
-            http.read_timeout = STOP_TIMEOUT / 2
-
-            http.head("/shutdown")
-          end
-        ensure
-          stop_process
-        end
-
-        def uri
-          URI.parse "http://#{@host}:#{@port}"
-        end
-
-        def find_free_port
-          @port = PortProber.above @port
-        end
+        private
 
         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 || Platform.os == :windows
+          if $DEBUG
+            @process.io.inherit!
+          elsif Platform.windows?
+            # workaround stdio inheritance issue
+            # https://github.com/mozilla/geckodriver/issues/48
+            @process.io.stdout = @process.io.stderr = File.new(Platform.null_device, 'w')
+          end
+
           @process.start
         end
 
         def stop_process
-          @process.poll_for_exit STOP_TIMEOUT
-        rescue ChildProcess::TimeoutError
-          @process.stop STOP_TIMEOUT
-        end
-
-        def connect_until_stable
-          @socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
-
-          unless @socket_poller.connected?
-            raise Error::WebDriverError, "unable to connect to Mozilla geckodriver #{@host}:#{@port}"
+          super
+          return unless Platform.windows? && !$DEBUG
+          begin
+            @process.io.close
+          rescue
+            nil
           end
         end
 
-        def socket_lock
-          @socket_lock ||= SocketLock.new(@port - 1, SOCKET_LOCK_TIMEOUT)
+        def stop_server
+          connect_to_server { |http| http.head('/shutdown') }
         end
 
+        def cannot_connect_error_text
+          "unable to connect to Mozilla geckodriver #{@host}:#{@port}"
+        end
       end # Service
     end # Firefox
   end # WebDriver
-end # Service
+end # Selenium

data/lib/selenium/webdriver/firefox/util.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     module Firefox
-
       # @api private
       module Util
         module_function
@@ -41,7 +40,6 @@ module Selenium
         def stringified?(str)
           str =~ /^".*"$/
         end
-
       end # Util
     end # Firefox
   end # WebDriver

data/lib/selenium/webdriver/firefox/w3c_bridge.rb

@@ -20,16 +20,15 @@
 module Selenium
   module WebDriver
     module Firefox
-
       # @api private
       class W3CBridge < Remote::W3CBridge
-
         def initialize(opts = {})
           caps = opts[:desired_capabilities] ||= Remote::W3CCapabilities.firefox
           Binary.path = caps[:firefox_binary] if caps[:firefox_binary]
 
-          @service = Service.default_service(*extract_service_args(opts))
+          @service = Service.new(Firefox.driver_path, Service::DEFAULT_PORT, *extract_service_args(opts))
           @service.start
+
           opts[:url] = @service.uri
 
           super
@@ -59,7 +58,6 @@ module Selenium
           service_log_path = opts.delete(:service_log_path)
           service_log_path ? ["--log-path=#{service_log_path}"] : []
         end
-
       end # W3CBridge
     end # Firefox
   end # WebDriver

data/lib/selenium/webdriver/ie.rb

@@ -17,23 +17,32 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'selenium/webdriver/ie/bridge'
+require 'selenium/webdriver/ie/service'
+
 module Selenium
   module WebDriver
-
-    # @api private
     module IE
+      MISSING_TEXT = <<-ERROR.tr("\n", '').freeze
+        Unable to find IEDriverServer. Please download the server from
+        http://selenium-release.storage.googleapis.com/index.html and place it
+        somewhere on your PATH. More info at https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver.
+      ERROR
+
       def self.driver_path=(path)
         Platform.assert_executable path
         @driver_path = path
       end
 
       def self.driver_path
-        @driver_path ||= nil
-      end
+        @driver_path ||= begin
+          path = Platform.find_binary('IEDriverServer')
+          raise Error::WebDriverError, MISSING_TEXT unless path
+          Platform.assert_executable path
 
+          path
+        end
+      end
     end # IE
   end # WebDriver
 end # Selenium
-
-require 'selenium/webdriver/ie/server'
-require 'selenium/webdriver/ie/bridge'

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

@@ -20,48 +20,33 @@
 module Selenium
   module WebDriver
     module IE
-
       #
       # @api private
       #
 
       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,
-            :desired_capabilities => caps
+            url: @service.uri,
+            desired_capabilities: caps
           }
-
           remote_opts[:http_client] = http_client if http_client
 
           super(remote_opts)
@@ -77,11 +62,19 @@ module Selenium
 
         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
     end # IE
   end # WebDriver

data/lib/selenium/webdriver/{iphone.rb → ie/service.rb}

@@ -19,10 +19,32 @@
 
 module Selenium
   module WebDriver
-    module IPhone
+    module IE
+      #
+      # @api private
+      #
 
-    end # IPhone
+      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
-
-require 'selenium/webdriver/iphone/bridge'

data/lib/selenium/webdriver/phantomjs.rb

@@ -24,8 +24,8 @@ require 'selenium/webdriver/phantomjs/bridge'
 
 module Selenium
   module WebDriver
-
     module PhantomJS
+      MISSING_TEXT = 'Unable to find phantomjs executable.'.freeze
 
       def self.path=(path)
         Platform.assert_executable path
@@ -33,9 +33,14 @@ module Selenium
       end
 
       def self.path
-        @path ||= Platform.find_binary("phantomjs")
-      end
+        @path ||= begin
+          path = Platform.find_binary('phantomjs')
+          raise Error::WebDriverError, MISSING_TEXT unless path
+          Platform.assert_executable path
 
+          path
+        end
+      end
     end # PhantomJS
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/phantomjs/bridge.rb

@@ -20,33 +20,32 @@
 module Selenium
   module WebDriver
     module PhantomJS
-
-
+      #
       # @api private
-      class Bridge < Remote::Bridge
+      #
 
+      class Bridge < Remote::Bridge
         def initialize(opts = {})
           http_client = opts.delete(:http_client)
           caps        = opts.delete(:desired_capabilities) { Remote::Capabilities.phantomjs }
 
-          if opts.has_key?(:url)
+          if opts.key?(:url)
             url = opts.delete(:url)
           else
             args = opts.delete(:args) || caps['phantomjs.cli.args']
-            port = opts.delete(:port)
 
-            @service = Service.default_service(port)
-            @service.start(args)
+            @service = Service.new(PhantomJS.path, Service::DEFAULT_PORT, *args)
+            @service.start
 
             url = @service.uri
           end
 
           remote_opts = {
-            :url                  => url,
-            :desired_capabilities => caps
+            url: url,
+            desired_capabilities: caps
           }
 
-          remote_opts.merge!(:http_client => http_client) if http_client
+          remote_opts[:http_client] = http_client if http_client
 
           super(remote_opts)
         end
@@ -71,7 +70,6 @@ module Selenium
         ensure
           @service.stop if @service
         end
-
       end # Bridge
     end # PhantomJS
   end # WebDriver