selenium-webdriver 0.1.2 → 0.1.3.dev

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

@@ -8,24 +8,35 @@ module Selenium
 
       class Bridge < Remote::Bridge
 
-        HOST = "localhost"
-
+        HOST            = Platform.localhost
         DEFAULT_PORT    = 5555
         DEFAULT_TIMEOUT = 30
 
         def initialize(opts = {})
-          timeout = opts[:timeout] || DEFAULT_TIMEOUT
-          @port   = opts[:port] || DEFAULT_PORT
-          @speed  = opts[:speed] || :fast
+          timeout     = opts.delete(:timeout) { DEFAULT_TIMEOUT }
+          port        = opts.delete(:port) { DEFAULT_PORT }
+          http_client = opts.delete(:http_client)
+
+          unless opts.empty?
+            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
+          end
 
-          @server_pointer = Lib.start_server @port
+          @server = Server.new
+          @port   = @server.start Integer(port)
 
-          unless SocketPoller.new(HOST, @port, timeout).connected?
-            raise "unable to connect to IE server within #{timeout} seconds"
+          host = Platform.localhost
+          unless SocketPoller.new(host, @port, timeout).connected?
+            raise Error::WebDriverError, "unable to connect to IE server within #{timeout} seconds"
           end
 
-          super(:url                  => "http://#{HOST}:#{@port}",
-                :desired_capabilities => :internet_explorer)
+          remote_opts = {
+            :url => "http://#{host}:#{@port}",
+            :desired_capabilities => :firefox
+          }
+
+          remote_opts.merge!(:http_client => http_client) if http_client
+
+          super(remote_opts)
         end
 
         def browser
@@ -33,12 +44,12 @@ module Selenium
         end
 
         def driver_extensions
-          []
+          [DriverExtensions::TakesScreenshot, DriverExtensions::HasInputDevices]
         end
 
         def quit
           super
-          Lib.stop_server(@server_pointer)
+          @server.stop
 
           nil
         end

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

@@ -0,0 +1,64 @@
+module Selenium
+  module WebDriver
+    module IE
+
+      #
+      # @api private
+      #
+
+      class Server
+        extend FFI::Library
+
+        if Platform.bitsize == 64
+          ffi_lib WebDriver::IE::DLLS[:x64]
+        else
+          ffi_lib WebDriver::IE::DLLS[:win32]
+        end
+
+        ffi_convention :stdcall
+
+        attach_function :start_server,  :StartServer,           [:int],     :pointer
+        attach_function :stop_server,   :StopServer,            [:pointer], :void
+        attach_function :session_count, :GetServerSessionCount, [],         :int
+        attach_function :current_port,  :GetServerPort,         [],         :int
+        attach_function :is_running,    :ServerIsRunning,       [],         :bool
+
+        def initialize
+          @handle = nil
+        end
+
+        #
+        # Starts the server, communicating on the specified port, if it is not already running
+        #
+
+        def start(start_port)
+          return port if running?
+          @handle = self.class.start_server(start_port)
+
+          start_port
+        end
+
+        def stop
+          return unless session_count == 0
+          self.class.stop_server @handle
+          @handle = nil
+        end
+
+        def running?
+          self.class.is_running
+        end
+
+        def port
+          self.class.current_port
+        end
+
+        private
+
+        def session_count
+          self.class.session_count
+        end
+
+      end # Server
+    end # IE
+  end # WebDriver
+end # Selenium

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

@@ -3,7 +3,7 @@ module Selenium
     module IPhone
       class Bridge < Remote::Bridge
 
-        DEFAULT_URL = "http://localhost:3001/hub/"
+        DEFAULT_URL = "http://#{Platform.localhost}:3001/hub/"
 
         def initialize(opts = nil)
           if opts

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

@@ -46,7 +46,7 @@ module Selenium
 
           http_client          = opts.delete(:http_client) { Http::Default.new }
           desired_capabilities = opts.delete(:desired_capabilities) { Capabilities.firefox }
-          url                  = opts.delete(:url) { "http://localhost:4444/wd/hub" }
+          url                  = opts.delete(:url) { "http://#{Platform.localhost}:4444/wd/hub" }
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
@@ -74,7 +74,7 @@ module Selenium
         end
 
         def driver_extensions
-          []
+          [DriverExtensions::HasInputDevices, DriverExtensions::TakesScreenshot]
         end
 
         #
@@ -108,6 +108,10 @@ module Selenium
           execute :setScriptTimeout, {}, :ms => milliseconds
         end
 
+        #
+        # alerts
+        #
+
         def acceptAlert
           execute :acceptAlert
         end
@@ -124,6 +128,10 @@ module Selenium
           execute :getAlertText
         end
 
+        #
+        # navigation
+        #
+
         def goBack
           execute :goBack
         end
