selenium-webdriver 2.53.4 → 3.0.0.beta1

data/lib/selenium/webdriver/remote/http/common.rb

@@ -23,8 +23,8 @@ module Selenium
       module Http
         class Common
           MAX_REDIRECTS   = 20 # same as chromium/gecko
-          CONTENT_TYPE    = "application/json"
-          DEFAULT_HEADERS = { "Accept" => CONTENT_TYPE }
+          CONTENT_TYPE    = 'application/json'.freeze
+          DEFAULT_HEADERS = {'Accept' => CONTENT_TYPE}.freeze
 
           attr_accessor :timeout
           attr_writer :server_url
@@ -38,22 +38,22 @@ module Selenium
           end
 
           def call(verb, url, command_hash)
-            url      = server_url.merge(url) unless url.kind_of?(URI)
+            url      = server_url.merge(url) unless url.is_a?(URI)
             headers  = DEFAULT_HEADERS.dup
-            headers['Cache-Control'] = "no-cache" if verb == :get
+            headers['Cache-Control'] = 'no-cache' if verb == :get
 
             if command_hash
               payload                   = JSON.generate(command_hash)
-              headers["Content-Type"]   = "#{CONTENT_TYPE}; charset=utf-8"
-              headers["Content-Length"] = payload.bytesize.to_s if [:post, :put].include?(verb)
+              headers['Content-Type']   = "#{CONTENT_TYPE}; charset=utf-8"
+              headers['Content-Length'] = payload.bytesize.to_s if [:post, :put].include?(verb)
 
               if $DEBUG
                 puts "   >>> #{url} | #{payload}"
                 puts "     > #{headers.inspect}"
               end
             elsif verb == :post
-              payload = "{}"
-              headers["Content-Length"] = "2"
+              payload = '{}'
+              headers['Content-Length'] = '2'
             end
 
             request verb, url, headers, payload
@@ -62,15 +62,18 @@ module Selenium
           private
 
           def server_url
-            @server_url or raise Error::WebDriverError, "server_url not set"
+            return @server_url if @server_url
+            raise Error::WebDriverError, 'server_url not set'
           end
 
-          def request(verb, url, headers, payload)
-            raise NotImplementedError, "subclass responsibility"
+          def request(*)
+            raise NotImplementedError, 'subclass responsibility'
           end
 
           def create_response(code, body, content_type)
-            code, body, content_type = code.to_i, body.to_s.strip, content_type.to_s
+            code = code.to_i
+            body = body.to_s.strip
+            content_type = content_type.to_s
             puts "<- #{body}\n" if $DEBUG
 
             if content_type.include? CONTENT_TYPE
@@ -85,7 +88,6 @@ module Selenium
               raise Error::WebDriverError, msg
             end
           end
-
         end # Common
       end # Http
     end # Remote

data/lib/selenium/webdriver/remote/http/curb.rb

@@ -22,12 +22,10 @@ require 'curb'
 module Selenium
   module WebDriver
     module Remote
-
       # added for rescue
       Bridge::QUIT_ERRORS << Curl::Err::RecvError
 
       module Http
-
         #
         # An alternative to the default Net::HTTP client.
         #
@@ -42,15 +40,14 @@ module Selenium
         #
 
         class Curb < Common
-
           private
 
           def request(verb, url, headers, payload)
-            client.url     = url.to_s
+            client.url = url.to_s
 
             # workaround for http://github.com/taf2/curb/issues/issue/40
             # curb will handle this for us anyway
-            headers.delete "Content-Length"
+            headers.delete 'Content-Length'
 
             client.headers = headers
 
@@ -62,10 +59,10 @@ module Selenium
             when :get
               client.http_get
             when :post
-              client.post_body = payload || ""
+              client.post_body = payload || ''
               client.http_post
             when :put
-              client.put_data = payload || ""
+              client.put_data = payload || ''
               client.http_put
             when :delete
               client.http_delete
@@ -85,12 +82,11 @@ module Selenium
               c.max_redirects   = MAX_REDIRECTS
               c.follow_location = true
               c.timeout         = @timeout if @timeout
-              c.verbose         = !!$DEBUG
+              c.verbose         = $DEBUG
 
               c
             )
           end
