selenium-webdriver 0.0.28 → 0.0.29

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

@@ -68,8 +68,6 @@ module Selenium
           check_error_code Lib.wdGetVisible(@driver_pointer, int_ptr), "unable to determine if browser is visible"
 
           int_ptr.get_int(0) == 1
-        ensure
-          int_ptr.free
         end
 
         def setBrowserVisible(bool)
@@ -111,12 +109,11 @@ module Selenium
             rescue Error::NoSuchWindowError
             end
           end
-
-          # hack
-          ObjectSpace.each_object(WebDriver::Element) { |e| finalize e.ref if e.bridge == self }
         ensure
-          Lib.wdFreeDriver(@driver_pointer)
+          ptr = @driver_pointer
           @driver_pointer = nil
+
+          check_error_code Lib.wdFreeDriver(ptr), "unable to free driver #{self}"
         end
 
         def close
@@ -133,7 +130,6 @@ module Selenium
                            "unable to obtain all window handles"
 
           string_array_from(raw_handles).uniq
-          # TODO: who calls raw_handles.free if exception is raised?
         end
 
         def getCurrentWindowHandle
@@ -160,8 +156,6 @@ module Selenium
 
           extract_return_value script_result_ref
         ensure
-          script_args_ref.free
-          script_result_ref.free if script_result_ref
           Lib.wdFreeScriptArgs(args_pointer) if args_pointer
         end
 
@@ -223,8 +217,6 @@ module Selenium
         #
 
         def findElementByClassName(parent, class_name)
-          # TODO: argument checks
-
           create_element do |raw_element|
             check_error_code Lib.wdFindElementByClassName(@driver_pointer, parent, wstring_ptr(class_name), raw_element),
                              "unable to find element by class name using #{class_name.inspect}"
@@ -232,14 +224,26 @@ module Selenium
         end
 
         def findElementsByClassName(parent, class_name)
-          # TODO: argument checks
-
           create_element_collection do |raw_elements|
             check_error_code Lib.wdFindElementsByClassName(@driver_pointer, parent, wstring_ptr(class_name), raw_elements),
                              "unable to find elements by class name using #{class_name.inspect}"
           end
         end
 
+        def findElementByCssSelector(parent, selector)
+          create_element do |raw_element|
+            check_error_code Lib.wdFindElementByCss(@driver_pointer, parent, wstring_ptr(selector), raw_element),
+                             "unable to find element by css selector using #{selector.inspect}"
+          end
+        end
+
+        def findElementsByCssSelector(parent, selector)
+          create_element_collection do |raw_elements|
+            check_error_code Lib.wdFindElementsByCss(@driver_pointer, parent, wstring_ptr(selector), raw_elements),
+                             "unable to find elements by css selector using #{selector.inspect}"
+          end
+        end
+
         def findElementById(parent, id)
           create_element do |raw_element|
             check_error_code Lib.wdFindElementById(@driver_pointer, parent, wstring_ptr(id), raw_element),
@@ -379,8 +383,6 @@ module Selenium
                            "unable to get enabled state"
 
           int_ptr.get_int(0) == 1
-        ensure
-          int_ptr.free
         end
 
         def isElementSelected(element_pointer)
@@ -389,8 +391,6 @@ module Selenium
                            "unable to get selected state"
 
           int_ptr.get_int(0) == 1
-        ensure
-          int_ptr.free
         end
 
         def isElementDisplayed(element_pointer)
@@ -398,8 +398,6 @@ module Selenium
           check_error_code Lib.wdeIsDisplayed(element_pointer, int_ptr), "unable to check visibilty"
 
           int_ptr.get_int(0) == 1;
-        ensure
-          int_ptr.free
         end
 
         def submitElement(element_pointer)
@@ -418,8 +416,6 @@ module Selenium
           check_error_code result, "unable to toggle element"
 
           int_ptr.get_int(0) == 1
-        ensure
-          int_ptr.free
         end
 
         def setElementSelected(element_pointer)
@@ -457,8 +453,6 @@ module Selenium
 
           Lib.wdeMouseMoveTo(hwnd.get_pointer(0), duration, x.get_long(0), y.get_long(0), destination_x, destination_y)
           Lib.wdeMouseUpAt(hwnd.get_pointer(0), destination_x, destination_y)