@@ -195,6 +203,10 @@ module Selenium
           execute :getSpeed
         end
 
+        def getScreenshot
+          execute :screenshot
+        end
+
         def executeScript(script, *args)
           unless capabilities.javascript_enabled?
             raise Error::UnsupportedOperationError, "underlying webdriver instance does not support javascript"
@@ -220,6 +232,8 @@ module Selenium
           execute :deleteAllCookies
         end
 
+        # finding elements
+
         def findElementByClassName(parent, class_name)
           find_element_by 'class name', class_name, parent
         end
@@ -284,14 +298,44 @@ module Selenium
           find_elements_by 'xpath', xpath, parent
         end
 
-        #
-        # Element functions
-        #
-
         def clickElement(element)
           execute :clickElement, :id => element
         end
 
+        def click
+          execute :click, {}, :button => 0
+        end
+
+        def doubleClick
+          execute :doubleClick
+        end
+
+        def contextClick
+          execute :click, {}, :button => 2
+        end
+
+        def mouseDown
+          execute :mouseDown
+        end
+
+        def mouseUp
+          execute :mouseUp
+        end
+
+        def mouseMoveTo(element, x = nil, y = nil)
+          params = { :element => element }
+
+          if x && y
+            params.merge!(:xoffset => x, :yoffset => y)
+          end
+
+          execute :mouseMoveTo, {}, params
+        end
+
+        def sendModifierKeyToActiveElement(key, down)
+          execute :sendModifierKeyToActiveElement, {}, :value => key, :isdown => down
+        end
+
         def getElementTagName(element)
           execute :getElementTagName, :id => element
         end
@@ -314,6 +358,12 @@ module Selenium
           Point.new data['x'], data['y']
         end
 
+        def getElementLocationOnceScrolledIntoView(element)
+          data = execute :getElementLocationOnceScrolledIntoView, :id => element
+
+          Point.new data['x'], data['y']
+        end
+
         def getElementSize(element)
           data = execute :getElementSize, :id => element
 
@@ -410,7 +460,7 @@ module Selenium
         #
         # executes a command on the remote server via the REST / JSON API.
         #
-        # Returns a WebDriver::Remote::Response instance
+        # @return [WebDriver::Remote::Response]
         #
 
         def raw_execute(command, opts = {}, command_hash = nil)
@@ -420,7 +470,7 @@ module Selenium
           path[':session_id'] = @session_id if path.include?(":session_id")
 
           begin
-            opts.each { |key, value| path[key.inspect] = URI.escape(value.to_s)}
+            opts.each { |key, value| path[key.inspect] = escaper.escape(value.to_s)}
           rescue IndexError
             raise ArgumentError, "#{opts.inspect} invalid for #{command.inspect}"
           end
@@ -429,6 +479,10 @@ module Selenium
           http.call verb, path, command_hash
         end
 
+        def escaper
+          @escaper ||= defined?(URI::Parser) ? URI::Parser.new : URI
+        end
+
       end # Bridge
     end # Remote
   end # WebDriver

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

@@ -16,7 +16,8 @@ module Selenium
                       :takes_screenshot,
                       :rotatable,
                       :version,
-                      :browser_name
+                      :browser_name,
+                      :firefox_profile
 
         alias_method :css_selectors_enabled?, :css_selectors_enabled
         alias_method :javascript_enabled?   , :javascript_enabled
@@ -108,6 +109,10 @@ module Selenium
         # @option :native_events         [Boolean] does this driver use native events?
         # @option :proxy                 [Selenium::WebDriver::Proxy, Hash] proxy configuration
         #
+        # Firefox-specific options:
+        #
+        # @option :firefox_profile       [Selenium::WebDriver::Firefox::Profile] the firefox profile to use
+        #
         # @api public
         #
 
@@ -120,6 +125,7 @@ module Selenium
           @takes_screenshot      = opts[:takes_screenshot]      || false
           @native_events         = opts[:native_events]         || false
           @rotatable             = opts[:rotatable]             || false
+          @firefox_profile       = opts[:firefox_profile]
 
           self.proxy             = opts[:proxy]
         end
@@ -147,10 +153,11 @@ module Selenium
             "cssSelectorsEnabled" => css_selectors_enabled?,
             "takesScreenshot"     => takes_screenshot?,
             "nativeEvents"        => native_events?,
-            "rotatable"           => rotatable?
+            "rotatable"           => rotatable?,
           }
 
-          hash["proxy"] = proxy.as_json if proxy
+          hash["proxy"]           = proxy.as_json if proxy
+          hash['firefox_profile'] = firefox_profile.as_json['zip'] if firefox_profile
 
           hash
         end

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

@@ -5,63 +5,71 @@ class Selenium::WebDriver::Remote::Bridge
   # http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
   #
 
