selenium-webdriver 2.1.0 → 2.2.0

data/CHANGES

@@ -1,3 +1,11 @@
+2.2.0 (2011-07-26)
+==================
+
+* Add ability to listen for WebDriver events
+* Fix Android/iPhone bridges to work similar to others (https://github.com/jnicklas/capybara/issues/425)
+* Various atoms fixes
+* Element equality now works properly with the remote server (#251).
+
 2.1.0 (2011-07-18)
 ==================
 

data/lib/selenium/webdriver.rb

@@ -35,11 +35,12 @@ module Selenium
 
     autoload :Android, 'selenium/webdriver/android'
     autoload :Chrome,  'selenium/webdriver/chrome'
+    autoload :Firefox, 'selenium/webdriver/firefox'
     autoload :IE,      'selenium/webdriver/ie'
     autoload :IPhone,  'selenium/webdriver/iphone'
-    autoload :Remote,  'selenium/webdriver/remote'
-    autoload :Firefox, 'selenium/webdriver/firefox'
     autoload :Opera,   'selenium/webdriver/opera'
+    autoload :Remote,  'selenium/webdriver/remote'
+    autoload :Support, 'selenium/webdriver/support'
 
     # @api private
 
@@ -71,6 +72,11 @@ module Selenium
     #   WebDriver.for :firefox, :profile => Profile.new
     #   WebDriver.for :remote,  :url => "http://localhost:4444/wd/hub", :desired_capabilities => caps
     #
+    # One special argument is not passed on to the bridges, :listener. You can pass a listener for this option
+    # to get notified of WebDriver events. The passed object must respond to #call or implement the methods from AbstractEventListener.
+    #
+    # @see Selenium::WebDriver::Support::AbstractEventListener
+    #
 
     def self.for(*args)
       WebDriver::Driver.for(*args)
@@ -78,5 +84,3 @@ module Selenium
 
   end # WebDriver
 end # Selenium
-
-Thread.abort_on_exception = true

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

@@ -3,17 +3,16 @@ module Selenium
     module Android
       class Bridge < Remote::Bridge
 
-        DEFAULT_URL = "http://#{Platform.localhost}:8080/hub"
-
-        def initialize(opts = nil)
-          if opts
-            super
-          else
-            super(
-              :url => DEFAULT_URL,
-              :desired_capabilities => capabilities
-            )
-          end
+        DEFAULT_URL = "http://#{Platform.localhost}:8080/hub/"
+
+        def initialize(opts = {})
+          remote_opts = {
+            :url                  => opts.fetch(:url, DEFAULT_URL),
+            :desired_capabilities => opts.fetch(:desired_capabilities, capabilities),
+            :http_client          => opts[:http_client]
+          }
+
+          super remote_opts
         end
 
         def browser
@@ -23,7 +22,8 @@ module Selenium
         def driver_extensions
           [
             DriverExtensions::TakesScreenshot,
-            DriverExtensions::Rotatable
+            DriverExtensions::Rotatable,
+            DriverExtensions::HasInputDevices
           ]
         end
 

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

@@ -21,27 +21,31 @@ module Selenium
         # @see Selenium::WebDriver.for
         #
 
-        def for(browser, *args)
+        def for(browser, opts = {})
+          listener = opts.delete(:listener)
+
           bridge = case browser
                    when :firefox, :ff
-                     Firefox::Bridge.new(*args)
+                     Firefox::Bridge.new(opts)
                    when :remote
-                     Remote::Bridge.new(*args)
+                     Remote::Bridge.new(opts)
                    when :ie, :internet_explorer
-                     IE::Bridge.new(*args)
+                     IE::Bridge.new(opts)
                    when :chrome
-                     Chrome::Bridge.new(*args)
+                     Chrome::Bridge.new(opts)
                    when :android
-                     Android::Bridge.new(*args)
+                     Android::Bridge.new(opts)
                    when :iphone
-                     IPhone::Bridge.new(*args)
+                     IPhone::Bridge.new(opts)
                    when :opera
-                     Opera::Bridge.new(*args)
+                     Opera::Bridge.new(opts)
                    else
                      raise ArgumentError, "unknown driver: #{browser.inspect}"
                    end
 
-           new(bridge)
+          bridge = Support::EventFiringBridge.new(bridge, listener) if listener
+
+          new(bridge)
         end
       end
 
@@ -270,7 +274,7 @@ module Selenium
       def capabilities
         bridge.capabilities
       end
-      
+
       #
       # @api private
       # @see SearchContext

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

@@ -3,8 +3,6 @@ module Selenium
     class Element
       include SearchContext
 
-      attr_reader :bridge
-
       #
       # Creates a new Element
       #
@@ -255,6 +253,10 @@ module Selenium
 
       private
 
+      def bridge
+        @bridge
+      end
+
       def selectable?
         tn = tag_name.downcase
         type = attribute(:type).to_s.downcase

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

@@ -3,16 +3,16 @@ module Selenium
     module SearchContext
 
       FINDERS = {
-        :class             => 'ClassName',
-        :class_name        => 'ClassName',
-        :css               => 'CssSelector',
-        :id                => 'Id',
-        :link              => 'LinkText',
-        :link_text         => 'LinkText',
-        :name              => 'Name',
-        :partial_link_text => 'PartialLinkText',
-        :tag_name          => 'TagName',
-        :xpath             => 'Xpath',
+        :class             => 'class name',
+        :class_name        => 'class name',
+        :css               => 'css selector',
+        :id                => 'id',
+        :link              => 'link text',
+        :link_text         => 'link text',
+        :name              => 'name',
+        :partial_link_text => 'partial link text',
+        :tag_name          => 'tag name',
+        :xpath             => 'xpath',
       }
 
       #
@@ -38,10 +38,7 @@ module Selenium
           raise ArgumentError, "cannot find element by #{how.inspect}"
         end
 
-        meth = "findElementBy#{by}"
-        what = what.to_s
-
-        bridge.send meth, ref, what
+        bridge.find_element_by by, what.to_s, ref
       end
 
       #
@@ -61,10 +58,7 @@ module Selenium
           raise ArgumentError, "cannot find elements by #{how.inspect}"
         end
 
-        meth = "findElementsBy#{by}"
-        what = what.to_s
-
-        bridge.send meth, ref, what
+        bridge.find_elements_by by, what.to_s, ref
       end
 
       private

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

@@ -5,15 +5,14 @@ module Selenium
 
         DEFAULT_URL = "http://#{Platform.localhost}:3001/hub/"
 
-        def initialize(opts = nil)
-          if opts
-            super
-          else
-            super(
-              :url                  => DEFAULT_URL,
-              :desired_capabilities => capabilities
-            )
-          end
+        def initialize(opts = {})
+          remote_opts = {
+            :url                  => opts.fetch(:url, DEFAULT_URL),
+            :desired_capabilities => opts.fetch(:desired_capabilities, capabilities),
+            :http_client          => opts[:http_client]
+          }
+
+          super remote_opts
         end
 
         def browser
@@ -21,7 +20,10 @@ module Selenium
         end
 
         def driver_extensions
-          []
+          [
+            DriverExtensions::TakesScreenshot,
+            DriverExtensions::HasInputDevices
+          ]
         end
 
         def capabilities

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

@@ -228,72 +228,6 @@ module Selenium
           execute :deleteAllCookies
         end
 
-        # finding elements
-
-        def findElementByClassName(parent, class_name)
-          find_element_by 'class name', class_name, parent
-        end
-
-        def findElementsByClassName(parent, class_name)
-          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
-
-        def findElementsById(parent, id)
-          find_elements_by 'id', id, parent
-        end
-
-        def findElementByLinkText(parent, link_text)
-          find_element_by 'link text', link_text, parent
-        end
-
-        def findElementsByLinkText(parent, link_text)
-          find_elements_by 'link text', link_text, parent
-        end
-
-        def findElementByPartialLinkText(parent, link_text)
-          find_element_by 'partial link text', link_text, parent
-        end
-
-        def findElementsByPartialLinkText(parent, link_text)
-          find_elements_by 'partial link text', link_text, parent
-        end
-
-        def findElementByName(parent, name)
-          find_element_by 'name', name, parent
-        end
-
-        def findElementsByName(parent, name)
-          find_elements_by 'name', name, parent
-        end
-
-        def findElementByTagName(parent, tag_name)
-          find_element_by 'tag name', tag_name, parent
-        end
-
-        def findElementsByTagName(parent, tag_name)
-          find_elements_by 'tag name', tag_name, parent
-        end
-
-        def findElementByXpath(parent, xpath)
-          find_element_by 'xpath', xpath, parent
-        end
-
-        def findElementsByXpath(parent, xpath)
-          find_elements_by 'xpath', xpath, parent
-        end
-
         def clickElement(element)
           execute :clickElement, :id => element
         end
@@ -411,8 +345,6 @@ module Selenium
           execute :elementEquals, :id => element.ref, :other => other.ref
         end
 
-        private
-
         def find_element_by(how, what, parent = nil)
           if parent
             id = execute :findChildElement, {:id => parent}, {:using => how, :value => what}
@@ -433,6 +365,8 @@ module Selenium
           ids.map { |id| Element.new self, element_id_from(id) }
         end
 
+        private
+
         def assert_javascript_enabled
           unless capabilities.javascript_enabled?
             raise Error::UnsupportedOperationError, "underlying webdriver instance does not support javascript"

data/lib/selenium/webdriver/support.rb

@@ -0,0 +1,3 @@
+require 'selenium/webdriver/support/event_firing_bridge'
+require 'selenium/webdriver/support/abstract_event_listener'
+require 'selenium/webdriver/support/block_event_listener'

data/lib/selenium/webdriver/support/abstract_event_listener.rb

@@ -0,0 +1,28 @@
+module Selenium
+  module WebDriver
+    module Support
+
+      class AbstractEventListener
+        def before_navigate_to(url) end
+        def after_navigate_to(url) end
+        def before_navigate_back() end
+        def after_navigate_back() end
+        def before_navigate_forward() end
+        def after_navigate_forward() end
+        def before_find(by, what) end
+        def after_find(by, what) end
+        def before_click(element) end
+        def after_click(element) end
+        def before_change_value_of(element) end
+        def after_change_value_of(element) end
+        def before_execute_script(script) end
+        def after_execute_script(script) end
+        def before_quit() end
+        def after_quit() end
+        def before_close() end
+        def after_close() end
+      end
+
+    end
+  end
+end

data/lib/selenium/webdriver/support/block_event_listener.rb

@@ -0,0 +1,17 @@
+module Selenium
+  module WebDriver
+    module Support
+
+      class BlockEventListener
+        def initialize(callback)
+          @callback = callback
+        end
+
+        def method_missing(meth, *args, &blk)
+          @callback.call meth, *args
+        end
+      end
+
+    end
+  end
+end

data/lib/selenium/webdriver/support/event_firing_bridge.rb

@@ -0,0 +1,108 @@
+module Selenium
+  module WebDriver
+    module Support
+
+      #
+      # @api private
+      #
+
+      class EventFiringBridge
+        def initialize(delegate, listener)
+          @delegate = delegate
+
+          if listener.respond_to? :call
+            @listener = BlockEventListener.new(listener)
+          else
+            @listener = listener
+          end
+        end
+
+        def get(url)
+          dispatch(:navigate_to, url) {
+            @delegate.get(url)
+          }
+        end
+
+        def goForward
+          dispatch(:navigate_forward) {
+            @delegate.goForward
+          }
+        end
+
+        def goBack
+          dispatch(:navigate_back) {
+            @delegate.goBack
+          }
+        end
+
+        def clickElement(ref)
+          dispatch(:click, create_element(ref)) {
+            @delegate.clickElement(ref)
+          }
+        end
+
+        def clearElement(ref)
+          dispatch(:change_value_of, create_element(ref)) {
+            @delegate.clearElement(ref)
+          }
+        end
+
+        def sendKeysToElement(ref, keys)
+          dispatch(:change_value_of, create_element(ref)) {
+            @delegate.sendKeysToElement(ref, keys)
+          }
+        end
+
+        def find_element_by(how, what, parent = nil)
+          e = dispatch(:find, how, what) {
+            @delegate.find_element_by how, what, parent
+          }
+
+          Element.new self, e.ref
+        end
+
+        def find_elements_by(how, what, parent = nil)
+          es = dispatch(:find, how, what) {
+            @delegate.find_elements_by(how, what, parent)
+          }
+
+          es.map { |e| Element.new self, e.ref }
+        end
+
+        def executeScript(script, *args)
+          dispatch(:execute_script, script) {
+            @delegate.executeScript(script, *args)
+          }
+        end
+
+        def quit
+          dispatch(:quit) { @delegate.quit }
+        end
+
+        def close
+          dispatch(:close) { @delegate.close }
+        end
+
+        private
+
+        def create_element(ref)
+          # hmm. we're not passing self here to not fire events for potential calls made by the listener
+          Element.new @delegate, ref
+        end
+
+        def dispatch(name, *args, &blk)
+          @listener.__send__("before_#{name}", *args)
+          returned = yield
+          @listener.__send__("after_#{name}", *args)
+
+          returned
+        end
+
+        def method_missing(meth, *args, &blk)
+          @delegate.__send__(meth, *args, &blk)
+        end
+      end # EventFiringBridge
+
+    end # Support
+  end # WebDriver
+end # Selenium

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 Z
+date: 2011-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -210,6 +210,10 @@ files:
 - lib/selenium/webdriver/remote/response.rb
 - lib/selenium/webdriver/remote/server_error.rb
 - lib/selenium/webdriver/remote.rb
+- lib/selenium/webdriver/support/abstract_event_listener.rb
+- lib/selenium/webdriver/support/block_event_listener.rb
+- lib/selenium/webdriver/support/event_firing_bridge.rb
+- lib/selenium/webdriver/support.rb
 - lib/selenium/webdriver.rb
 - lib/selenium-client.rb
 - lib/selenium-webdriver.rb