selenium-webdriver 2.53.4 → 3.0.0.beta1

data/lib/selenium/webdriver/chrome/profile.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     module Chrome
-
       #
       # @private
       #
@@ -53,17 +52,17 @@ module Selenium
         #
 
         def []=(key, value)
-          parts = key.split(".")
-          parts[0..-2].inject(prefs) { |pr, k| pr[k] ||= {} }[parts.last] = value
+          parts = key.split('.')
+          parts[0..-2].inject(prefs) { |a, e| a[e] ||= {} }[parts.last] = value
         end
 
         def [](key)
-          parts = key.split(".")
-          parts.inject(prefs) { |pr, k| pr.fetch(k) }
+          parts = key.split('.')
+          parts.inject(prefs) { |a, e| a.fetch(e) }
         end
 
         def layout_on_disk
-          dir = @model ? create_tmp_copy(@model) : Dir.mktmpdir("webdriver-chrome-profile")
+          dir = @model ? create_tmp_copy(@model) : Dir.mktmpdir('webdriver-chrome-profile')
           FileReaper << dir
 
           write_prefs_to dir
@@ -73,7 +72,7 @@ module Selenium
 
         def as_json(opts = nil)
           extensions = @extensions.map do |crx_path|
-            File.open(crx_path, "rb") { |crx_file| Base64.strict_encode64 crx_file.read }
+            File.open(crx_path, 'rb') { |crx_file| Base64.strict_encode64 crx_file.read }
           end
 
           extensions.concat(@encoded_extensions)
@@ -87,7 +86,7 @@ module Selenium
           prefs_file = prefs_file_for(dir)
 
           FileUtils.mkdir_p File.dirname(prefs_file)
-          File.open(prefs_file, "w") { |file| file << JSON.generate(prefs)  }
+          File.open(prefs_file, 'w') { |file| file << JSON.generate(prefs) }
         end
 
         def prefs
@@ -103,7 +102,6 @@ module Selenium
           File.join dir, 'Default', 'Preferences'
         end
       end # Profile
-
     end # Chrome
   end # WebDriver
 end # Selenium

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

@@ -20,107 +20,31 @@
 module Selenium
   module WebDriver
     module Chrome
-
       #
       # @api private
       #
 