-  command :newSession,                      :post,    "session"
-  command :getCapabilities,                 :get,     "session/:session_id"
-  command :quit,                            :delete,  "session/:session_id"
-  command :setImplicitWaitTimeout,          :post,    "session/:session_id/timeouts/implicit_wait"
-  command :setScriptTimeout,                :post,    "session/:session_id/timeouts/async_script"
-  command :getCurrentWindowHandle,          :get,     "session/:session_id/window_handle"
-  command :getWindowHandles,                :get,     "session/:session_id/window_handles"
-  command :getCurrentUrl,                   :get,     "session/:session_id/url"
-  command :get,                             :post,    "session/:session_id/url"
-  command :dismissAlert,                    :post,    "session/:session_id/dismiss_alert"
-  command :acceptAlert,                     :post,    "session/:session_id/accept_alert"
-  command :getAlertText,                    :get,     "session/:session_id/alert_text"
-  command :setAlertValue,                   :post,    "session/:session_id/alert_text"
-  command :goForward,                       :post,    "session/:session_id/forward"
-  command :goBack,                          :post,    "session/:session_id/back"
-  command :refresh,                         :post,    "session/:session_id/refresh"
-  command :executeScript,                   :post,    "session/:session_id/execute"
-  command :screenshot,                      :get,     "session/:session_id/screenshot"
-  command :switchToFrame,                   :post,    "session/:session_id/frame"
-  command :switchToWindow,                  :post,    "session/:session_id/window"
-  command :getSpeed,                        :get,     "session/:session_id/speed"
-  command :setSpeed,                        :post,    "session/:session_id/speed"
-  command :getAllCookies,                   :get,     "session/:session_id/cookie"
-  command :addCookie,                       :post,    "session/:session_id/cookie"
-  command :deleteAllCookies,                :delete,  "session/:session_id/cookie"
-  command :deleteCookieNamed,               :delete,  "session/:session_id/cookie/:name"
-  command :getPageSource,                   :get,     "session/:session_id/source"
-  command :getTitle,                        :get,     "session/:session_id/title"
-  command :findElement,                     :post,    "session/:session_id/element"
-  command :findElements,                    :post,    "session/:session_id/elements"
-  command :getActiveElement,                :post,    "session/:session_id/element/active"
-  command :describeElement,                 :get,     "session/:session_id/element/:id"
-  command :findChildElement,                :post,    "session/:session_id/element/:id/element"
-  command :findChildElements,               :post,    "session/:session_id/element/:id/elements"
-  command :clickElement,                    :post,    "session/:session_id/element/:id/click"
-  command :submitElement,                   :post,    "session/:session_id/element/:id/submit"
-  command :getElementValue,                 :get,     "session/:session_id/element/:id/value"
-  command :sendKeysToElement,               :post,    "session/:session_id/element/:id/value"
-  command :getElementTagName,               :get,     "session/:session_id/element/:id/name"
-  command :clearElement,                    :post,    "session/:session_id/element/:id/clear"
-  command :isElementSelected,               :get,     "session/:session_id/element/:id/selected"
-  command :setElementSelected,              :post,    "session/:session_id/element/:id/selected"
-  command :toggleElement,                   :post,    "session/:session_id/element/:id/toggle"
-  command :isElementEnabled,                :get,     "session/:session_id/element/:id/enabled"
-  command :getElementAttribute,             :get,     "session/:session_id/element/:id/attribute/:name"
-  command :elementEquals,                   :get,     "session/:session_id/element/:id/equals/:other"
-  command :isElementDisplayed,              :get,     "session/:session_id/element/:id/displayed"
-  command :getElementLocation,              :get,     "session/:session_id/element/:id/location"
-  command :getElementLocationInView,        :get,     "session/:session_id/element/:id/location_in_view"
-  command :getElementSize,                  :get,     "session/:session_id/element/:id/size"
-  command :hoverOverElement,                :post,    "session/:session_id/element/:id/hover"
-  command :dragElement,                     :post,    "session/:session_id/element/:id/drag"
-  command :getElementValueOfCssProperty,    :get,     "session/:session_id/element/:id/css/:property_name"
-  command :close,                           :delete,  "session/:session_id/window"
-  command :getElementText,                  :get,     "session/:session_id/element/:id/text"
-  command :getVisible,                      :get,     "session/:session_id/visible"
-  command :setVisible,                      :post,    "session/:session_id/visible"
-  command :getScreenOrientation,            :get,     "session/:session_id/orientation"
-  command :setScreenOrientation,            :post,    "session/:session_id/orientation"
+  command :newSession,                             :post,    "session"
+  command :getCapabilities,                        :get,     "session/:session_id"
+  command :quit,                                   :delete,  "session/:session_id"
+  command :setImplicitWaitTimeout,                 :post,    "session/:session_id/timeouts/implicit_wait"
+  command :setScriptTimeout,                       :post,    "session/:session_id/timeouts/async_script"
+  command :getCurrentWindowHandle,                 :get,     "session/:session_id/window_handle"
+  command :getWindowHandles,                       :get,     "session/:session_id/window_handles"
+  command :getCurrentUrl,                          :get,     "session/:session_id/url"
+  command :get,                                    :post,    "session/:session_id/url"
+  command :dismissAlert,                           :post,    "session/:session_id/dismiss_alert"
+  command :acceptAlert,                            :post,    "session/:session_id/accept_alert"
+  command :getAlertText,                           :get,     "session/:session_id/alert_text"
+  command :setAlertValue,                          :post,    "session/:session_id/alert_text"
+  command :goForward,                              :post,    "session/:session_id/forward"
+  command :goBack,                                 :post,    "session/:session_id/back"
+  command :refresh,                                :post,    "session/:session_id/refresh"
+  command :executeScript,                          :post,    "session/:session_id/execute"
+  command :screenshot,                             :get,     "session/:session_id/screenshot"
+  command :switchToFrame,                          :post,    "session/:session_id/frame"
+  command :switchToWindow,                         :post,    "session/:session_id/window"
+  command :getSpeed,                               :get,     "session/:session_id/speed"
+  command :setSpeed,                               :post,    "session/:session_id/speed"
+  command :getAllCookies,                          :get,     "session/:session_id/cookie"
+  command :addCookie,                              :post,    "session/:session_id/cookie"
+  command :deleteAllCookies,                       :delete,  "session/:session_id/cookie"
+  command :deleteCookieNamed,                      :delete,  "session/:session_id/cookie/:name"
+  command :getPageSource,                          :get,     "session/:session_id/source"
+  command :getTitle,                               :get,     "session/:session_id/title"
+  command :findElement,                            :post,    "session/:session_id/element"
+  command :findElements,                           :post,    "session/:session_id/elements"
+  command :getActiveElement,                       :post,    "session/:session_id/element/active"
+  command :describeElement,                        :get,     "session/:session_id/element/:id"
+  command :findChildElement,                       :post,    "session/:session_id/element/:id/element"
+  command :findChildElements,                      :post,    "session/:session_id/element/:id/elements"
+  command :clickElement,                           :post,    "session/:session_id/element/:id/click"
+  command :submitElement,                          :post,    "session/:session_id/element/:id/submit"
+  command :getElementValue,                        :get,     "session/:session_id/element/:id/value"
+  command :sendKeysToElement,                      :post,    "session/:session_id/element/:id/value"
+  command :getElementTagName,                      :get,     "session/:session_id/element/:id/name"
+  command :clearElement,                           :post,    "session/:session_id/element/:id/clear"
+  command :isElementSelected,                      :get,     "session/:session_id/element/:id/selected"
+  command :setElementSelected,                     :post,    "session/:session_id/element/:id/selected"
+  command :toggleElement,                          :post,    "session/:session_id/element/:id/toggle"
+  command :isElementEnabled,                       :get,     "session/:session_id/element/:id/enabled"
+  command :getElementAttribute,                    :get,     "session/:session_id/element/:id/attribute/:name"
+  command :elementEquals,                          :get,     "session/:session_id/element/:id/equals/:other"
+  command :isElementDisplayed,                     :get,     "session/:session_id/element/:id/displayed"
+  command :getElementLocation,                     :get,     "session/:session_id/element/:id/location"
+  command :getElementLocationOnceScrolledIntoView, :get,     "session/:session_id/element/:id/location_in_view"
+  command :getElementSize,                         :get,     "session/:session_id/element/:id/size"
+  command :hoverOverElement,                       :post,    "session/:session_id/element/:id/hover"
+  command :dragElement,                            :post,    "session/:session_id/element/:id/drag"
+  command :getElementValueOfCssProperty,           :get,     "session/:session_id/element/:id/css/:property_name"
+  command :close,                                  :delete,  "session/:session_id/window"
+  command :getElementText,                         :get,     "session/:session_id/element/:id/text"
+  command :getVisible,                             :get,     "session/:session_id/visible"
+  command :setVisible,                             :post,    "session/:session_id/visible"
+  command :getScreenOrientation,                   :get,     "session/:session_id/orientation"
+  command :setScreenOrientation,                   :post,    "session/:session_id/orientation"
+
+  # interactions API
+  command :click,                                  :post,    "session/:session_id/click"
+  command :doubleClick,                            :post,    "session/:session_id/doubleclick"
+  command :mouseDown,                              :post,    "session/:session_id/buttondown"
+  command :mouseUp,                                :post,    "session/:session_id/buttonup"
+  command :mouseMoveTo,                            :post,    "session/:session_id/moveto"
+  command :sendModifierKeyToActiveElement,         :post,    "session/:session_id/modifier"
 end