-
         end # Curb
       end # Http
     end # Remote

data/lib/selenium/webdriver/remote/http/default.rb

@@ -24,7 +24,6 @@ module Selenium
   module WebDriver
     module Remote
       module Http
-
         # @api private
         class Default < Common
           attr_accessor :proxy
@@ -33,18 +32,18 @@ module Selenium
 
           def http
             @http ||= (
-              http = new_http_client
-              if server_url.scheme == "https"
-                http.use_ssl = true
-                http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-              end
+            http = new_http_client
+            if server_url.scheme == 'https'
+              http.use_ssl = true
+              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            end
 
-              if @timeout
-                http.open_timeout = @timeout
-                http.read_timeout = @timeout
-              end
+            if @timeout
+              http.open_timeout = @timeout
+              http.read_timeout = @timeout
+            end
 
-              http
+            http
             )
           end
 
@@ -76,15 +75,12 @@ module Selenium
               retry
 
             rescue Errno::ECONNREFUSED => ex
-              if use_proxy?
-                raise ex.class, "using proxy: #{proxy.http}"
-              else
-                raise
-              end
+              raise ex.class, "using proxy: #{proxy.http}" if use_proxy?
+              raise
             end
 
-            if response.kind_of? Net::HTTPRedirection
-              raise Error::WebDriverError, "too many redirects" if redirects >= MAX_REDIRECTS
+            if response.is_a? Net::HTTPRedirection
+              raise Error::WebDriverError, 'too many redirects' if redirects >= MAX_REDIRECTS
               request(:get, URI.parse(response['Location']), DEFAULT_HEADERS.dup, nil, redirects + 1)
             else
               create_response response.code, response.body, response.content_type
@@ -109,7 +105,8 @@ module Selenium
 
           def new_http_client
             if use_proxy?
-              unless proxy.respond_to?(:http) && url = @proxy.http
+              url = @proxy.http
+              unless proxy.respond_to?(:http) && url
                 raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}"
               end
 
@@ -124,13 +121,13 @@ module Selenium
 
           def proxy
             @proxy ||= (
-              proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-              no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
+            proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+            no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
 
-              if proxy
-                proxy = "http://#{proxy}" unless proxy.start_with?("http://")
-                Proxy.new(:http => proxy, :no_proxy => no_proxy)
-              end
+            if proxy
+              proxy = "http://#{proxy}" unless proxy.start_with?('http://')
+              Proxy.new(http: proxy, no_proxy: no_proxy)
+            end
             )
           end
 
@@ -138,24 +135,22 @@ module Selenium
             return false if proxy.nil?
 
             if proxy.no_proxy
-              ignored = proxy.no_proxy.split(",").any? do |host|
-                host == "*" ||
-                host == server_url.host || (
-                  begin
-                    IPAddr.new(host).include?(server_url.host)
-                  rescue ArgumentError
-                    false
-                  end
-                )
-
+              ignored = proxy.no_proxy.split(',').any? do |host|
+                host == '*' ||
+                  host == server_url.host || (
+                begin
+                  IPAddr.new(host).include?(server_url.host)
+                rescue ArgumentError
+                  false
+                end
+                  )
               end
 
-              not ignored
+              !ignored
             else
               true
             end
           end
-
         end # Default
       end # Http
     end # Remote

data/lib/selenium/webdriver/remote/http/persistent.rb

@@ -23,10 +23,8 @@ module Selenium
   module WebDriver
     module Remote
       module Http
-
         # @api private
         class Persistent < Default
-
           def close
             @http.shutdown if @http
           end
@@ -37,19 +35,19 @@ module Selenium
             proxy = nil
 
             if @proxy
-              unless @proxy.respond_to?(:http) && url = @proxy.http
-                raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}"
+              unless @proxy.respond_to?(:http)
+                url = @proxy.http
+                raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}" unless url
               end
               proxy = URI.parse(url)
             end
 
-            Net::HTTP::Persistent.new "webdriver", proxy
+            Net::HTTP::Persistent.new 'webdriver', proxy
           end
 
           def response_for(request)
             http.request server_url, request
           end
-
         end # Persistent
       end # Http
     end # Remote

