selenium-webdriver 2.2.0 → 2.3.0

data/CHANGES

@@ -1,3 +1,13 @@
+2.3.0 (2011-08-01)
+==================
+
+* Add Selenium::WebDriver::Chrome::Profile
+* Better detection of clickable areas in Firefox.
+* Merge of Google-contributed code into the underlying Atoms.
+* IE click issue fixed (#1650)
+* No longer raise in Element#inspect if the element is obsolete.
+
+
 2.2.0 (2011-07-26)
 ==================
 

data/lib/selenium/client.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'uri'
 require 'cgi'
 require 'digest/md5'
+require 'base64'
 require 'fileutils'
 require 'tmpdir'
 

data/lib/selenium/webdriver.rb

@@ -2,7 +2,6 @@ require 'childprocess'
 require 'tmpdir'
 require 'fileutils'
 require 'date'
-require 'base64'
 
 have_lib = lambda { |lib|
   begin

data/lib/selenium/webdriver/chrome.rb

@@ -2,6 +2,7 @@ require 'net/http'
 
 require 'selenium/webdriver/chrome/service'
 require 'selenium/webdriver/chrome/bridge'
+require 'selenium/webdriver/chrome/profile'
 
 module Selenium
   module WebDriver
@@ -17,7 +18,7 @@ module Selenium
       end
 
       def self.path
-        @path
+        @path ||= nil
       end
 
     end

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

@@ -10,6 +10,7 @@ module Selenium
           switches      = opts.delete(:switches)
           native_events = opts.delete(:native_events)
           verbose       = opts.delete(:verbose)
+          profile       = opts.delete(:profile)
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
@@ -28,6 +29,7 @@ module Selenium
           caps.merge! 'chrome.binary'       => Chrome.path if Chrome.path
           caps.merge! 'chrome.nativeEvents' => true if native_events
           caps.merge! 'chrome.verbose'      => true if verbose
+          caps.merge! 'chrome.profile'      => profile.as_json['zip'] if profile
 
           @service = Service.default_service
           @service.start

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

@@ -0,0 +1,66 @@
+module Selenium
+  module WebDriver
+    module Chrome
+
+      #
+      # @private
+      #
+
+      class Profile
+        include ProfileHelper
+
+        def initialize(model = nil)
+          @model = verify_model(model)
+        end
+
+        #
+        # Set a preference in the profile.
+        #
+        # See http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/chrome/common/pref_names.cc&exact_package=chromium
+        #
+
+        def []=(key, value)
+          parts = key.split(".")
+          parts[0..-2].inject(prefs) { |pr, k| pr[k] ||= {} }[parts.last] = value
+        end
+
+        def [](key)
+          parts = key.split(".")
+          parts.inject(prefs) { |pr, k| pr.fetch(k) }
+        end
+
+        def layout_on_disk
+          dir = @model ? create_tmp_copy(@model) : Dir.mktmpdir("webdriver-chrome-profile")
+          FileReaper << dir
+
+          write_prefs_to dir
+
+          dir
+        end
+
+        private
+
+        def write_prefs_to(dir)
+          prefs_file = prefs_file_for(dir)
+
+          FileUtils.mkdir_p File.dirname(prefs_file)
+          File.open(prefs_file, "w") { |file| file << prefs.to_json  }
+        end
+
+        def prefs
+          @prefs ||= read_model_prefs
+        end
+
+        def read_model_prefs
+          return {} unless @model
+          JSON.parse File.read(prefs_file_for(@model))
+        end
+
+        def prefs_file_for(dir)
+          File.join dir, 'Default', 'Preferences'
+        end
+      end # Profile
+
+    end # Chrome
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/common.rb

@@ -1,5 +1,6 @@
 require 'selenium/webdriver/common/core_ext/dir'
 require 'selenium/webdriver/common/core_ext/string'
+require 'selenium/webdriver/common/core_ext/base64'
 require 'selenium/webdriver/common/error'
 require 'selenium/webdriver/common/platform'
 require 'selenium/webdriver/common/proxy'
@@ -22,5 +23,6 @@ require 'selenium/webdriver/common/driver_extensions/rotatable'
 require 'selenium/webdriver/common/driver_extensions/has_input_devices'
 require 'selenium/webdriver/common/keys'
 require 'selenium/webdriver/common/bridge_helper'
+require 'selenium/webdriver/common/profile_helper'
 require 'selenium/webdriver/common/driver'
 require 'selenium/webdriver/common/element'

data/lib/selenium/webdriver/common/core_ext/base64.rb

@@ -0,0 +1,9 @@
+require 'base64'
+
+module Base64
+  
+  def self.strict_encode64(str)
+    encode64(str).gsub(/\n/, '')
+  end unless respond_to?(:strict_encode64) # added in 1.9
+  
+end

data/lib/selenium/webdriver/common/driver_extensions/rotatable.rb

@@ -10,6 +10,14 @@ module Selenium
 
         ORIENTATIONS = [:landscape, :portrait]
 
+        #
+        # Change the screen orientation
+        #
+        # @param [:landscape, :portrait] Orientation
+        #
+        # @api public
+        #
+
         def rotate(orientation)
           unless ORIENTATIONS.include?(orientation)
             raise ArgumentError, "expected #{ORIENTATIONS.inspect}, got #{orientation.inspect}"
@@ -18,6 +26,14 @@ module Selenium
           bridge.setScreenOrientation(orientation.to_s.upcase)
         end
 
+        #
+        # Get the current screen orientation
+        #
+        # @return [:landscape, :portrait] orientation
+        #
+        # @api public
+        #
+
         def orientation
           bridge.getScreenOrientation.to_sym.downcase
         end

data/lib/selenium/webdriver/common/driver_extensions/takes_screenshot.rb

@@ -8,10 +8,24 @@ module Selenium
     module DriverExtensions
       module TakesScreenshot
 
+        #
+        # Save a PNG screenshot to the given path
+        #
+        # @api public
+        #
+
         def save_screenshot(png_path)
           File.open(png_path, 'wb') { |f| f << screenshot_as(:png) }
         end
 
+        #
+        # Return a PNG screenshot in the given format as a string
+        #
+        # @param [:base64, :png] format
+        # @return String screenshot
+        #
+        # @api public
+
         def screenshot_as(format)
           case format
           when :base64

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

@@ -14,7 +14,7 @@ module Selenium
       end
 
       def inspect
-        '#<%s:0x%x id=%s tag_name=%s>' % [self.class, hash*2, @id.inspect, tag_name.inspect]
+        '#<%s:0x%x id=%s>' % [self.class, hash*2, @id.inspect]
       end
 
       def ==(other)

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

@@ -0,0 +1,67 @@
+module Selenium
+  module WebDriver
+
+    #
+    # @private
+    #
+    # Common methods for Chrome::Profile and Firefox::Profile
+    # Includers must implement #layout_on_disk
+    #
+
+    module ProfileHelper
+
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      def as_json(opts = nil)
+        {'zip' => Zipper.zip(layout_on_disk)}
+      end
+
+      def to_json(*args)
+        as_json.to_json(*args)
+      end
+
+      private
+
+      def create_tmp_copy(directory)
+        tmp_directory = Dir.mktmpdir("webdriver-rb-profilecopy")
+
+        # TODO: must be a better way..
+        FileUtils.rm_rf tmp_directory
+        FileUtils.mkdir_p File.dirname(tmp_directory), :mode => 0700
+        FileUtils.cp_r directory, tmp_directory
+
+        tmp_directory
+      end
+
+      def verify_model(model)
+        return unless model
+
+        raise Errno::ENOENT, model unless File.exist?(model)
+        raise Errno::ENOTDIR, model unless File.directory?(model)
+
+        model
+      end
+
+      module ClassMethods
+        def from_json(json)
+          data = JSON.parse(json).fetch('zip')
+
+          # can't use Tempfile here since it doesn't support File::BINARY mode on 1.8
+          # can't use Dir.mktmpdir(&blk) because of http://jira.codehaus.org/browse/JRUBY-4082
+          tmp_dir = Dir.mktmpdir
+          begin
+            zip_path = File.join(tmp_dir, "webdriver-profile-duplicate-#{json.hash}")
+            File.open(zip_path, "wb") { |zip_file| zip_file << Base64.decode64(data) }
+
+            new Zipper.unzip(zip_path)
+          ensure
+            FileUtils.rm_rf tmp_dir
+          end
+        end
+      end # ClassMethods
+
+    end # ProfileHelper
+  end # WebDriver
+end # Selenium

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

@@ -41,7 +41,7 @@ module Selenium
             end
           }
 
-          File.open(zip_path, "rb") { |io| Base64.encode64 io.read }
+          File.open(zip_path, "rb") { |io| Base64.strict_encode64 io.read }
         ensure
           FileUtils.rm_rf tmp_dir
         end

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

@@ -2,6 +2,7 @@ module Selenium
   module WebDriver
     module Firefox
       class Profile
+        include ProfileHelper
 
         WEBDRIVER_EXTENSION_PATH = File.expand_path("#{WebDriver.root}/selenium/webdriver/firefox/extension/webdriver.xpi")
         WEBDRIVER_PREFS          = {
@@ -55,7 +56,6 @@ module Selenium
             @secure_ssl        = model_prefs.delete(WEBDRIVER_PREFS[:untrusted_certs]) != "true"
             @untrusted_issuer  = model_prefs.delete(WEBDRIVER_PREFS[:untrusted_issuer]) == "true"
             @load_no_focus_lib = model_prefs.delete(WEBDRIVER_PREFS[:load_no_focus_lib]) == "true" # not stored in profile atm, so will always be false.
-
             @additional_prefs  = model_prefs
           end
 
@@ -74,29 +74,6 @@ module Selenium
           profile_dir
         end
 
-        def as_json(opts = nil)
-          {'zip' => Zipper.zip(layout_on_disk)}
-        end
-
-        def to_json(*args)
-          as_json.to_json(*args)
-        end
-
-        def self.from_json(json)
-          data = JSON.parse(json).fetch('zip')
-
-          # can't use Tempfile here since it doesn't support File::BINARY mode on 1.8
-          # can't use Dir.mktmpdir(&blk) because of http://jira.codehaus.org/browse/JRUBY-4082
-          tmp_dir = Dir.mktmpdir
-          begin
-            zip_path = File.join(tmp_dir, "webdriver-profile-duplicate-#{json.hash}")
-            File.open(zip_path, "wb") { |zip_file| zip_file << Base64.decode64(data) }
-
-            new Zipper.unzip(zip_path)
-          ensure
-            FileUtils.rm_rf tmp_dir
-          end
-        end
 
         #
         # Set a preference for this particular profile.
@@ -213,15 +190,6 @@ module Selenium
           end
         end
 
-        def verify_model(model)
-          return unless model
-
-          raise Errno::ENOENT, model unless File.exist?(model)
-          raise Errno::ENOTDIR, model unless File.directory?(model)
-
-          model
-        end
-
         def read_model_prefs
           return {} unless @model
 
@@ -242,17 +210,6 @@ module Selenium
           File.basename(path, File.extname(path))
         end
 
-        def create_tmp_copy(directory)
-          tmp_directory = Dir.mktmpdir("webdriver-rb-profilecopy")
-
-          # TODO: must be a better way..
-          FileUtils.rm_rf tmp_directory
-          FileUtils.mkdir_p File.dirname(tmp_directory), :mode => 0700
-          FileUtils.cp_r directory, tmp_directory
-
-          tmp_directory
-        end
-
         def update_user_prefs_in(directory)
           path = File.join(directory, 'user.js')
           prefs = read_user_prefs(path)

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

@@ -3,24 +3,24 @@ module Selenium
     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
+        def before_navigate_to(url, driver) end
+        def after_navigate_to(url, driver) end
+        def before_navigate_back(driver) end
+        def after_navigate_back(driver) end
+        def before_navigate_forward(driver) end
+        def after_navigate_forward(driver) end
+        def before_find(by, what, driver) end
+        def after_find(by, what, driver) end
+        def before_click(element, driver) end
+        def after_click(element, driver) end
+        def before_change_value_of(element, driver) end
+        def after_change_value_of(element, driver) end
+        def before_execute_script(script, driver) end
+        def after_execute_script(script, driver) end
+        def before_quit(driver) end
+        def after_quit(driver) end
+        def before_close(driver) end
+        def after_close(driver) end
       end
 
     end

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

@@ -18,43 +18,43 @@ module Selenium
         end
 
         def get(url)
-          dispatch(:navigate_to, url) {
+          dispatch(:navigate_to, url, driver) {
             @delegate.get(url)
           }
         end
 
         def goForward
-          dispatch(:navigate_forward) {
+          dispatch(:navigate_forward, driver) {
             @delegate.goForward
           }
         end
 
         def goBack
-          dispatch(:navigate_back) {
+          dispatch(:navigate_back, driver) {
             @delegate.goBack
           }
         end
 
         def clickElement(ref)
-          dispatch(:click, create_element(ref)) {
+          dispatch(:click, create_element(ref), driver) {
             @delegate.clickElement(ref)
           }
         end
 
         def clearElement(ref)
-          dispatch(:change_value_of, create_element(ref)) {
+          dispatch(:change_value_of, create_element(ref), driver) {
             @delegate.clearElement(ref)
           }
         end
 
         def sendKeysToElement(ref, keys)
-          dispatch(:change_value_of, create_element(ref)) {
+          dispatch(:change_value_of, create_element(ref), driver) {
             @delegate.sendKeysToElement(ref, keys)
           }
         end
 
         def find_element_by(how, what, parent = nil)
-          e = dispatch(:find, how, what) {
+          e = dispatch(:find, how, what, driver) {
             @delegate.find_element_by how, what, parent
           }
 
@@ -62,7 +62,7 @@ module Selenium
         end
 
         def find_elements_by(how, what, parent = nil)
-          es = dispatch(:find, how, what) {
+          es = dispatch(:find, how, what, driver) {
             @delegate.find_elements_by(how, what, parent)
           }
 
@@ -70,17 +70,17 @@ module Selenium
         end
 
         def executeScript(script, *args)
-          dispatch(:execute_script, script) {
+          dispatch(:execute_script, script, driver) {
             @delegate.executeScript(script, *args)
           }
         end
 
         def quit
-          dispatch(:quit) { @delegate.quit }
+          dispatch(:quit, driver) { @delegate.quit }
         end
 
         def close
-          dispatch(:close) { @delegate.close }
+          dispatch(:close, driver) { @delegate.close }
         end
 
         private
@@ -90,6 +90,10 @@ module Selenium
           Element.new @delegate, ref
         end
 
+        def driver
+          @driver ||= Driver.new(self)
+        end
+
         def dispatch(name, *args, &blk)
           @listener.__send__("before_#{name}", *args)
           returned = yield

metadata

@@ -1,137 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: selenium-webdriver
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 2.3.0
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
 platform: ruby
-authors: 
+authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2170962760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2170962760
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &2170962280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: childprocess
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2170962280
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: &2170948800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.9
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2170948800
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: &2170948140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 0
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2170948140
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2170947540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2170947540
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2170946740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ci_reporter
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2170946740
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: &2170946220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
-  version_requirements: *id007
-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.
+  prerelease: false
+  version_requirements: *2170946220
+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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/selenium/client/base.rb
 - lib/selenium/client/driver.rb
 - lib/selenium/client/errors.rb
@@ -149,11 +113,13 @@ files:
 - lib/selenium/webdriver/android/bridge.rb
 - lib/selenium/webdriver/android.rb
 - lib/selenium/webdriver/chrome/bridge.rb
+- lib/selenium/webdriver/chrome/profile.rb
 - lib/selenium/webdriver/chrome/service.rb
 - lib/selenium/webdriver/chrome.rb
 - lib/selenium/webdriver/common/action_builder.rb
 - lib/selenium/webdriver/common/alert.rb
 - lib/selenium/webdriver/common/bridge_helper.rb
+- lib/selenium/webdriver/common/core_ext/base64.rb
 - lib/selenium/webdriver/common/core_ext/dir.rb
 - lib/selenium/webdriver/common/core_ext/string.rb
 - lib/selenium/webdriver/common/driver.rb
@@ -170,6 +136,7 @@ files:
 - lib/selenium/webdriver/common/options.rb
 - lib/selenium/webdriver/common/platform.rb
 - lib/selenium/webdriver/common/port_prober.rb
+- lib/selenium/webdriver/common/profile_helper.rb
 - lib/selenium/webdriver/common/proxy.rb
 - lib/selenium/webdriver/common/search_context.rb
 - lib/selenium/webdriver/common/socket_poller.rb
@@ -221,36 +188,26 @@ files:
 - README
 homepage: http://selenium.googlecode.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: The next generation developer focused tool for automated testing of webapps
 test_files: []
-