selenium-webdriver 2.53.4 → 3.0.0.beta1

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

@@ -23,12 +23,12 @@ module Selenium
       attr_reader :level, :timestamp, :message
 
       def initialize(level, timestamp, message)
-        @level      = level
+        @level = level
         @timestamp = timestamp
-        @message    = message
+        @message = message
       end
 
-      def as_json(opts = nil)
+      def as_json(*)
         {
           'level'     => level,
           'timestamp' => timestamp,
@@ -43,7 +43,6 @@ module Selenium
       def time
         Time.at timestamp / 1000
       end
-
     end # LogEntry
   end # WebDriver
 end # Selenium

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

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     class Logs
-
       #
       # @api private
       #
@@ -30,13 +29,12 @@ module Selenium
       end
 
       def get(type)
-        @bridge.getLog type
+        @bridge.log type
       end
 
       def available_types
-        @bridge.getAvailableLogTypes
+        @bridge.available_log_types
       end
-
     end # Logs
   end # WebDriver
 end # Selenium

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

@@ -19,14 +19,12 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     # @see ActionBuilder
     #
 
     class Mouse
-
       def initialize(bridge)
         @bridge = bridge
       end
@@ -38,22 +36,22 @@ module Selenium
 
       def double_click(element = nil)
         move_if_needed element
-        @bridge.doubleClick
+        @bridge.double_click
       end
 
       def context_click(element = nil)
         move_if_needed element
-        @bridge.contextClick
+        @bridge.context_click
       end
 
       def down(element = nil)
         move_if_needed element
-        @bridge.mouseDown
+        @bridge.mouse_down
       end
 
       def up(element = nil)
         move_if_needed element
-        @bridge.mouseUp
+        @bridge.mouse_up
       end
 
       #
@@ -68,11 +66,11 @@ module Selenium
       def move_to(element, right_by = nil, down_by = nil)
         assert_element element
 
-        @bridge.mouseMoveTo element.ref, right_by, down_by
+        @bridge.mouse_move_to element.ref, right_by, down_by
       end
 
       def move_by(right_by, down_by)
-        @bridge.mouseMoveTo nil, Integer(right_by), Integer(down_by)
+        @bridge.mouse_move_to nil, Integer(right_by), Integer(down_by)
       end
 
       private
@@ -82,10 +80,9 @@ module Selenium
       end
 
       def assert_element(element)
-        unless element.kind_of? Element
-          raise TypeError, "expected #{Element}, got #{element.inspect}:#{element.class}"
-        end
+        return if element.is_a? Element
+        raise TypeError, "expected #{Element}, got #{element.inspect}:#{element.class}"
       end
     end # Mouse
   end # WebDriver
-end  # Selenium
+end # Selenium

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

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     class Navigation
-
       def initialize(bridge)
         @bridge = bridge
       end
@@ -38,7 +37,7 @@ module Selenium
       #
 
       def back
-        @bridge.goBack
+        @bridge.go_back
       end
 
       #
@@ -46,7 +45,7 @@ module Selenium
       #
 
       def forward
-        @bridge.goForward
+        @bridge.go_forward
       end
 
       #
@@ -56,7 +55,6 @@ module Selenium
       def refresh
         @bridge.refresh
       end
-
     end # Navigation
   end # WebDriver
 end # Selenium

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

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     class Options
-
       #
       # @api private
       #
@@ -43,17 +42,16 @@ module Selenium
       #
 
       def add_cookie(opts = {})
-        raise ArgumentError, "name is required" unless opts[:name]
-        raise ArgumentError, "value is required" unless opts[:value]
+        raise ArgumentError, 'name is required' unless opts[:name]
+        raise ArgumentError, 'value is required' unless opts[:value]
 
-        opts[:path] ||= "/"
+        opts[:path] ||= '/'
         opts[:secure] ||= false
 
-        if obj = opts.delete(:expires)
-          opts[:expiry] = seconds_from(obj).to_i
-        end
+        obj = opts.delete(:expires)
+        opts[:expiry] = seconds_from(obj).to_i if obj
 
-        @bridge.addCookie opts
+        @bridge.add_cookie opts
       end
 
       #
@@ -74,7 +72,7 @@ module Selenium
       #
 
       def delete_cookie(name)
-        @bridge.deleteCookie name
+        @bridge.delete_cookie name
       end
 
       #
@@ -82,7 +80,7 @@ module Selenium
       #
 
       def delete_all_cookies
-        @bridge.deleteAllCookies
+        @bridge.delete_all_cookies
       end
 
       #
@@ -92,14 +90,14 @@ module Selenium
       #
 
       def all_cookies
-        @bridge.getAllCookies.map do |cookie|
+        @bridge.cookies.map do |cookie|
           {
-            :name    => cookie["name"],
-            :value   => cookie["value"],
-            :path    => cookie["path"],
-            :domain  => cookie["domain"] && strip_port(cookie["domain"]),
-            :expires => cookie["expiry"] && datetime_at(cookie['expiry']),
-            :secure  => cookie["secure"]
+            name: cookie['name'],
+            value: cookie['value'],
+            path: cookie['path'],
+            domain: cookie['domain'] && strip_port(cookie['domain']),
+            expires: cookie['expiry'] && datetime_at(cookie['expiry']),
+            secure: cookie['secure']
           }
         end
       end
@@ -146,9 +144,8 @@ module Selenium
       end
 
       def strip_port(str)
-        str.split(":", 2).first
+        str.split(':', 2).first
       end
-
     end # Options
   end # WebDriver
 end # Selenium

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

@@ -22,10 +22,8 @@ require 'socket'
 
 module Selenium
   module WebDriver
-
     # @api private
     module Platform
-
       module_function
 
       def home
@@ -34,53 +32,40 @@ module Selenium
       end
 
       def engine
-        @engine ||= (
-          if defined? RUBY_ENGINE
-            RUBY_ENGINE.to_sym
-          else
-            :ruby
-          end
-        )
+        @engine ||= defined?(RUBY_ENGINE) ? RUBY_ENGINE.to_sym : :ruby
       end
 
       def os
-        @os ||= (
-          host_os = RbConfig::CONFIG['host_os']
-          case host_os
-          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            :windows
-          when /darwin|mac os/
-            :macosx
-          when /linux/
-            :linux
-          when /solaris|bsd/
-            :unix
-          else
-            raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
-          end
-        )
+        host_os = RbConfig::CONFIG['host_os']
+        @os ||= case host_os
+                when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+                  :windows
+                when /darwin|mac os/
+                  :macosx
+                when /linux/
+                  :linux
+                when /solaris|bsd/
+                  :unix
+                else
+                  raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+                end
       end
 
       def ci
-        if ENV['TRAVIS']
-          :travis
-        elsif ENV['JENKINS']
-          :jenkins
-        end
+        return :travis if ENV['TRAVIS']
+        :jenkins if ENV['JENKINS']
       end
 
       def bitsize
-        @bitsize ||= (
-          if defined?(FFI::Platform::ADDRESS_SIZE)
-            FFI::Platform::ADDRESS_SIZE
-          elsif defined?(FFI)
-            FFI.type_size(:pointer) == 4 ? 32 : 64
-          elsif jruby?
-            Integer(ENV_JAVA['sun.arch.data.model'])
-          else
-            1.size == 4 ? 32 : 64
-          end
-        )
+        @bitsize ||= if defined?(FFI::Platform::ADDRESS_SIZE)
+                       FFI::Platform::ADDRESS_SIZE
+                     elsif defined?(FFI)
+                       FFI.type_size(:pointer) == 4 ? 32 : 64
+                     elsif jruby?
+                       Integer(ENV_JAVA['sun.arch.data.model'])
+                     else
+                       1.size == 4 ? 32 : 64
+                     end
       end
 
       def jruby?
@@ -91,12 +76,8 @@ module Selenium
         engine == :ironruby
       end
 
-      def ruby187?
-        !!(RUBY_VERSION =~ /^1\.8\.7/)
-      end
-
-      def ruby19?
-        !!(RUBY_VERSION =~ /^1\.9/)
+      def ruby_version
+        RUBY_VERSION
       end
 
       def windows?
@@ -112,26 +93,25 @@ module Selenium
       end
 
       def cygwin?
-        !!(RUBY_PLATFORM =~ /cygwin/)
+        RUBY_PLATFORM =~ /cygwin/
+        !Regexp.last_match.nil?
       end
 
       def null_device
-        @null_device ||= (
-          if defined?(File::NULL)
-            File::NULL
-          else
-            Platform.windows? ? 'NUL' : '/dev/null'
-          end
-        )
+        @null_device ||= if defined?(File::NULL)
+                           File::NULL
+                         else
+                           Platform.windows? ? 'NUL' : '/dev/null'
+                         end
       end
 
       def wrap_in_quotes_if_necessary(str)
-        windows? && !cygwin? ? %{"#{str}"} : str
+        windows? && !cygwin? ? %("#{str}") : str
       end
 
       def cygwin_path(path, opts = {})
         flags = []
-        opts.each { |k,v| flags << "--#{k}" if v }
+        opts.each { |k, v| flags << "--#{k}" if v }
 
         `cygpath #{flags.join ' '} "#{path}"`.strip
       end
@@ -141,25 +121,21 @@ module Selenium
       end
 
       def assert_file(path)
-        unless File.file? path
-          raise Error::WebDriverError, "not a file: #{path.inspect}"
-        end
+        return if File.file? path
+        raise Error::WebDriverError, "not a file: #{path.inspect}"
       end
 
       def assert_executable(path)
         assert_file(path)
 
-        unless File.executable? path
-          raise Error::WebDriverError, "not executable: #{path.inspect}"
-        end
+        return if File.executable? path
+        raise Error::WebDriverError, "not executable: #{path.inspect}"
       end
 
-      def exit_hook(&blk)
+      def exit_hook
         pid = Process.pid
 
-        at_exit do
-          yield if Process.pid == pid
-        end
+        at_exit { yield if Process.pid == pid }
       end
 
       def find_binary(*binary_names)
@@ -181,8 +157,8 @@ module Selenium
 
       def find_in_program_files(*binary_names)
         paths = [
-          ENV['PROGRAMFILES'] || "\\Program Files",
-          ENV['ProgramFiles(x86)'] || "\\Program Files (x86)"
+          ENV['PROGRAMFILES'] || '\\Program Files',
+          ENV['ProgramFiles(x86)'] || '\\Program Files (x86)'
         ]
 
         paths.each do |root|
@@ -196,13 +172,10 @@ module Selenium
       end
 
       def localhost
-        info = Socket.getaddrinfo "localhost", 80, Socket::AF_INET, Socket::SOCK_STREAM
+        info = Socket.getaddrinfo 'localhost', 80, Socket::AF_INET, Socket::SOCK_STREAM
 
-        if info.empty?
-          raise Error::WebDriverError, "unable to translate 'localhost' for TCP + IPv4"
-        end
-
-        info[0][3]
+        return info[0][3] unless info.empty?
+        raise Error::WebDriverError, "unable to translate 'localhost' for TCP + IPv4"
       end
 
       def ip
@@ -222,27 +195,25 @@ module Selenium
       end
 
       def interfaces
-        interfaces = Socket.getaddrinfo("localhost", 8080).map { |e| e[3] }
-        interfaces += ["0.0.0.0", Platform.ip]
+        interfaces = Socket.getaddrinfo('localhost', 8080).map { |e| e[3] }
+        interfaces += ['0.0.0.0', Platform.ip]
 
         interfaces.compact.uniq
       end
-
     end # Platform
   end # WebDriver
 end # Selenium
 
-if __FILE__ == $0
-  p :engine      => Selenium::WebDriver::Platform.engine,
-    :os          => Selenium::WebDriver::Platform.os,
-    :ruby187?    => Selenium::WebDriver::Platform.ruby187?,
-    :ruby19?     => Selenium::WebDriver::Platform.ruby19?,
-    :jruby?      => Selenium::WebDriver::Platform.jruby?,
-    :windows?    => Selenium::WebDriver::Platform.windows?,
-    :home        => Selenium::WebDriver::Platform.home,
-    :bitsize     => Selenium::WebDriver::Platform.bitsize,
-    :localhost   => Selenium::WebDriver::Platform.localhost,
-    :ip          => Selenium::WebDriver::Platform.ip,
-    :interfaces  => Selenium::WebDriver::Platform.interfaces,
-    :null_device => Selenium::WebDriver::Platform.null_device
+if __FILE__ == $PROGRAM_NAME
+  p engine: Selenium::WebDriver::Platform.engine,
+    os: Selenium::WebDriver::Platform.os,
+    ruby_version: Selenium::WebDriver::Platform.ruby_version,
+    jruby?: Selenium::WebDriver::Platform.jruby?,
+    windows?: Selenium::WebDriver::Platform.windows?,
+    home: Selenium::WebDriver::Platform.home,
+    bitsize: Selenium::WebDriver::Platform.bitsize,
+    localhost: Selenium::WebDriver::Platform.localhost,
+    ip: Selenium::WebDriver::Platform.ip,
+    interfaces: Selenium::WebDriver::Platform.interfaces,
+    null_device: Selenium::WebDriver::Platform.null_device
 end