data/lib/selenium/webdriver/remote/response.rb

@@ -20,10 +20,8 @@
 module Selenium
   module WebDriver
     module Remote
-
       # @api private
       class Response
-
         attr_reader :code, :payload
         attr_writer :payload
 
@@ -49,9 +47,10 @@ module Selenium
 
           case val
           when Hash
-            msg = val['message'] or return "unknown error"
-            msg << ": #{val['alert']['text'].inspect}" if val['alert'].kind_of?(Hash) && val['alert']['text']
-            msg << " (#{ val['class'] })" if val['class']
+            msg = val['message']
+            return 'unknown error' unless msg
+            msg << ": #{val['alert']['text'].inspect}" if val['alert'].is_a?(Hash) && val['alert']['text']
+            msg << " (#{val['class']})" if val['class']
             msg
           when String
             val
@@ -67,34 +66,28 @@ module Selenium
         private
 
         def assert_ok
-          if e = error()
-            raise e
-          elsif @code.nil? || @code >= 400
-            raise Error::ServerError, self
-          end
+          e = error
+          raise e if e
+          return unless @code.nil? || @code >= 400
+          raise Error::ServerError, self
         end
 
         def add_backtrace(ex)
-          unless value.kind_of?(Hash) && value['stackTrace']
-            return
-          end
+          return unless value.is_a?(Hash) && value['stackTrace']
 
           server_trace = value['stackTrace']
 
           backtrace = server_trace.map do |frame|
-            next unless frame.kind_of?(Hash)
+            next unless frame.is_a?(Hash)
 
             file = frame['fileName']
             line = frame['lineNumber']
             meth = frame['methodName']
 
-            if class_name = frame['className']
-              file = "#{class_name}(#{file})"
-            end
+            class_name = frame['className']
+            file = "#{class_name}(#{file})" if class_name
 
-            if meth.nil? || meth.empty?
-              meth = 'unknown'
-            end
+            meth = 'unknown' if meth.nil? || meth.empty?
 
             "[remote server] #{file}:#{line}:in `#{meth}'"
           end.compact
@@ -109,7 +102,6 @@ module Selenium
         def value
           @payload['value'] || @payload['message']
         end
-
       end # Response
     end # Remote
   end # WebDriver

data/lib/selenium/webdriver/remote/server_error.rb

@@ -21,15 +21,13 @@ module Selenium
   module WebDriver
     module Error
       class ServerError < StandardError
-
         def initialize(response)
-          if response.kind_of? String
+          if response.is_a? String
             super(response)
           else
             super("status code #{response.code}")
           end
         end
-
       end # ServerError
     end # Error
   end # WebDriver

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

@@ -22,7 +22,6 @@ require 'json'
 module Selenium
   module WebDriver
     module Remote
-
       #
       # Low level bridge to the remote server, through which the rest of the API works.
       #
@@ -32,6 +31,7 @@ module Selenium
       class W3CBridge
         include BridgeHelper
 
+        # TODO: constant shouldn't be modified in class
         COMMANDS = {}
 
         #
@@ -62,16 +62,13 @@ module Selenium
         #
 
         def initialize(opts = {})
-          if opts.fetch(:desired_capabilities, {})[:browser_name] == 'MicrosoftEdge'
-            require_relative '../edge/legacy_support'
-            extend Edge::LegacySupport
-          end
+          edge_check(opts)
 
           opts = opts.dup
 
-          http_client          = opts.delete(:http_client) { Http::Default.new }
+          http_client = opts.delete(:http_client) { Http::Default.new }
           desired_capabilities = opts.delete(:desired_capabilities) { W3CCapabilities.firefox }
-          url                  = opts.delete(:url) { "http://#{Platform.localhost}:4444/wd/hub" }
+          url = opts.delete(:url) { "http://#{Platform.localhost}:4444/wd/hub" }
 
           desired_capabilities = W3CCapabilities.send(desired_capabilities) if desired_capabilities.is_a? Symbol
 
@@ -81,23 +78,30 @@ module Selenium
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
-          uri = url.kind_of?(URI) ? url : URI.parse(url)
-          uri.path += "/" unless uri.path =~ /\/$/
+          uri = url.is_a?(URI) ? url : URI.parse(url)
+          uri.path += '/' unless uri.path =~ %r{\/$}
 
           http_client.server_url = uri
 