-      class Service
-        START_TIMEOUT       = 20
-        SOCKET_LOCK_TIMEOUT = 45
-        STOP_TIMEOUT        = 5
-        DEFAULT_PORT        = 9515
-        MISSING_TEXT        = "Unable to find the chromedriver executable. Please download the server from http://chromedriver.storage.googleapis.com/index.html and place it somewhere on your PATH. More info at https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver."
-
-        def self.executable_path
-          @executable_path ||= (
-            path = Platform.find_binary "chromedriver"
-            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
-
-        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.get("/shutdown")
-          end
-        ensure
-          stop_process
-        end
-
-        def uri
-          URI.parse "http://#{@host}:#{@port}"
-        end
+      class Service < WebDriver::Service
+        DEFAULT_PORT = 9515
 
         private
 
-        def find_free_port
-          @port = PortProber.above @port
-        end
-
         def start_process
           server_command = [@executable_path, "--port=#{@port}", *@extra_args]
           @process       = ChildProcess.build(*server_command)
 
-          @process.io.inherit! if $DEBUG == true
+          @process.io.inherit! if $DEBUG
           @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 chromedriver #{@host}:#{@port}"
-          end
+        def stop_server
+          connect_to_server { |http| http.get('/shutdown') }
         end
 
-        def socket_lock
-          @socket_lock ||= SocketLock.new(@port - 1, SOCKET_LOCK_TIMEOUT)
+        def cannot_connect_error_text
+          "unable to connect to chromedriver #{@host}:#{@port}"
         end
-
       end # Service
     end # Chrome
   end # WebDriver
-end # Service
+end # Selenium

data/lib/selenium/webdriver/common.rb

@@ -17,14 +17,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'selenium/webdriver/common/core_ext/dir'
-require 'selenium/webdriver/common/core_ext/base64'
 require 'selenium/webdriver/common/w3c_error'
 require 'selenium/webdriver/common/error'
 require 'selenium/webdriver/common/platform'
 require 'selenium/webdriver/common/proxy'
 require 'selenium/webdriver/common/log_entry'
 require 'selenium/webdriver/common/file_reaper'
+require 'selenium/webdriver/common/service'
 require 'selenium/webdriver/common/socket_lock'
 require 'selenium/webdriver/common/socket_poller'
 require 'selenium/webdriver/common/port_prober'

data/lib/selenium/webdriver/common/action_builder.rb

@@ -19,7 +19,6 @@
 
 module Selenium
   module WebDriver
-
     #
     # The ActionBuilder provides the user a way to set up and perform
     # complex user interactions.
@@ -39,18 +38,17 @@ module Selenium
     #
 
     class ActionBuilder
-
       #
       # @api private
       #
 
       def initialize(mouse, keyboard)
-        @devices    = {
-          :mouse    => mouse,
-          :keyboard => keyboard
+        @devices = {
+          mouse: mouse,
+          keyboard: keyboard
         }
 
-        @actions  = []
+        @actions = []
       end
 
       #
@@ -70,7 +68,7 @@ module Selenium
       #
       # @example Press a key on an element
       #
-      #    el = driver.find_element(:id, "some_id")
+      #    el = driver.find_element(id: "some_id")
       #    driver.action.key_down(el, :shift).perform
       #
       # @param [:shift, :alt, :control, :command, :meta] The key to press.
@@ -80,9 +78,7 @@ module Selenium
       #
 
       def key_down(*args)
-        if args.first.kind_of? Element
-          @actions << [:mouse, :click, [args.shift]]
-        end
+        @actions << [:mouse, :click, [args.shift]] if args.first.is_a? Element
 
         @actions << [:keyboard, :press, args]
         self
@@ -98,7 +94,7 @@ module Selenium
       #
       # @example Release a key from an element
       #
-      #   el = driver.find_element(:id, "some_id")
+      #   el = driver.find_element(id: "some_id")
       #   driver.action.key_up(el, :alt).perform
       #
       # @param [:shift, :alt, :control, :command, :meta] The modifier key to release.
@@ -108,9 +104,7 @@ module Selenium
       #
 
       def key_up(*args)
-        if args.first.kind_of? Element
-          @actions << [:mouse, :click, [args.shift]]
-        end
+        @actions << [:mouse, :click, [args.shift]] if args.first.is_a? Element
 
         @actions << [:keyboard, :release, args]
         self
@@ -125,7 +119,7 @@ module Selenium
       #
       # @example Send the text "help" to an element
       #
-      #   el = driver.find_element(:id, "some_id")
+      #   el = driver.find_element(id: "some_id")
       #   driver.action.send_keys(el, "help").perform
       #
       # @example Send the text "help" to the currently focused element
@@ -138,9 +132,7 @@ module Selenium
       #
 
       def send_keys(*args)
-        if args.first.kind_of? Element
-          @actions << [:mouse, :click, [args.shift]]
-        end
+        @actions << [:mouse, :click, [args.shift]] if args.first.is_a? Element
 
         @actions << [:keyboard, :send_keys, args]
         self
@@ -154,7 +146,7 @@ module Selenium
       #
       # @example Clicking and holding on some element
       #
-      #    el = driver.find_element(:id, "some_id")
+      #    el = driver.find_element(id: "some_id")
       #    driver.action.click_and_hold(el).perform
       #
       # @param [Selenium::WebDriver::Element] element the element to move to and click.
@@ -171,7 +163,7 @@ module Selenium
       #
       # @example Releasing an element after clicking and holding it
       #
-      #    el = driver.find_element(:id, "some_id")
+      #    el = driver.find_element(id: "some_id")
       #    driver.action.click_and_hold(el).release.perform
       #
       # @return [ActionBuilder] A self reference.
@@ -191,7 +183,7 @@ module Selenium
       #
       # @example Clicking on an element
       #
-      #    el = driver.find_element(:id, "some_id")
+      #    el = driver.find_element(id: "some_id")
       #    driver.action.click(el).perform
       #
       # @example Clicking at the current mouse position
@@ -214,7 +206,7 @@ module Selenium
       #
       # @example Double click an element
       #
-      #    el = driver.find_element(:id, "some_id")
+      #    el = driver.find_element(id: "some_id")
       #    driver.action.double_click(el).perform
       #
       # @param [Selenium::WebDriver::Element] element An optional element to move to.
@@ -235,12 +227,12 @@ module Selenium
       #
       # @example Scroll element into view and move the mouse to it
       #
-      #   el = driver.find_element(:id, "some_id")
+      #   el = driver.find_element(id: "some_id")
       #   driver.action.move_to(el).perform
       #
       # @example
       #
-      #   el = driver.find_element(:id, "some_id")
+      #   el = driver.find_element(id: "some_id")
       #   driver.action.move_to(el, 100, 100).perform
       #
       # @param [Selenium::WebDriver::Element] element to move to.
@@ -252,11 +244,11 @@ module Selenium
       #
 
       def move_to(element, right_by = nil, down_by = nil)
-        if right_by && down_by
-          @actions << [:mouse, :move_to, [element, right_by, down_by]]
-        else
-          @actions << [:mouse, :move_to, [element]]
-        end
+        @actions << if right_by && down_by
+                      [:mouse, :move_to, [element, Integer(right_by), Integer(down_by)]]
+                    else
+                      [:mouse, :move_to, [element]]
+                    end
 
         self
       end
@@ -281,7 +273,7 @@ module Selenium
       #
 
       def move_by(right_by, down_by)
-        @actions << [:mouse, :move_by, [right_by, down_by]]
+        @actions << [:mouse, :move_by, [Integer(right_by), Integer(down_by)]]
         self
       end
 
@@ -291,7 +283,7 @@ module Selenium
       #
       # @example Context-click at middle of given element
       #
-      #   el = driver.find_element(:id, "some_id")
+      #   el = driver.find_element(id: "some_id")
       #   driver.action.context_click(el).perform
       #
       # @param [Selenium::WebDriver::Element] element An element to context click.
@@ -310,8 +302,8 @@ module Selenium
       #
       # @example Drag and drop one element onto another
       #
-      #   el1 = driver.find_element(:id, "some_id1")
-      #   el2 = driver.find_element(:id, "some_id2")
+      #   el1 = driver.find_element(id: "some_id1")
+      #   el2 = driver.find_element(id: "some_id2")
       #   driver.action.drag_and_drop(el1, el2).perform
       #
       # @param [Selenium::WebDriver::Element] source element to emulate button down at.
@@ -334,7 +326,7 @@ module Selenium
       #
       # @example Drag and drop an element by offset
       #
-      #   el = driver.find_element(:id, "some_id1")
+      #   el = driver.find_element(id: "some_id1")
       #   driver.action.drag_and_drop_by(el, 100, 100).perform
       #
       # @param [Selenium::WebDriver::Element] source Element to emulate button down at.
@@ -353,19 +345,17 @@ module Selenium
         self
       end
 
-
       #
       # Executes the actions added to the builder.
       #
 
       def perform
-        @actions.each { |receiver, method, args|
+        @actions.each do |receiver, method, args|
           @devices.fetch(receiver).__send__(method, *args)
-        }
+        end
 
         nil
       end
-
     end # ActionBuilder
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/alert.rb

@@ -20,36 +20,33 @@
 module Selenium
   module WebDriver
     class Alert
-
       def initialize(bridge)
         @bridge = bridge
 
         # fail fast if the alert doesn't exist
-        bridge.getAlertText
+        bridge.alert_text
       end
 
       def accept
-        @bridge.acceptAlert
+        @bridge.accept_alert
       end
 
       def dismiss
-        @bridge.dismissAlert
+        @bridge.dismiss_alert
       end
 
       def send_keys(keys)
-        @bridge.setAlertValue keys
+        @bridge.alert = keys
       end
 
       def text
-        @bridge.getAlertText
+        @bridge.alert_text
       end
-      
+
       def authenticate(username, password)
-        @bridge.setAuthentication username: username, password: password
+        @bridge.authentication(username: username, password: password)
         accept
       end
-
     end # Alert
   end # WebDriver
 end # Selenium
-

data/lib/selenium/webdriver/common/bridge_helper.rb

@@ -19,7 +19,6 @@
 
 module Selenium
   module WebDriver
-
     #
     # Shared across bridges
     #
@@ -27,24 +26,21 @@ module Selenium
     #
 
     module BridgeHelper
-
       def unwrap_script_result(arg)
         case arg
         when Array
           arg.map { |e| unwrap_script_result(e) }
         when Hash
-          if id = element_id_from(arg)
-            Element.new self, id
-          else
-            arg.each { |k, v| arg[k] = unwrap_script_result(v) }
-          end
+          id = element_id_from(arg)
+          return Element.new(self, id) if id
+          arg.each { |k, v| arg[k] = unwrap_script_result(v) }
         else
           arg
         end
       end
 
       def element_id_from(id)
-        id['ELEMENT'] or id['element-6066-11e4-a52e-4f735466cecf']
+        id['ELEMENT'] || id['element-6066-11e4-a52e-4f735466cecf']
       end
 
       def parse_cookie_string(str)
@@ -57,22 +53,22 @@ module Selenium
           'secure'  => false
         }
 
-        str.split(";").each do |attribute|
-          if attribute.include? "="
-            key, value = attribute.strip.split("=", 2)
+        str.split(';').each do |attribute|
+          if attribute.include? '='
+            key, value = attribute.strip.split('=', 2)
             if result['name'].empty?
               result['name']  = key
               result['value'] = value
             elsif key == 'domain' && value.strip =~ /^\.(.+)/
-              result['domain'] = $1
+              result['domain'] = Regexp.last_match(1)
             elsif key && value
               result[key] = value
             end
-          elsif attribute == "secure"
+          elsif attribute == 'secure'
             result['secure'] = true
           end
 
-          unless [nil, "", "0"].include?(result['expires'])
+          unless [nil, '', '0'].include?(result['expires'])
             # firefox stores expiry as number of seconds
             result['expires'] = Time.at(result['expires'].to_i)
           end
@@ -80,7 +76,6 @@ module Selenium
 
         result
       end
-
     end # BridgeHelper
   end # WebDriver
 end # Selenium