-        ensure
-          [hwnd, x, y, width, height].each { |pointer| pointer.free }
         end
 
         def getElementLocation(element_pointer)
@@ -468,9 +462,6 @@ module Selenium
           check_error_code Lib.wdeGetLocation(element_pointer, x, y), "unable to get location of element"
 
           Point.new x.get_int(0), y.get_int(0)
-        ensure
-          x.free
-          y.free
         end
 
         def getElementSize(element_pointer)
@@ -480,9 +471,6 @@ module Selenium
           check_error_code Lib.wdeGetSize(element_pointer, width, height), "unable to get size of element"
 
           Dimension.new width.get_int(0), height.get_int(0)
-        ensure
-          width.free
-          height.free
         end
 
         def finalize(element_pointer)
@@ -518,10 +506,9 @@ module Selenium
 
         def extract_return_value(pointer_ref)
           result, returned = nil
-          pointers_to_free = []
           script_result    = pointer_ref.get_pointer(0)
 
-          pointers_to_free << type_pointer = FFI::MemoryPointer.new(:int)
+          type_pointer = FFI::MemoryPointer.new(:int)
           result       = Lib.wdGetScriptResultType(@driver_pointer, script_result, type_pointer)
 
           check_error_code result, "Cannot determine result type"
@@ -533,23 +520,24 @@ module Selenium
               check_error_code Lib.wdGetStringScriptResult(script_result, wrapper), "Cannot extract string result"
             end
           when 2 # Long
-            pointers_to_free << long_pointer = FFI::MemoryPointer.new(:long)
+            long_pointer = FFI::MemoryPointer.new(:long)
             check_error_code Lib.wdGetNumberScriptResult(script_result, long_pointer),
                              "Cannot extract number result"
 
             long_pointer.get_long(0)
           when 3 # Boolean
-            pointers_to_free << int_pointer = FFI::MemoryPointer.new(:int)
+            int_pointer = FFI::MemoryPointer.new(:int)
             check_error_code Lib.wdGetBooleanScriptResult(script_result, int_pointer),
                              "Cannot extract boolean result"
 
             int_pointer.get_int(0) == 1
           when 4 # WebElement
-            pointers_to_free << element_pointer = FFI::MemoryPointer.new(:pointer)
+            element_pointer = FFI::MemoryPointer.new(:pointer)
             check_error_code Lib.wdGetElementScriptResult(script_result, @driver_pointer, element_pointer),
                              "Cannot extract element result"
 
-            Element.new(self, element_pointer.get_pointer(0))
+            auto_ptr = FFI::AutoPointer.new(element_pointer.get_pointer(0), Lib.method(:finalize_element))
+            Element.new(self, auto_ptr)
           when 5 # Nothing
             nil
           when 6 # Exception
@@ -559,12 +547,12 @@ module Selenium
 
             raise Error::WebDriverError, message
           when 7 # Double
-            pointers_to_free << double_pointer = FFI::MemoryPointer.new(:double)
+            double_pointer = FFI::MemoryPointer.new(:double)
             check_error_code Lib.wdGetDoubleScriptResult(script_result, double_pointer), "Cannot extract double result"
 
             double_pointer.get_double(0)
           when 8 # Array
-            pointers_to_free << array_length_pointer = FFI::MemoryPointer.new(:int)
+            array_length_pointer = FFI::MemoryPointer.new(:int)
             check_error_code Lib.wdGetArrayLengthScriptResult(@driver_pointer, script_result, array_length_pointer),
                              "Cannot extract array length"
 
@@ -588,7 +576,6 @@ module Selenium
           end
         ensure
           Lib.wdFreeScriptResult(script_result) if script_result
-          pointers_to_free.each { |p| p.free }
         end
 
         def check_error_code(code, message)

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