-          @http          = http_client
-          @capabilities  = create_session(desired_capabilities)
+          @http = http_client
+          @capabilities = create_session(desired_capabilities)
           @file_detector = nil
         end
 
         def browser
           @browser ||= (
-            name = @capabilities.browser_name
-            name ? name.gsub(" ", "_").to_sym : 'unknown'
+          name = @capabilities.browser_name
+          name ? name.tr(' ', '_').to_sym : 'unknown'
           )
         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,
@@ -116,14 +120,15 @@ module Selenium
         #
 
         def session_id
-          @session_id || raise(Error::WebDriverError, "no current session exists")
+          @session_id || raise(Error::WebDriverError, 'no current session exists')
         end
 
         def create_session(desired_capabilities)
-          resp = raw_execute :newSession, {}, :desiredCapabilities => desired_capabilities
-          @session_id = resp['sessionId'] or raise Error::WebDriverError, 'no sessionId in returned payload'
+          resp = raw_execute :newSession, {}, {desiredCapabilities: desired_capabilities}
+          @session_id = resp['sessionId']
+          return W3CCapabilities.json_create resp['value'] if @session_id
 
-          W3CCapabilities.json_create resp['value']
+          raise Error::WebDriverError, 'no sessionId in returned payload'
         end
 
         def status
@@ -133,38 +138,38 @@ module Selenium
         end
 
         def get(url)
-          execute :get, {}, :url => url
+          execute :get, {}, {url: url}
         end
 
-        def setImplicitWaitTimeout(milliseconds)
-          setTimeout('implicit', milliseconds)
+        def implicit_wait_timeout=(milliseconds)
+          timeout('implicit', milliseconds)
         end
 
-        def setScriptTimeout(milliseconds)
-          setTimeout('script', milliseconds)
+        def script_timeout=(milliseconds)
+          timeout('script', milliseconds)
         end
 
-        def setTimeout(type, milliseconds)
-          execute :setTimeout, {}, :type => type, :ms => milliseconds
+        def timeout(type, milliseconds)
+          execute :setTimeout, {}, {type: type, ms: milliseconds}
         end
 
         #
         # alerts
         #
 
-        def acceptAlert
+        def accept_alert
           execute :acceptAlert
         end
 
-        def dismissAlert
+        def dismiss_alert
           execute :dismissAlert
         end
 
-        def setAlertValue(keys)
-          execute :sendAlertText, {}, {:handler => 'prompt', :message => keys}
+        def alert=(keys)
+          execute :sendAlertText, {}, {handler: 'prompt', text: keys}
         end
 
-        def getAlertText
+        def alert_text
           execute :getAlertText
         end
 
@@ -172,46 +177,46 @@ module Selenium
         # navigation
         #
 
-        def goBack
+        def go_back
           execute :back
         end
 
-        def goForward
+        def go_forward
           execute :forward
         end
 
-        def getCurrentUrl
+        def url
           execute :getCurrentUrl
         end
 
-        def getTitle
+        def title
           execute :getTitle
         end
 
-        def getPageSource
-          executeScript("var source = document.documentElement.outerHTML;" +
-                            "if (!source) { source = new XMLSerializer().serializeToString(document); }" +
-                            "return source;")
+        def page_source
+          execute_script('var source = document.documentElement.outerHTML;' \
+                            'if (!source) { source = new XMLSerializer().serializeToString(document); }' \
+                            'return source;')
         end
 
-        def switchToWindow(name)
-          execute :switchToWindow, {}, :handle => name
+        def switch_to_window(name)
+          execute :switchToWindow, {}, {handle: name}
         end
 
-        def switchToFrame(id)
+        def switch_to_frame(id)
           id = find_element_by('id', id) if id.is_a? String
-          execute :switchToFrame, {}, :id => id
+          execute :switchToFrame, {}, {id: id}
         end
 
-        def switchToParentFrame
+        def switch_to_parent_frame
           execute :switchToParentFrame
         end
 
-        def switchToDefaultContent
-          switchToFrame nil
+        def switch_to_default_content
+          switch_to_frame nil
         end
 
