selenium-webdriver 2.10.0 → 2.12.0

data/CHANGES

@@ -1,3 +1,19 @@
+2.12.0 (2011-11-10)
+===================
+
+* Loosened the ffi dependency now that Windows support is back (#2755).
+* Fix shutdown issues when using net-http-persistent against remote servers.
+* Added beta window control API (see Selenium::WebDriver::Options#window).
+* Firefox
+  * Support for Firefox 8.
+  * Better reporting of page size when attempting to move out of bounds.
+  * Beta implementation of window control.
+
+2.11.0
+======
+
+(release skipped since it included only server-side changes)
+
 2.10.0 (2011-10-27)
 ===================
 
@@ -12,8 +28,6 @@
 * IE:
   * Improve handling of #clear on disabled or readonly elements.
 
-
-
 2.9.1 (2011-10-24)
 ==================
 

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

@@ -55,7 +55,13 @@ module Selenium
         def stop
           return if @process.nil? || @process.exited?
 
-          Net::HTTP.get uri.host, '/shutdown', uri.port
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            http.open_timeout = STOP_TIMEOUT / 2
+            http.read_timeout = STOP_TIMEOUT / 2
+
+            http.head("/shutdown")
+          end
+
           @process.poll_for_exit STOP_TIMEOUT
         rescue ChildProcess::TimeoutError
           # ok, force quit

data/lib/selenium/webdriver/common.rb

@@ -15,6 +15,7 @@ require 'selenium/webdriver/common/keyboard'
 require 'selenium/webdriver/common/target_locator'
 require 'selenium/webdriver/common/navigation'
 require 'selenium/webdriver/common/timeouts'
+require 'selenium/webdriver/common/window'
 require 'selenium/webdriver/common/options'
 require 'selenium/webdriver/common/search_context'
 require 'selenium/webdriver/common/action_builder'

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

@@ -89,6 +89,14 @@ module Selenium
       def timeouts
         @timeouts ||= Timeouts.new(@bridge)
       end
+      
+      #
+      # @api beta This API may be changed or removed in a future release.
+      # 
+
+      def window
+        @window ||= Window.new(@bridge)
+      end
 
       private
 

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

@@ -0,0 +1,59 @@
+module Selenium
+  module WebDriver
+    
+    #
+    # @api beta This API may be changed or removed in a future release.
+    # 
+    
+    class Window
+
+      def initialize(bridge)
+        @bridge = bridge
+      end
+
+      def size=(dimension)
+        unless dimension.respond_to?(:width) && dimension.respond_to?(:height)
+          raise ArgumentError, "expected #{dimension.inspect}:#{dimension.class}" +
+                                " to respond to #width and #height"
+        end
+
+        @bridge.setWindowSize dimension.width, dimension.height
+      end
+
+      def size
+        @bridge.getWindowSize
+      end
+
+      def position=(point)
+        unless point.respond_to?(:x) && point.respond_to?(:y)
+          raise ArgumentError, "expected #{point.inspect}:#{point.class}" +
+                                " to respond to #x and #y"
+        end
+
+        @bridge.setWindowPosition point.x, point.y
+      end
+
+      def position
+        @bridge.getWindowPosition
+      end
+
+      #
+      # equivalent to #size=, but accepts width and height arguments
+      #
+
+      def resize_to(width, height)
+        @bridge.setWindowSize Integer(width), Integer(height)
+      end
+
+      #
+      # equivalent to #position=, but accepts x and y arguments
+      #
+
+      def move_to(x, y)
+        @bridge.setWindowPosition Integer(x), Integer(y)
+      end
+
+
+    end
+  end
+end

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

@@ -77,6 +77,8 @@ module Selenium
 
         #
         # Set a preference for this particular profile.
+        #
+        # @see http://kb.mozillazine.org/About:config_entries
         # @see http://preferential.mozdev.org/preferences.html
         #
 

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

@@ -90,7 +90,7 @@ module Selenium
 
         def create_session(desired_capabilities)
           resp = raw_execute :newSession, {}, :desiredCapabilities => desired_capabilities
-          @session_id = resp['sessionId'] || raise(Error::WebDriverError, 'no sessionId in returned payload')
+          @session_id = resp['sessionId'] or raise Error::WebDriverError, 'no sessionId in returned payload'
 
           Capabilities.json_create resp['value']
         end
@@ -183,6 +183,7 @@ module Selenium
 
         def quit
           execute :quit
+          http.close
         rescue *QUIT_ERRORS
         end
 
@@ -202,6 +203,29 @@ module Selenium
           execute :getCurrentWindowHandle
         end
 
+        def setWindowSize(width, height, handle = :current)
+          execute :setWindowSize, {:window_handle => handle},
+                                   :width  => width,
+                                   :height => height
+        end
+
+        def getWindowSize(handle = :current)
+          data = execute :getWindowSize, :window_handle => handle
+
+          Dimension.new data['width'], data['height']
+        end
+
+        def setWindowPosition(x, y, handle = :current)
+          execute :setWindowPosition, {:window_handle => handle},
+                                       :x => x, :y => y
+        end
+
+        def getWindowPosition(handle = :current)
+          data = execute :getWindowPosition, :window_handle => handle
+
+          Point.new data['x'], data['y']
+        end
+
         def getScreenshot
           execute :screenshot
         end
@@ -264,7 +288,7 @@ module Selenium
           params = { :element => element }
 
           if x && y
-            params.merge!(:xoffset => x, :yoffset => y)
+            params.merge! :xoffset => x, :yoffset => y
           end
 
           execute :mouseMoveTo, {}, params
@@ -411,13 +435,13 @@ module Selenium
         #
 
         def raw_execute(command, opts = {}, command_hash = nil)
-          verb, path = COMMANDS[command] || raise("unknown command #{command.inspect}")
+          verb, path = COMMANDS[command] || raise(ArgumentError, "unknown command: #{command.inspect}")
           path       = path.dup
 
           path[':session_id'] = @session_id if path.include?(":session_id")
 
           begin
-            opts.each { |key, value| path[key.inspect] = escaper.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

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

@@ -7,34 +7,86 @@ class Selenium::WebDriver::Remote::Bridge
 
   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"
+
+  #
+  # basic driver
+  #
+
   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 :quit,                                   :delete,  "session/:session_id"
+  command :close,                                  :delete,  "session/:session_id/window"
+  command :getVisible,                             :get,     "session/:session_id/visible"
+  command :setVisible,                             :post,    "session/:session_id/visible"
+  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"
+
+  #
+  # window handling
+  #
+
+  command :getCurrentWindowHandle,                 :get,     "session/:session_id/window_handle"
+  command :getWindowHandles,                       :get,     "session/:session_id/window_handles"
+  command :setWindowSize,                          :post,    "session/:session_id/window/:window_handle/size"
+  command :setWindowPosition,                      :post,    "session/:session_id/window/:window_handle/position"
+  command :getWindowSize,                          :get,     "session/:session_id/window/:window_handle/size"
+  command :getWindowPosition,                      :get,     "session/:session_id/window/:window_handle/position"
+
+  #
+  # script execution
+  #
+
   command :executeScript,                          :post,    "session/:session_id/execute"
   command :executeAsyncScript,                     :post,    "session/:session_id/execute_async"
+
+  #
+  # screenshot
+  #
+
   command :screenshot,                             :get,     "session/:session_id/screenshot"
+
+  #
+  # alerts
+  #
+
+  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"
+
+  #
+  # target locator
+  #
+
   command :switchToFrame,                          :post,    "session/:session_id/frame"
   command :switchToWindow,                         :post,    "session/:session_id/window"
+
+  #
+  # options
+  #
+
   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"
+
+  #
+  # timeouts
+  #
+
+  command :setImplicitWaitTimeout,                 :post,    "session/:session_id/timeouts/implicit_wait"
+  command :setScriptTimeout,                       :post,    "session/:session_id/timeouts/async_script"
+
+  #
+  # element
+  #
+
   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"
@@ -42,6 +94,7 @@ class Selenium::WebDriver::Remote::Bridge
   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 :uploadFile,                             :post,    "session/:session_id/file"
   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"
@@ -55,15 +108,19 @@ class Selenium::WebDriver::Remote::Bridge
   command :getElementSize,                         :get,     "session/:session_id/element/:id/size"
   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"
+
+  #
+  # rotatable
+  #
+
   command :getScreenOrientation,                   :get,     "session/:session_id/orientation"
   command :setScreenOrientation,                   :post,    "session/:session_id/orientation"
-  command :uploadFile,                             :post,    "session/:session_id/file"
 
+  #
   # interactions API
+  #
+
   command :click,                                  :post,    "session/:session_id/click"
   command :doubleClick,                            :post,    "session/:session_id/doubleclick"
   command :mouseDown,                              :post,    "session/:session_id/buttondown"
@@ -72,4 +129,53 @@ class Selenium::WebDriver::Remote::Bridge
   command :sendModifierKeyToActiveElement,         :post,    "session/:session_id/modifier"
   command :sendKeysToActiveElement,                :post,    "session/:session_id/keys"
 
+  #
+  # html 5
+  #
+
+  command :executeSql,                             :post,   "session/:session_id/execute_sql"
+  command :getLocation,                            :get,    "session/:session_id/location"
+  command :setLocation,                            :post,   "session/:session_id/location"
+  command :getAppCache,                            :get,    "session/:session_id/application_cache"
+  command :getAppCacheStatus,                      :get,    "session/:session_id/application_cache/status"
+  command :clearAppCache,                          :delete, "session/:session_id/application_cache/clear"
+  command :isBrowserOnline,                        :get,    "session/:session_id/browser_connection"
+  command :setBrowserOnline,                       :post,   "session/:session_id/browser_connection"
+
+  command :getLocalStorageItem,                    :get,    "session/:session_id/local_storage/key/:key"
+  command :removeLocalStorageItem,                 :delete, "session/:session_id/local_storage/key/:key"
+  command :getLocalStorageKeys,                    :get,    "session/:session_id/local_storage"
+  command :setLocalStorageItem,                    :post,   "session/:session_id/local_storage"
+  command :clearLocalStorage,                      :delete, "session/:session_id/local_storage"
+  command :getLocalStorageSize,                    :get,    "session/:session_id/local_storage/size"
+
+  command :getSessionStorageItem,                  :get,    "session/:session_id/session_storage/key/:key"
+  command :removeSessionStorageItem,               :delete, "session/:session_id/session_storage/key/:key"
+  command :getSessionStorageKeys,                  :get,    "session/:session_id/session_storage"
+  command :setSessionStorageItem,                  :post,   "session/:session_id/session_storage"
+  command :clearSessionStorage,                    :delete, "session/:session_id/session_storage"
+  command :getSessionStorageSize,                  :get,    "session/:session_id/session_storage/size"
+
+  #
+  # ime
+  #
+
+  command :imeGetAvailableEngines,                 :get,    "session/:session_id/ime/available_engines"
+  command :imeGetActiveEngine,                     :get,    "session/:session_id/ime/active_engine"
+  command :imeIsActivated,                         :get,    "session/:session_id/ime/activated"
+  command :imeDeactivate,                          :post,   "session/:session_id/ime/deactivate"
+  command :imeActivateEngine,                      :post,   "session/:session_id/ime/activate"
+
+  #
+  # touch
+  #
+
+  command :touchSingleTap,                         :post,   "session/:session_id/touch/click"
+  command :touchDoubleTap,                         :post,   "session/:session_id/touch/doubleclick"
+  command :touchLongPress,                         :post,   "session/:session_id/touch/longclick"
+  command :touchDown,                              :post,   "session/:session_id/touch/down"
+  command :touchUp,                                :post,   "session/:session_id/touch/up"
+  command :touchMove,                              :post,   "session/:session_id/touch/move"
+  command :touchScroll,                            :post,   "session/:session_id/touch/scroll"
+  command :touchFlick,                             :post,   "session/:session_id/touch/flick"
 end

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

@@ -14,6 +14,10 @@ module Selenium
             @timeout = nil
           end
 
+          def close
+            # hook for subclasses - will be called on Driver#quit
+          end
+
           def call(verb, url, command_hash)
             url      = server_url.merge(url) unless url.kind_of?(URI)
             headers  = DEFAULT_HEADERS.dup

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

@@ -8,6 +8,10 @@ module Selenium
         # @api private
         class Persistent < Default
 
+          def close
+            @http.shutdown if @http
+          end
+
           private
 
           def new_http_client

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.10.0
+  version: 2.12.0
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -07:00
+date: 2011-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -52,7 +52,7 @@ dependencies:
     requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - "="
+        - - ~>
           - !ruby/object:Gem::Version 
             version: 1.0.9
     type: :runtime
@@ -161,6 +161,7 @@ files:
   - lib/selenium/webdriver/common/target_locator.rb
   - lib/selenium/webdriver/common/timeouts.rb
   - lib/selenium/webdriver/common/wait.rb
+  - lib/selenium/webdriver/common/window.rb
   - lib/selenium/webdriver/common/zipper.rb
   - lib/selenium/webdriver/common/core_ext/base64.rb
   - lib/selenium/webdriver/common/core_ext/dir.rb