@@ -49,6 +49,7 @@ module Selenium
         attach_function :wdExecuteScript,                     [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdeFreeElement,                      [:pointer                                                   ], :int
         attach_function :wdFindElementByClassName,            [:pointer, :pointer, :pointer, :pointer                     ], :int
+        attach_function :wdFindElementByCss,                  [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdFindElementById,                   [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdFindElementByLinkText,             [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdFindElementByName,                 [:pointer, :pointer, :pointer, :pointer                     ], :int
@@ -56,6 +57,7 @@ module Selenium
         attach_function :wdFindElementByTagName,              [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdFindElementByXPath,                [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdFindElementsByClassName,           [:pointer, :pointer, :pointer, :pointer                     ], :int
+        attach_function :wdFindElementsByCss,                 [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdFindElementsById,                  [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdFindElementsByLinkText,            [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdFindElementsByName,                [:pointer, :pointer, :pointer, :pointer                     ], :int
@@ -96,7 +98,15 @@ module Selenium
         attach_function :wdSwitchToFrame,                     [:pointer, :pointer                                         ], :int
         attach_function :wdSwitchToWindow,                    [:pointer, :pointer                                         ], :int
         attach_function :wdWaitForLoadToComplete,             [:pointer                                                   ], :int
-      end
+
+        def self.finalize_element(ptr)
+          code = Lib.wdeFreeElement(ptr)
+          if err = WebDriver::Error.for_code(code)
+            raise err, "could not free element (#{ptr})"
+          end
+        end
+
+      end # Lib
 
       module Kernel32
         extend FFI::Library

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

@@ -7,12 +7,6 @@ module Selenium
       #
 
       module Util
-        CP_ACP         = 0
-        CP_OEMCP       = 1
-        CP_MACCP       = 2
-        CP_THREAD_ACP  = 3
-        CP_SYMBOL      = 42
-        CP_UTF7        = 65000
         CP_UTF8        = 65001
 
         def string_array_from(raw_strings)
@@ -40,15 +34,14 @@ module Selenium
           arr
         ensure
           Lib.wdFreeStringCollection(strings_ptr)
-          raw_strings.free
         end
 
         def create_element(&blk)
           element_ptr_ref = FFI::MemoryPointer.new :pointer
           yield element_ptr_ref
-          Element.new(self, element_ptr_ref.get_pointer(0))
-        ensure
-          element_ptr_ref.free
+
+          auto_ptr = FFI::AutoPointer.new(element_ptr_ref.get_pointer(0), Lib.method(:finalize_element))
+          Element.new(self, auto_ptr)
         end
 
         def create_element_collection(&blk)
@@ -85,7 +78,6 @@ module Selenium
           wstring_to_bytestring raw_string
         ensure
           Lib.wdFreeString(string_ptr) unless string_ptr.null?
-          string_ptr_ref.free
         end
 
         def extract_elements_from(elements_ptr_ref)
@@ -111,12 +103,8 @@ module Selenium
           Lib.wdFreeElementCollection(elements_ptr, 0)
 
           arr
-        ensure
-          elements_ptr_ref.free
-          length_ptr.free
         end
 
-
         def wstring_ptr(str)
           str  = str.to_s
           size = Kernel32.MultiByteToWideChar(CP_UTF8, 0, str, -1, nil, 0)
@@ -142,8 +130,6 @@ module Selenium
           Kernel32.WideCharToMultiByte(CP_UTF8, 0, wstring, -1, buf, size, nil, nil )
 
           buf.get_bytes(0, size - 1)
-        ensure
-          buf.free if buf
         end
 
       end # Util

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

@@ -173,7 +173,7 @@ module Selenium
         end
 
         def executeScript(script, *args)
-          unless capabilities.javascript?
+          unless capabilities.javascript_enabled?
             raise Error::UnsupportedOperationError, "underlying webdriver instance does not support javascript"
           end
 
@@ -205,6 +205,14 @@ module Selenium
           find_elements_by 'class name', class_name, parent
         end
 
+        def findElementByCssSelector(parent, selector)
+          find_element_by 'css selector', selector, parent
+        end
+
+        def findElementsByCssSelector(parent, selector)
+          find_elements_by 'css selector', selector, parent
+        end
+
         def findElementById(parent, id)
           find_element_by 'id', id, parent
         end

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

@@ -8,8 +8,18 @@ module Selenium
       #
       class Capabilities
 
-        attr_accessor :browser_name, :version, :platform, :javascript_enabled
-        alias_method :javascript?, :javascript_enabled
+        attr_accessor :css_selectors_enabled,
+                      :javascript_enabled,
+                      :native_events,
+                      :platform,
+                      :takes_screenshot,
+                      :version,
+                      :browser_name
+
+        alias_method :css_selectors_enabled?, :css_selectors_enabled
+        alias_method :javascript_enabled?,    :javascript_enabled
+        alias_method :native_events?,         :native_events
+        alias_method :takes_screenshot?,      :takes_screenshot
 
         #
         # Convenience methods for the common choices.
@@ -57,46 +67,69 @@ module Selenium
             }.merge(opts))
           end
 
+          def android(opts = {})
+            new({
+              :browser_name => "android",
+              :platform     => :android
+            }.merge(opts))
+          end
+
           #
           # @api private
           #
 
           def json_create(data)
             new(
-              :browser_name       => data["browserName"],
-              :version            => data["version"],
-              :platform           => data["platform"].downcase.to_sym,
-              :javascript_enabled => data["javascriptEnabled"]
+              :browser_name          => data["browserName"],
+              :version               => data["version"],
+              :platform              => data["platform"].downcase.to_sym,
+              :javascript_enabled    => data["javascriptEnabled"],
+              :css_selectors_enabled => data["cssSelectorsEnabled"],
+              :takes_screenshot      => data["takesScreenshot"],
+              :native_events         => data["nativeEvents"]
             )
           end
         end
 
-        # @option :browser_name        [String] required browser name
-        # @option :version             [String] required browser version number
-        # @option :platform            [Symbol] one of :any, :win, :mac, or :x
-        # @option :javascript_enabled  [Boolean] should the test run with javascript enabled?
+        # @option :browser_name           [String] required browser name
+        # @option :version                [String] required browser version number
+        # @option :platform               [Symbol] one of :any, :win, :mac, or :x
+        # @option :javascript_enabled     [Boolean] does the driver have javascript enabled?
+        # @option :css_selectors_enabled  [Boolean] does the driver support CSS selectors?
+        # @option :takes_screenshot       [Boolean] can this driver take screenshots?
+        # @option :native_events         [Boolean] does this driver use native events?
         #
         # @api public
         #
 
         def initialize(opts = {})
-          @browser_name       = opts[:browser_name]       || ""
-          @version            = opts[:version]            || ""
-          @platform           = opts[:platform]           || :any
-          @javascript_enabled = opts[:javascript_enabled] || false
+          @browser_name          = opts[:browser_name]          || ""
+          @version               = opts[:version]               || ""
+          @platform              = opts[:platform]              || :any
+          @javascript_enabled    = opts[:javascript_enabled]    || false
+          @css_selectors_enabled = opts[:css_selectors_enabled] || false
+          @takes_screenshot      = opts[:takes_screenshot]      || false
+          @native_events         = opts[:native_events]         || false
         end
 
         #
         # @api private
         #
 
-        def to_json(*args)
+        def as_json(opts = nil)
           {
-            "browserName"       => browser_name,
-            "version"           => version,
-            "platform"          => platform.to_s.upcase,
-            "javascriptEnabled" => javascript?
-          }.to_json(*args)
+            "browserName"         => browser_name,
+            "version"             => version,
+            "platform"            => platform.to_s.upcase,
+            "javascriptEnabled"   => javascript_enabled?,
+            "cssCelectorsEnabled" => css_selectors_enabled?,
+            "takesScreenshot"     => takes_screenshot?,
+            "nativeEvents"        => native_events?
+          }
+        end
+
+        def to_json(*args)
+          as_json.to_json(*args)
         end
 
       end # Capabilities

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

@@ -19,8 +19,8 @@ module Selenium
               end
 
               if self.class.timeout
-                http.connect_timeout = self.class.timeout
-                http.read_timeout    = self.class.timeout
+                http.open_timeout = self.class.timeout
+                http.read_timeout = self.class.timeout
               end
 
               http

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 28
-  version: 0.0.28
+    - 29
+  version: 0.0.29
 platform: ruby
 authors: 
   - Jari Bakken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: ffi
+    name: childprocess
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
       requirements: 
@@ -50,35 +50,52 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 0
-              - 6
-              - 1
-            version: 0.6.1
+              - 0
+              - 7
+            version: 0.0.7
     type: :runtime
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: ffi
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
             segments: 
               - 0
-            version: "0"
-    type: :development
+              - 6
+              - 3
+            version: 0.6.3
+    type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
-    name: rack
+    name: rspec
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
             segments: 
+              - 1
+              - 3
               - 0
-            version: "0"
+            version: 1.3.0
     type: :development
     version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: rack
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+            version: "1.0"
+    type: :development
+    version_requirements: *id006
 description: WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.
 email: jari.bakken@gmail.com
 executables: []
@@ -90,36 +107,40 @@ extra_rdoc_files: []
 files: 
   - lib/selenium-webdriver.rb
   - lib/selenium/webdriver.rb
-  - lib/selenium/webdriver/bridge_helper.rb
-  - lib/selenium/webdriver/child_process.rb
   - lib/selenium/webdriver/chrome.rb
-  - lib/selenium/webdriver/driver.rb
-  - lib/selenium/webdriver/element.rb
-  - lib/selenium/webdriver/error.rb
-  - lib/selenium/webdriver/file_reaper.rb
-  - lib/selenium/webdriver/find.rb
+  - lib/selenium/webdriver/common.rb
   - lib/selenium/webdriver/firefox.rb
   - lib/selenium/webdriver/ie.rb
-  - lib/selenium/webdriver/keys.rb
-  - lib/selenium/webdriver/navigation.rb
-  - lib/selenium/webdriver/options.rb
-  - lib/selenium/webdriver/platform.rb
   - lib/selenium/webdriver/remote.rb
-  - lib/selenium/webdriver/target_locator.rb
-  - lib/selenium/webdriver/timeouts.rb
-  - lib/selenium/webdriver/zip_helper.rb
   - lib/selenium/webdriver/chrome/bridge.rb
   - lib/selenium/webdriver/chrome/command_executor.rb
   - lib/selenium/webdriver/chrome/extension.zip
   - lib/selenium/webdriver/chrome/launcher.rb
-  - lib/selenium/webdriver/core_ext/dir.rb
-  - lib/selenium/webdriver/core_ext/string.rb
-  - lib/selenium/webdriver/driver_extensions/takes_screenshot.rb
+  - lib/selenium/webdriver/common/bridge_helper.rb
+  - lib/selenium/webdriver/common/driver.rb
+  - lib/selenium/webdriver/common/element.rb
+  - lib/selenium/webdriver/common/error.rb
+  - lib/selenium/webdriver/common/file_reaper.rb
+  - lib/selenium/webdriver/common/find.rb
+  - lib/selenium/webdriver/common/keys.rb
+  - lib/selenium/webdriver/common/navigation.rb
+  - lib/selenium/webdriver/common/options.rb
+  - lib/selenium/webdriver/common/platform.rb
+  - lib/selenium/webdriver/common/socket_poller.rb
+  - lib/selenium/webdriver/common/target_locator.rb
+  - lib/selenium/webdriver/common/timeouts.rb
+  - lib/selenium/webdriver/common/wait.rb
+  - lib/selenium/webdriver/common/zipper.rb
+  - lib/selenium/webdriver/common/core_ext/dir.rb
+  - lib/selenium/webdriver/common/core_ext/string.rb
+  - lib/selenium/webdriver/common/driver_extensions/takes_screenshot.rb
   - lib/selenium/webdriver/firefox/binary.rb
   - lib/selenium/webdriver/firefox/bridge.rb
+  - lib/selenium/webdriver/firefox/extension.rb
   - lib/selenium/webdriver/firefox/launcher.rb
   - lib/selenium/webdriver/firefox/profile.rb
   - lib/selenium/webdriver/firefox/profiles_ini.rb
+  - lib/selenium/webdriver/firefox/socket_lock.rb
   - lib/selenium/webdriver/firefox/util.rb
   - lib/selenium/webdriver/firefox/extension/webdriver.xpi
   - lib/selenium/webdriver/firefox/native/linux/amd64/x_ignore_nofocus.so