-        QUIT_ERRORS = [IOError]
+        QUIT_ERRORS = [IOError].freeze
 
         def quit
           execute :deleteSession
@@ -231,34 +236,34 @@ module Selenium
         # window handling
         #
 
-        def getWindowHandles
+        def window_handles
           execute :getWindowHandles
         end
 
-        def getCurrentWindowHandle
+        def window_handle
           execute :getWindowHandle
         end
 
-        def setWindowSize(width, height, handle = :current)
+        def resize_window(width, height, handle = :current)
           unless handle == :current
             raise Error::WebDriverError, 'Switch to desired window before changing its size'
           end
-          execute :setWindowSize, {}, {:width  => width,
-                                   :height => height}
+          execute :setWindowSize, {}, {width: width,
+                                       height: height}
         end
 
-        def maximizeWindow(handle = :current)
+        def maximize_window(handle = :current)
           unless handle == :current
             raise Error::UnsupportedOperationError, 'Switch to desired window before changing its size'
           end
           execute :maximizeWindow
         end
 
-        def fullscreenWindow
+        def full_screen_window
           execute :fullscreenWindow
         end
 
-        def getWindowSize(handle = :current)
+        def window_size(handle = :current)
           unless handle == :current
             raise Error::UnsupportedOperationError, 'Switch to desired window before getting its size'
           end
@@ -267,15 +272,15 @@ module Selenium
           Dimension.new data['width'], data['height']
         end
 
-        def setWindowPosition(_x, _y, _handle = nil)
+        def reposition_window(_x, _y, _handle = nil)
           raise Error::UnsupportedOperationError, 'The W3C standard does not currently support setting the Window Position'
         end
 
-        def getWindowPosition(_handle = nil)
+        def window_position(_handle = nil)
           raise Error::UnsupportedOperationError, 'The W3C standard does not currently support getting the Window Position'
         end
 
-        def getScreenshot
+        def screenshot
           execute :takeScreenshot
         end
 
@@ -283,67 +288,67 @@ module Selenium
         # HTML 5
         #
 
-        def getLocalStorageItem(key)
-          executeScript("return localStorage.getItem('#{key}')")
-        end
-
-        def removeLocalStorageItem(key)
-          executeScript("localStorage.removeItem('#{key}')")
-        end
-
-        def getLocalStorageKeys
-          executeScript("return Object.keys(localStorage)")
+        def local_storage_item(key, value = nil)
+          if value
+            execute_script("localStorage.setItem('#{key}', '#{value}')")
+          else
+            execute_script("return localStorage.getItem('#{key}')")
+          end
         end
 
-        def setLocalStorageItem(key, value)
-          executeScript("localStorage.setItem('#{key}', '#{value}')")
+        def remove_local_storage_item(key)
+          execute_script("localStorage.removeItem('#{key}')")
         end
 
-        def clearLocalStorage
-          executeScript("localStorage.clear()")
+        def local_storage_keys
+          execute_script('return Object.keys(localStorage)')
         end
 
-        def getLocalStorageSize
-          executeScript("return localStorage.length")
+        def clear_local_storage
+          execute_script('localStorage.clear()')
         end
 
-        def getSessionStorageItem(key)
-          executeScript("return sessionStorage.getItem('#{key}')")
+        def local_storage_size
+          execute_script('return localStorage.length')
         end
 
-        def removeSessionStorageItem(key)
-          executeScript("sessionStorage.removeItem('#{key}')")
+        def session_storage_item(key, value = nil)
+          if value
+            execute_script("sessionStorage.setItem('#{key}', '#{value}')")
+          else
+            execute_script("return sessionStorage.getItem('#{key}')")
+          end
         end
 
-        def getSessionStorageKeys
-          executeScript("return Object.keys(sessionStorage)")
+        def remove_session_storage_item(key)
+          execute_script("sessionStorage.removeItem('#{key}')")
         end
 
-        def setSessionStorageItem(key, value)
-          executeScript("sessionStorage.setItem('#{key}', '#{value}')")
+        def session_storage_keys
+          execute_script('return Object.keys(sessionStorage)')
         end
 
-        def clearSessionStorage
-          executeScript("sessionStorage.clear()")
+        def clear_session_storage
+          execute_script('sessionStorage.clear()')
         end
 
-        def getSessionStorageSize
-          executeScript("return sessionStorage.length")
+        def session_storage_size
+          execute_script('return sessionStorage.length')
         end
 
-        def getLocation
+        def location
           raise Error::UnsupportedOperationError, 'The W3C standard does not currently support getting location'
         end
 
-        def setLocation(_lat, _lon, _alt)
+        def set_location(_lat, _lon, _alt)
           raise Error::UnsupportedOperationError, 'The W3C standard does not currently support setting location'
         end
 
-        def getNetworkConnection
+        def network_connection
           raise Error::UnsupportedOperationError, 'The W3C standard does not currently support getting network connection'
         end
 
-        def setNetworkConnection(_type)
+        def network_connection=(_type)
           raise Error::UnsupportedOperationError, 'The W3C standard does not currently support setting network connection'
         end
 
@@ -351,13 +356,13 @@ module Selenium
         # javascript execution
         #
 
-        def executeScript(script, *args)
-          result = execute :executeScript, {}, :script => script, :args => args
+        def execute_script(script, *args)
+          result = execute :executeScript, {}, {script: script, args: args}
           unwrap_script_result result
         end
 
-        def executeAsyncScript(script, *args)
-          result = execute :executeAsyncScript, {}, :script => script, :args => args
+        def execute_async_script(script, *args)
+          result = execute :executeAsyncScript, {}, {script: script, args: args}
           unwrap_script_result result
         end
 
@@ -365,139 +370,139 @@ module Selenium
         # cookies
         #
 
-        def addCookie(cookie)
-          execute :addCookie, {}, :cookie => cookie
+        def add_cookie(cookie)
+          execute :addCookie, {}, {cookie: cookie}
         end
 
-        def deleteCookie(name)
-          execute :deleteCookie, :name => name
+        def delete_cookie(name)
+          execute :deleteCookie, name: name
         end
 
-        # TODO - write specs
-        def getCookie(name)
-          execute :getCookie, :name => name
+        # TODO: - write specs
+        def cookie(name)
+          execute :getCookie, name: name
         end
 
-        def getAllCookies
+        def cookies
           execute :getAllCookies
         end
 
-        def deleteAllCookies
-          getAllCookies.each { |cookie| deleteCookie(cookie['name'])}
+        def delete_all_cookies
+          cookies.each { |cookie| delete_cookie(cookie['name']) }
         end
 
         #
         # actions
         #
 
-        def clickElement(element)
-          execute :elementClick, :id => element
+        def click_element(element)
+          execute :elementClick, id: element
         end
 
         def click
-          execute :click, {}, :button => 0
+          execute :click, {}, {button: 0}
         end
 
-        def doubleClick
+        def double_click
           execute :doubleClick
         end
 
-        def contextClick
-          execute :click, {}, :button => 2
+        def context_click
+          execute :click, {}, {button: 2}
         end
 
-        def mouseDown
+        def mouse_down
           execute :mouseDown
         end
 
-        def mouseUp
+        def mouse_up
           execute :mouseUp
         end
 
-        def mouseMoveTo(element, x = nil, y = nil)
-          params = { :element => element }
+        def mouse_move_to(element, x = nil, y = nil)
+          params = {element: element}
 
           if x && y
-            params.merge! :xoffset => x, :yoffset => y
+            params[:xoffset] = x
+            params[:yoffset] = y
           end
 
           execute :mouseMoveTo, {}, params
         end
 
-        def sendKeysToActiveElement(keys)
-          sendKeysToElement(getActiveElement, keys)
+        def send_keys_to_active_element(keys)
+          send_keys_to_element(active_element, keys)
         end
 
-        # TODO - Implement file verification
-        def sendKeysToElement(element, keys)
-          execute :elementSendKeys, {:id => element}, {:value => keys.join('').split(//)}
+        # TODO: - Implement file verification
+        def send_keys_to_element(element, keys)
+          execute :elementSendKeys, {id: element}, {value: keys.join('').split(//)}
         end
 
-        def clearElement(element)
-          execute :elementClear, :id => element
+        def clear_element(element)
+          execute :elementClear, id: element
         end
 
-        def submitElement(element)
-          executeScript("var e = arguments[0].ownerDocument.createEvent('Event');" +
-                            "e.initEvent('submit', true, true);" +
-                            "if (arguments[0].dispatchEvent(e)) { arguments[0].submit() }", element)
+        def submit_element(element)
+          execute_script("var e = arguments[0].ownerDocument.createEvent('Event');" \
+                            "e.initEvent('submit', true, true);" \
+                            'if (arguments[0].dispatchEvent(e)) { arguments[0].submit() }', element)
         end
 
-        def dragElement(element, right_by, down_by)
-          execute :dragElement, {:id => element}, :x => right_by, :y => down_by
+        def drag_element(element, right_by, down_by)
+          execute :dragElement, {id: element}, {x: right_by, y: down_by}
         end
 
-        def touchSingleTap(element)
-          execute :touchSingleTap, {}, :element => element
+        def touch_single_tap(element)
+          execute :touchSingleTap, {}, {element: element}
         end
 
-        def touchDoubleTap(element)
-          execute :touchDoubleTap, {}, :element => element
+        def touch_double_tap(element)
+          execute :touchDoubleTap, {}, {element: element}
         end
 
-        def touchLongPress(element)
-          execute :touchLongPress, {}, :element => element
+        def touch_long_press(element)
+          execute :touchLongPress, {}, {element: element}
         end
 
-        def touchDown(x, y)
-          execute :touchDown, {}, :x => x, :y => y
+        def touch_down(x, y)
+          execute :touchDown, {}, {x: x, y: y}
         end
 
-        def touchUp(x, y)
-          execute :touchUp, {}, :x => x, :y => y
+        def touch_up(x, y)
+          execute :touchUp, {}, {x: x, y: y}
         end
 
-        def touchMove(x, y)
-          execute :touchMove, {}, :x => x, :y => y
+        def touch_move(x, y)
+          execute :touchMove, {}, {x: x, y: y}
         end
 
-        def touchScroll(element, x, y)
+        def touch_scroll(element, x, y)
           if element
-            execute :touchScroll, {}, :element => element,
-                                      :xoffset => x,
-                                      :yoffset => y
+            execute :touchScroll, {}, {element: element,
+                                       xoffset: x,
+                                       yoffset: y}
           else
-            execute :touchScroll, {}, :xoffset => x, :yoffset => y
+            execute :touchScroll, {}, {xoffset: x, yoffset: y}
           end
         end
 
-        def touchFlick(xspeed, yspeed)
-          execute :touchFlick, {}, :xspeed => xspeed, :yspeed => yspeed
+        def touch_flick(xspeed, yspeed)
+          execute :touchFlick, {}, {xspeed: xspeed, yspeed: yspeed}
         end
 
-        def touchElementFlick(element, right_by, down_by, speed)
-          execute :touchFlick, {}, :element => element,
-                                   :xoffset => right_by,
-                                   :yoffset => down_by,
-                                   :speed   => speed
-
+        def touch_element_flick(element, right_by, down_by, speed)
+          execute :touchFlick, {}, {element: element,
+                                    xoffset: right_by,
+                                    yoffset: down_by,
+                                    speed: speed}
         end
 
-        def setScreenOrientation(orientation)
-          execute :setScreenOrientation, {}, :orientation => orientation
+        def screen_orientation=(orientation)
+          execute :setScreenOrientation, {}, {orientation: orientation}
         end
 
-        def getScreenOrientation
+        def screen_orientation
           execute :getScreenOrientation
         end
 
@@ -505,74 +510,75 @@ module Selenium
         # element properties
         #
 
-        def getElementTagName(element)
-          execute :getElementTagName, :id => element
+        def element_tag_name(element)
+          execute :getElementTagName, id: element
         end
 
-        def getElementAttribute(element, name)
-          execute :getElementAttribute, :id => element, :name => name
+        def element_attribute(element, name)
+          execute :getElementAttribute, id: element, name: name
         end
 
-        def getElementValue(element)
-          execute :getElementProperty, :id => element, :name => 'value'
+        def element_value(element)
+          execute :getElementProperty, id: element, name: 'value'
         end
 
-        def getElementText(element)
-          execute :getElementText, :id => element
+        def element_text(element)
+          execute :getElementText, id: element
         end
 
-        def getElementLocation(element)
-          data = execute :getElementRect, :id => element
+        def element_location(element)
+          data = execute :getElementRect, id: element
 
           Point.new data['x'], data['y']
         end
 
-        def getElementLocationOnceScrolledIntoView(element)
-          sendKeysToElement(element, [''])
-          getElementLocation(element)
+        def element_location_once_scrolled_into_view(element)
+          send_keys_to_element(element, [''])
+          element_location(element)
         end
 
-        def getElementSize(element)
-          data = execute :getElementRect, :id => element
+        def element_size(element)
+          data = execute :getElementRect, id: element
 
           Dimension.new data['width'], data['height']
         end
 
-        def isElementEnabled(element)
-          execute :isElementEnabled, :id => element
+        def element_enabled?(element)
+          execute :isElementEnabled, id: element
         end
 
-        def isElementSelected(element)
-          execute :isElementSelected, :id => element
+        def element_selected?(element)
+          execute :isElementSelected, id: element
         end
 
-        def isElementDisplayed(element)
+        def element_displayed?(element)
           jwp = Selenium::WebDriver::Remote::Bridge::COMMANDS[:isElementDisplayed]
           self.class.command(:isElementDisplayed, jwp.first, jwp.last)
-          execute :isElementDisplayed, :id => element
+          execute :isElementDisplayed, id: element
         end
 
-        def getElementValueOfCssProperty(element, prop)
-          execute :getElementCssValue, :id => element, :property_name => prop
+        def element_value_of_css_property(element, prop)
+          execute :getElementCssValue, id: element, property_name: prop
         end
 
         #
         # finding elements
         #
 
-        def getActiveElement
+        def active_element
           Element.new self, element_id_from(execute(:getActiveElement))
         end
-        alias_method :switchToActiveElement, :getActiveElement
+
+        alias_method :switch_to_active_element, :active_element
 
         def find_element_by(how, what, parent = nil)
           how, what = convert_locators(how, what)
 
-          if parent
-            id = execute :findChildElement, {:id => parent}, {:using => how, :value => what}
-          else
-            id = execute :findElement, {}, {:using => how, :value => what}
-          end
+          id = if parent
+                 execute :findChildElement, {id: parent}, {using: how, value: what}
+               else
+                 execute :findElement, {}, {using: how, value: what}
+               end
 
           Element.new self, element_id_from(id)
         end
@@ -580,11 +586,11 @@ module Selenium
         def find_elements_by(how, what, parent = nil)
           how, what = convert_locators(how, what)
 
-          if parent
-            ids = execute :findChildElements, {:id => parent}, {:using => how, :value => what}
-          else
-            ids = execute :findElements, {}, {:using => how, :value => what}
-          end
+          ids = if parent
+                  execute :findChildElements, {id: parent}, {using: how, value: what}
+                else
+                  execute :findElements, {}, {using: how, value: what}
+                end
 
           ids.map { |id| Element.new self, element_id_from(id) }
         end
@@ -605,7 +611,7 @@ module Selenium
           when 'tag name'
             how = 'css selector'
           end
-          return how, what
+          [how, what]
         end
 
         #
@@ -628,14 +634,14 @@ module Selenium
 
         def raw_execute(command, opts = {}, command_hash = nil)
           verb, path = COMMANDS[command] || raise(ArgumentError, "unknown command: #{command.inspect}")
-          path       = path.dup
+          path = path.dup
 
-          path[':session_id'] = @session_id if path.include?(":session_id")
+          path[':session_id'] = @session_id if path.include?(':session_id')
 
           begin
-            opts.each { |key, value|
+            opts.each do |key, value|
               path[key.inspect] = escaper.escape(value.to_s)
-            }
+            end
           rescue IndexError
             raise ArgumentError, "#{opts.inspect} invalid for #{command.inspect}"
           end
@@ -661,7 +667,6 @@ module Selenium
 
           string
         end
-
       end # W3CBridge
     end # Remote
   end # WebDriver