watir-webdriver 0.5.3 → 0.5.4

data/.travis.yml

@@ -10,7 +10,7 @@ before_script:
 env:
   - WATIR_WEBDRIVER_BROWSER=firefox
   - WATIR_WEBDRIVER_BROWSER=firefox ALWAYS_LOCATE=false
-  # - WATIR_WEBDRIVER_BROWSER=firefox NATIVE_EVENTS=true
+  - WATIR_WEBDRIVER_BROWSER=firefox PREFER_CSS=1 SELECTOR_STATS=1
   - WATIR_WEBDRIVER_BROWSER=chrome
   - WATIR_WEBDRIVER_BROWSER=chrome ALWAYS_LOCATE=false
-  # - WATIR_WEBDRIVER_BROWSER=chrome NATIVE_EVENTS=true
+  - WATIR_WEBDRIVER_BROWSER=chrome PREFER_CSS=1 SELECTOR_STATS=1

data/lib/watir-webdriver.rb

@@ -34,6 +34,19 @@ module Watir
       @always_locate = bool
     end
 
+    def prefer_css?
+      @prefer_css
+    end
+
+    #
+    # Whether or not Watir should prefer CSS when translating the Watir selectors to WebDriver.
+    # Defaults to false.
+    #
+
+    def prefer_css=(bool)
+      @prefer_css = bool
+    end
+
     #
     # @api private
     #

data/lib/watir-webdriver/browser.rb

@@ -161,7 +161,7 @@ module Watir
 
     def assert_exists
       if @closed
-        raise Error, "browser was closed"
+        raise Exception::Error, "browser was closed"
       else
         driver.switch_to.default_content
         true

data/lib/watir-webdriver/cookies.rb

@@ -28,9 +28,9 @@ module Watir
 
     private
 
-    def to_time(dt)
-      if dt.respond_to?(:to_time)
-        dt.to_time
+    def to_time(t)
+      if t.respond_to?(:to_time)
+        t.to_time
       else
         Time.local t.year, t.month, t.day, t.hour, t.min, t.sec
       end

data/lib/watir-webdriver/elements/frame.rb

@@ -42,16 +42,6 @@ module Watir
       browser.execute_script(*args)
     end
 
-    def element_by_xpath(*args)
-      assert_exists
-      super
-    end
-
-    def elements_by_xpath(*args)
-      assert_exists
-      super
-    end
-
     private
 
     def locate_iframe

data/lib/watir-webdriver/elements/select.rb

@@ -206,7 +206,7 @@ module Watir
 
     def safe_text(element)
       element.text
-    rescue Selenium::WebDriver::Error::ObsoleteElementError
+    rescue Selenium::WebDriver::Error::ObsoleteElementError, Selenium::WebDriver::Error::UnhandledAlertError
       # guard for scenario where selecting the element changes the page, making our element obsolete
 
       ''

data/lib/watir-webdriver/locators/button_locator.rb

@@ -16,7 +16,7 @@ module Watir
       super
     end
 
-    def build_xpath(selectors)
+    def build_wd_selector(selectors)
       return if selectors.values.any? { |e| e.kind_of? Regexp }
 
       selectors.delete(:tag_name) || raise("internal error: no tag_name?!")
@@ -33,9 +33,9 @@ module Watir
       xpath << " | .//input"
       xpath << "[#{input_attr_exp}]"
 
-      p :build_xpath => xpath if $DEBUG
+      p :build_wd_selector => xpath if $DEBUG
 
-      xpath
+      [:xpath, xpath]
     end
 
     def lhs_for(key)

data/lib/watir-webdriver/locators/child_cell_locator.rb

@@ -11,7 +11,7 @@ module Watir
       nil
     end
 
-    def build_xpath(selectors)
+    def build_wd_selector(selectors)
       return if selectors.values.any? { |e| e.kind_of? Regexp }
 
       expressions = %w[./th ./td]
@@ -23,9 +23,9 @@ module Watir
 
       xpath = expressions.join(" | ")
 
-      p :build_xpath => xpath if $DEBUG
+      p :build_wd_selector => xpath if $DEBUG
 
-      xpath
+      [:xpath, xpath]
     end
 
   end # ChildCellLocator

data/lib/watir-webdriver/locators/child_row_locator.rb

@@ -11,7 +11,7 @@ module Watir
       nil # avoid this
     end
 
-    def build_xpath(selectors)
+    def build_wd_selector(selectors)
       return if selectors.values.any? { |e| e.kind_of? Regexp }
       selectors.delete(:tag_name) || raise("internal error: no tag_name?!")
 
@@ -28,9 +28,9 @@ module Watir
 
       xpath = expressions.join(" | ")
 
-      p :build_xpath => xpath if $DEBUG
+      p :build_wd_selector => xpath if $DEBUG
 
-      xpath
+      [:xpath, xpath]
     end
 
   end # ChildRowLocator

data/lib/watir-webdriver/locators/element_locator.rb

@@ -10,7 +10,7 @@ module Watir
       :id,
       :link,
       :link_text,
-      :name,
+      # :name,     # deliberately excluded to be watirspec compliant
       :partial_link_text,
       :tag_name,
       :xpath
@@ -75,14 +75,14 @@ module Watir
       selector = normalized_selector
 
       idx   = selector.delete(:index)
-      xpath = given_xpath(selector) || build_xpath(selector)
+      how, what = given_xpath(selector) || build_wd_selector(selector)
 
-      if xpath
+      if how
         # could build xpath for selector
         if idx
-          @wd.find_elements(:xpath, xpath)[idx]
+          @wd.find_elements(how, what)[idx]
         else
-          @wd.find_element(:xpath, xpath)
+          @wd.find_element(how, what)
         end
       else
         # can't use xpath, probably a regexp in there
@@ -101,9 +101,9 @@ module Watir
         raise ArgumentError, "can't locate all elements by :index"
       end
 
-      xpath = given_xpath(selector) || build_xpath(selector)
-      if xpath
-        @wd.find_elements(:xpath, xpath)
+      how, what = given_xpath(selector) || build_wd_selector(selector)
+      if how
+        @wd.find_elements(how, what)
       else
         wd_find_by_regexp_selector(selector, :select)
       end
@@ -132,9 +132,13 @@ module Watir
         selector[:id] = id_from_label(rx_selector.delete(:label)) || return
       end
 
-      xpath = build_xpath(selector) || raise("internal error: unable to build xpath from #{selector.inspect}")
+      how, what = build_wd_selector(selector)
+
+      unless how
+        raise Error, "internal error: unable to build WebDriver selector from #{selector.inspect}"
+      end
 
-      elements = @wd.find_elements(:xpath, xpath)
+      elements = @wd.find_elements(how, what)
       elements.__send__(method) { |el| matches_selector?(el, rx_selector) }
     end
 
@@ -264,13 +268,17 @@ module Watir
       @selector[:tag_name] != "option"
     end
 
-    def build_xpath(selectors)
-      return if selectors.values.any? { |e| e.kind_of? Regexp }
+    def build_wd_selector(selectors)
+      unless selectors.values.any? { |e| e.kind_of? Regexp }
+        build_css(selectors) || build_xpath(selectors)
+      end
+    end
 
+    def build_xpath(selectors)
       xpath = ".//"
       xpath << (selectors.delete(:tag_name) || '*').to_s
 
-      idx = selectors.delete(:index)
+      idx = selectors.delete :index
 
       # the remaining entries should be attributes
       unless selectors.empty?
@@ -283,7 +291,49 @@ module Watir
 
       p :xpath => xpath, :selectors => selectors if $DEBUG
 
-      xpath
+      [:xpath, xpath]
+    end
+
+    def build_css(selectors)
+      return unless use_css?(selectors)
+
+      css = ''
+      css << (selectors.delete(:tag_name) || '')
+
+      klass = selectors.delete(:class)
+      if klass
+        if klass.include? ' '
+          css << %([class="#{css_escape klass}"])
+        else
+          css << ".#{klass}"
+        end
+      end
+
+      href = selectors.delete(:href)
+      if href
+        css << %([href~="#{css_escape href}"])
+      end
+
+      selectors.each do |key, value|
+        key = key.to_s.gsub("_", "-")
+        css << %([#{key}="#{css_escape value}"]) # TODO: proper escaping
+      end
+
+      [:css, css]
+    end
+
+    def use_css?(selectors)
+      return false unless Watir.prefer_css?
+
+      if selectors.has_key?(:text) || selectors.has_key?(:label) || selectors.has_key?(:index)
+        return false
+      end
+
+      if selectors.has_key?(:class) && selectors[:class] !~ /^[\w-]+$/ui
+        return false
+      end
+
+      true
     end
 
     def attribute_expression(selectors)
@@ -296,6 +346,10 @@ module Watir
       end.join(" and ")
     end
 
+    def css_escape(str)
+      str.gsub('"', '\\"')
+    end
+
     def equal_pair(key, value)
       if key == :class
         klass = XpathSupport.escape " #{value} "
@@ -340,7 +394,7 @@ module Watir
         raise ArgumentError, ":xpath cannot be combined with other selectors (#{selector.inspect})"
       end
 
-      xpath
+      [:xpath, xpath]
     end
 
     def can_be_combined_with_xpath?(selector)

data/lib/watir-webdriver/locators/text_field_locator.rb

@@ -11,7 +11,7 @@ module Watir
 
     private
 
-    def build_xpath(selectors)
+    def build_wd_selector(selectors)
       return if selectors.values.any? { |e| e.kind_of? Regexp }
 
       selectors.delete(:tag_name)
@@ -28,9 +28,9 @@ module Watir
       xpath << "| .//textarea"
       xpath << "[#{textarea_attr_exp}]" unless textarea_attr_exp.empty?
 
-      p :build_xpath => xpath if $DEBUG
+      p :build_wd_selector => xpath if $DEBUG
 
-      xpath
+      [:xpath, xpath]
     end
 
     def lhs_for(key)

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/spec/element_locator_spec.rb

@@ -15,24 +15,42 @@ describe Watir::ElementLocator do
 
     describe "with selectors not supported by webdriver" do
       it "handles selector with tag name and a single attribute" do
-        expect_one :xpath, ".//div[@title='foo']"
+        if Watir.prefer_css?
+          expect_one :css, 'div[title="foo"]'
+        else
+          expect_one :xpath, ".//div[@title='foo']"
+        end
 
         locate_one :tag_name => "div",
                    :title    => "foo"
       end
 
       it "handles selector with no tag name and and a single attribute" do
-        expect_one :xpath, ".//*[@title='foo']"
+        if Watir.prefer_css?
+          expect_one :css, '[title="foo"]'
+        else
+          expect_one :xpath, ".//*[@title='foo']"
+        end
+
         locate_one :title => "foo"
       end
 
       it "handles single quotes in the attribute string" do
-        expect_one :xpath, %{.//*[@title=concat('foo and ',"'",'bar',"'",'')]}
+        if Watir.prefer_css?
+          expect_one :css, %{[title="foo and 'bar'"]}
+        else
+          expect_one :xpath, %{.//*[@title=concat('foo and ',"'",'bar',"'",'')]}
+        end
+
         locate_one :title => "foo and 'bar'"
       end
 
       it "handles selector with tag name and multiple attributes" do
-        expect_one :xpath, ".//div[@title='foo' and @dir='bar']"
+        if Watir.prefer_css?
+          expect_one :css, 'div[title="foo"][dir="bar"]'
+        else
+          expect_one :xpath, ".//div[@title='foo' and @dir='bar']"
+        end
 
         locate_one [:tag_name, "div",
                     :title   , "foo",
@@ -40,7 +58,11 @@ describe Watir::ElementLocator do
       end
 
       it "handles selector with no tag name and multiple attributes" do
-        expect_one :xpath, ".//*[@dir='foo' and @title='bar']"
+        if Watir.prefer_css?
+          expect_one :css, '[dir="foo"][title="bar"]'
+        else
+          expect_one :xpath, ".//*[@dir='foo' and @title='bar']"
+        end
 
         locate_one [:dir,   "foo",
                     :title, "bar"]
@@ -63,21 +85,33 @@ describe Watir::ElementLocator do
       end
 
       it "translates :class_name to :class" do
-        expect_one :xpath, ".//div[contains(concat(' ', @class, ' '), ' foo ')]"
+        if Watir.prefer_css?
+          expect_one :css, "div.foo"
+        else
+          expect_one :xpath, ".//div[contains(concat(' ', @class, ' '), ' foo ')]"
+        end
 
         locate_one :tag_name   => "div",
                    :class_name => "foo"
       end
 
       it "handles data-* attributes" do
-        expect_one :xpath, ".//div[@data-name='foo']"
+        if Watir.prefer_css?
+          expect_one :css, 'div[data-name="foo"]'
+        else
+          expect_one :xpath, ".//div[@data-name='foo']"
+        end
 
         locate_one :tag_name  => "div",
                    :data_name => "foo"
       end
 
       it "normalizes space for the :href attribute" do
-        expect_one :xpath, ".//a[normalize-space(@href)='foo']"
+        if Watir.prefer_css?
+          expect_one :css, 'a[href~="foo"]'
+        else
+          expect_one :xpath, ".//a[normalize-space(@href)='foo']"
+        end
 
         selector = {
           :tag_name => "a",
@@ -107,7 +141,11 @@ describe Watir::ElementLocator do
       end
 
       it "translates ruby attribute names to content attribute names" do
-        expect_one :xpath, ".//meta[@http-equiv='foo']"
+        if Watir.prefer_css?
+          expect_one :css, 'meta[http-equiv="foo"]'
+        else
+          expect_one :xpath, ".//meta[@http-equiv='foo']"
+        end
 
         selector = {
           :tag_name   => "meta",
@@ -127,7 +165,12 @@ describe Watir::ElementLocator do
           element(:tag_name => "div", :attributes => { :class => "foob"})
         ]
 
-        expect_all(:xpath, ".//div").and_return(elements)
+        if Watir.prefer_css?
+          expect_all(:css, "div").and_return(elements)
+        else
+          expect_all(:xpath, ".//div").and_return(elements)
+        end
+
         locate_one(:tag_name => "div", :class => /oob/).should == elements[1]
       end
 
@@ -137,7 +180,11 @@ describe Watir::ElementLocator do
           element(:tag_name => "div", :attributes => { :class => "foo" })
         ]
 
-        expect_all(:xpath, ".//div").and_return(elements)
+        if Watir.prefer_css?
+          expect_all(:css, "div").and_return(elements)
+        else
+          expect_all(:xpath, ".//div").and_return(elements)
+        end
 
         selector = {
           :tag_name => "div",
@@ -154,7 +201,12 @@ describe Watir::ElementLocator do
           element(:tag_name => "div", :attributes => { :dir => "foo", :title => "baz" })
         ]
 
-        expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
+        if Watir.prefer_css?
+          expect_all(:css, 'div[dir="foo"]').and_return(elements)
+        else
+          expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
+        end
+
 
         selector = {
           :tag_name => "div",
@@ -173,7 +225,12 @@ describe Watir::ElementLocator do
         div_elements = [element(:tag_name => "div")]
 
         expect_all(:tag_name, "label").ordered.and_return(label_elements)
-        expect_all(:xpath, ".//div[@id='baz']").ordered.and_return(div_elements)
+
+        if Watir.prefer_css?
+          expect_all(:css, 'div[id="baz"]').ordered.and_return(div_elements)
+        else
+          expect_all(:xpath, ".//div[@id='baz']").ordered.and_return(div_elements)
+        end
 
         locate_one(:tag_name => "div", :label => /oob/).should == div_elements.first
       end
@@ -192,7 +249,11 @@ describe Watir::ElementLocator do
         element(:tag_name => "div")
       ]
 
-      expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
+      if Watir.prefer_css?
+        expect_all(:css, 'div[dir="foo"]').and_return(elements)
+      else
+        expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
+      end
 
       selector = {
         :tag_name => "div",
@@ -250,14 +311,22 @@ describe Watir::ElementLocator do
 
     describe "with selectors not supported by webdriver" do
       it "handles selector with tag name and a single attribute" do
-        expect_all :xpath, ".//div[@dir='foo']"
+        if Watir.prefer_css?
+          expect_all :css, 'div[dir="foo"]'
+        else
+          expect_all :xpath, ".//div[@dir='foo']"
+        end
 
         locate_all :tag_name => "div",
                    :dir      => "foo"
       end
 
       it "handles selector with tag name and multiple attributes" do
-        expect_all :xpath, ".//div[@dir='foo' and @title='bar']"
+        if Watir.prefer_css?
+          expect_all :css, 'div[dir="foo"][title="bar"]'
+        else
+          expect_all :xpath, ".//div[@dir='foo' and @title='bar']"
+        end
 
         locate_all [:tag_name, "div",
                     :dir     , "foo",
@@ -274,7 +343,13 @@ describe Watir::ElementLocator do
           element(:tag_name => "div", :attributes => { :class => "noob"})
         ]
 
-        expect_all(:xpath, ".//div").and_return(elements)
+        if Watir.prefer_css?
+          expect_all(:css, "div").and_return(elements)
+        else
+          expect_all(:xpath, ".//div").and_return(elements)
+        end
+
+
         locate_all(:tag_name => "div", :class => /oob/).should == elements.last(3)
       end
 
@@ -285,7 +360,11 @@ describe Watir::ElementLocator do
           element(:tag_name => "div", :attributes => { :dir => "foo", :title => "bazt"})
         ]
 
-        expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
+        if Watir.prefer_css?
+          expect_all(:css, 'div[dir="foo"]').and_return(elements)
+        else
+          expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
+        end
 
         selector = {
           :tag_name => "div",

data/spec/element_spec.rb

@@ -44,7 +44,10 @@ describe Watir::Element do
   end
 
   describe "#hover" do
-    not_compliant_on [:webdriver, :firefox, :synthesized_events], [:webdriver, :ie] do
+    not_compliant_on [:webdriver, :firefox, :synthesized_events],
+                     [:webdriver, :ie],
+                     [:webdriver, :iphone],
+                     [:webdriver, :safari] do
       it "should hover over the element" do
         browser.goto WatirSpec.url_for('hover.html', :needs_server => true)
         link = browser.a

data/spec/implementation.rb

@@ -11,7 +11,7 @@ class ImplementationConfig
     set_guard_proc
     add_html_routes
 
-    WatirSpec.always_use_server = mobile? || ie?
+    WatirSpec.always_use_server = mobile? || ie? || safari?
   end
 
   private
@@ -22,14 +22,22 @@ class ImplementationConfig
   end
 
   def set_browser_args
-    case browser
-    when :firefox
-      set_firefox_args
-    when :chrome
-      set_chrome_args
-    else
-      @imp.browser_args = [browser]
+    args = case browser
+           when :firefox
+             firefox_args
+           when :chrome
+             chrome_args
+           else
+             [browser, {}]
+           end
+
+    if ENV['SELECTOR_STATS']
+      listener = SelectorListener.new
+      args.last.merge!(:listener => listener)
+      at_exit { listener.report }
     end
+
+    @imp.browser_args = args
   end
 
   def mobile?
@@ -40,6 +48,10 @@ class ImplementationConfig
     [:ie, :internet_explorer].include? browser
   end
 
+  def safari?
+    browser == :safari
+  end
+
   def set_guard_proc
     matching_guards = [
       :webdriver,            # guard only applies to webdriver
@@ -60,14 +72,14 @@ class ImplementationConfig
     }
   end
 
-  def set_firefox_args
+  def firefox_args
     profile = Selenium::WebDriver::Firefox::Profile.new
     profile.native_events = native_events?
 
-    @imp.browser_args = [:firefox, {:profile => profile}]
+    [:firefox, {:profile => profile}]
   end
 
-  def set_chrome_args
+  def chrome_args
     opts = {
       :switches      => ["--disable-translate"],
       :native_events => native_events?
@@ -85,7 +97,7 @@ class ImplementationConfig
       Selenium::WebDriver::Chrome.path = path
     end
 
-    @imp.browser_args = [:chrome, opts]
+    [:chrome, opts]
   end
 
   def add_html_routes
@@ -106,6 +118,25 @@ class ImplementationConfig
   def native_events_by_default?
     Selenium::WebDriver::Platform.windows? && [:firefox, :ie].include?(browser)
   end
+
+  class SelectorListener < Selenium::WebDriver::Support::AbstractEventListener
+    def initialize
+      @counts = Hash.new(0)
+    end
+
+    def before_find(how, what, driver)
+      @counts[how] += 1
+    end
+
+    def report
+      total = @counts.values.inject(0) { |mem, var| mem + var }
+      puts "\nWebDriver selector stats: "
+      @counts.each do |how, count|
+        puts "\t#{how.to_s.ljust(20)}: #{count * 100 / total} (#{count})"
+      end
+    end
+
+  end
 end
 
 ImplementationConfig.new(WatirSpec.implementation).configure

data/spec/spec_helper.rb

@@ -21,7 +21,11 @@ if ENV['ALWAYS_LOCATE'] == "false"
   Watir.always_locate = false
 end
 
-WEBDRIVER_SELECTORS = [:class, :class_name, :css, :id, :name, :tag_name, :xpath]
+if ENV['PREFER_CSS']
+  Watir.prefer_css = true
+end
+
+WEBDRIVER_SELECTORS = [:class, :class_name, :css, :id, :tag_name, :xpath]
 
 if ENV['TRAVIS']
   ENV['DISPLAY'] = ":99.0"

data/spec/wait_spec.rb

@@ -1,118 +1,118 @@
 require File.expand_path("watirspec/spec_helper", File.dirname(__FILE__))
 
-describe Watir::Wait do
-  describe "#until" do
-    it "waits until the block returns true" do
-      Wait.until(0.5) { true }.should be_true
+not_compliant_on [:webdriver, :safari] do
+  describe Watir::Wait do
+    describe "#until" do
+      it "waits until the block returns true" do
+        Wait.until(0.5) { true }.should be_true
+      end
+
+      it "times out" do
+        lambda do
+          Wait.until(0.5) { false }
+        end.should raise_error(Watir::Wait::TimeoutError)
+      end
+
+      it "times out with a custom message" do
+        lambda do
+          Wait.until(0.5, "oops") { false }
+        end.should raise_error(Watir::Wait::TimeoutError, "timed out after 0.5 seconds, oops")
+      end
     end
 
-    it "times out" do
-      lambda do
-        Wait.until(0.5) { false }
-      end.should raise_error(Watir::Wait::TimeoutError)
-    end
-
-    it "times out with a custom message" do
-      lambda do
-        Wait.until(0.5, "oops") { false }
-      end.should raise_error(Watir::Wait::TimeoutError, "timed out after 0.5 seconds, oops")
-    end
-  end
-
-  describe "#while" do
-    it "waits while the block returns true" do
-      Wait.while(0.5) { false }.should == nil
-    end
-
-    it "times out" do
-      lambda do
-        Wait.while(0.5) { true }
-      end.should raise_error(Watir::Wait::TimeoutError)
-    end
-
-    it "times out with a custom message" do
-      lambda do
-        Wait.while(0.5, "oops") { true }
-      end.should raise_error(Watir::Wait::TimeoutError, "timed out after 0.5 seconds, oops")
-    end
-  end
-end
-
-describe Watir::Element do
-
-  before do
-    browser.goto WatirSpec.url_for("wait.html", :needs_server => true)
-  end
-
-  describe "#when_present" do
-    it "yields when the element becomes present" do
-      called = false
-
-      browser.a(:id, 'show_bar').click
-      browser.div(:id, 'bar').when_present(1) { called = true }
-
-      called.should be_true
-    end
-
-    it "invokes subsequent method calls when the element becomes present" do
-      browser.a(:id, 'show_bar').click
-
-      bar = browser.div(:id, 'bar')
-      bar.when_present(1).click
-      bar.text.should == "changed"
-    end
-
-    it "times out when given a block" do
-      lambda {
-        browser.div(:id, 'bar').when_present(1) {}
-      }.should raise_error(Watir::Wait::TimeoutError)
-    end
-
-    it "times out when not given a block" do
-      lambda {
-        browser.div(:id, 'bar').when_present(1).click
-      }.should raise_error(Watir::Wait::TimeoutError,
-        /^timed out after 1 seconds, waiting for (\{:id=>"bar", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"bar"\}) to become present$/
-      )
-    end
-
-    it "responds to Element methods" do
-      decorator = browser.div.when_present
-
-      decorator.should respond_to(:exist?)
-      decorator.should respond_to(:present?)
-      decorator.should respond_to(:click)
+    describe "#while" do
+      it "waits while the block returns true" do
+        Wait.while(0.5) { false }.should == nil
+      end
+
+      it "times out" do
+        lambda do
+          Wait.while(0.5) { true }
+        end.should raise_error(Watir::Wait::TimeoutError)
+      end
+
+      it "times out with a custom message" do
+        lambda do
+          Wait.while(0.5, "oops") { true }
+        end.should raise_error(Watir::Wait::TimeoutError, "timed out after 0.5 seconds, oops")
+      end
     end
   end
 
-  describe "#wait_until_present" do
-    it "it waits until the element appears" do
-      browser.a(:id, 'show_bar').click
-      browser.div(:id, 'bar').wait_until_present(5)
+  describe Watir::Element do
+    before do
+      browser.goto WatirSpec.url_for("wait.html", :needs_server => true)
     end
 
-    it "times out if the element doesn't appear" do
-      lambda do
-        browser.div(:id, 'bar').wait_until_present(1)
-      end.should raise_error(Watir::Wait::TimeoutError,
-        /^timed out after 1 seconds, waiting for (\{:id=>"bar", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"bar"\}) to become present$/
-      )
+    describe "#when_present" do
+      it "yields when the element becomes present" do
+        called = false
+
+        browser.a(:id, 'show_bar').click
+        browser.div(:id, 'bar').when_present(1) { called = true }
+
+        called.should be_true
+      end
+
+      it "invokes subsequent method calls when the element becomes present" do
+        browser.a(:id, 'show_bar').click
+
+        bar = browser.div(:id, 'bar')
+        bar.when_present(1).click
+        bar.text.should == "changed"
+      end
+
+      it "times out when given a block" do
+        lambda {
+          browser.div(:id, 'bar').when_present(1) {}
+        }.should raise_error(Watir::Wait::TimeoutError)
+      end
+
+      it "times out when not given a block" do
+        lambda {
+          browser.div(:id, 'bar').when_present(1).click
+        }.should raise_error(Watir::Wait::TimeoutError,
+          /^timed out after 1 seconds, waiting for (\{:id=>"bar", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"bar"\}) to become present$/
+        )
+      end
+
+      it "responds to Element methods" do
+        decorator = browser.div.when_present
+
+        decorator.should respond_to(:exist?)
+        decorator.should respond_to(:present?)
+        decorator.should respond_to(:click)
+      end
     end
-  end
 
-  describe "#wait_while_present" do
-    it "waits until the element disappears" do
-      browser.a(:id, 'hide_foo').click
-      browser.div(:id, 'foo').wait_while_present(1)
+    describe "#wait_until_present" do
+      it "it waits until the element appears" do
+        browser.a(:id, 'show_bar').click
+        browser.div(:id, 'bar').wait_until_present(5)
+      end
+
+      it "times out if the element doesn't appear" do
+        lambda do
+          browser.div(:id, 'bar').wait_until_present(1)
+        end.should raise_error(Watir::Wait::TimeoutError,
+          /^timed out after 1 seconds, waiting for (\{:id=>"bar", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"bar"\}) to become present$/
+        )
+      end
     end
 
-    it "times out" do
-      lambda do
+    describe "#wait_while_present" do
+      it "waits until the element disappears" do
+        browser.a(:id, 'hide_foo').click
         browser.div(:id, 'foo').wait_while_present(1)
-      end.should raise_error(Watir::Wait::TimeoutError,
-        /^timed out after 1 seconds, waiting for (\{:id=>"foo", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"foo"\}) to disappear$/
-      )
+      end
+
+      it "times out" do
+        lambda do
+          browser.div(:id, 'foo').wait_while_present(1)
+        end.should raise_error(Watir::Wait::TimeoutError,
+          /^timed out after 1 seconds, waiting for (\{:id=>"foo", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"foo"\}) to disappear$/
+        )
+      end
     end
   end
-
 end

data/support/travis.sh

@@ -1,6 +1,6 @@
 #/bin/sh
 
-CHROME_REVISION=119695
+CHROME_REVISION=127410
 sh -e /etc/init.d/xvfb start && git submodule update --init || exit 1
 
 if [[ "$WATIR_WEBDRIVER_BROWSER" = "chrome" ]]; then

data/watir-webdriver.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "selenium-webdriver", '>= 2.12.0'
+  s.add_dependency "selenium-webdriver", '>= 2.18.0'
 
   s.add_development_dependency "rspec", "~> 2.6"
   s.add_development_dependency "yard", "~> 0.7.4"

metadata

@@ -1,172 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: watir-webdriver
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.5.4
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 3
-  version: 0.5.3
 platform: ruby
-authors: 
+authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 2
-        - 12
-        - 0
-        version: 2.12.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.18.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.18.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 7
-        - 4
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.7.4
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webidl
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+- !ruby/object:Gem::Dependency
+  name: webidl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.3
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fuubar
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 0
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.0.6
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.5
 description: WebDriver-backed Watir
-email: 
+email:
 - jari.bakken@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .gitmodules
@@ -257,55 +252,38 @@ files:
 - watir-webdriver.gemspec
 homepage: http://github.com/watir/watir-webdriver
 licenses: []
-
-post_install_message: |+
-  Please note that watir-webdriver 0.5.0 brings some backwards incompatible changes:
-  
-    * Watir::Select#selected_options no longer returns Array<String>, but Array<Watir::Option>
-        [ https://github.com/watir/watir-webdriver/issues/21 ]
-    * Finding elements by :class now matches partial class attributes.
-        [ https://github.com/watir/watir-webdriver/issues/36 ]
-  
-  Additionally, watir-webdriver 0.5.1 removes the following deprecated methods:
-  
-    * element_by_xpath  : replaced by .element(:xpath, '...')
-    * elements_by_xpath : replaced by .elements(:xpath, '...')
-  
-  And deprecates the following methods:
-  
-   * Browser#clear_cookies - replaced by Browser#cookies API
-     [ https://github.com/watir/watir-webdriver/issues/24 ]
-  
+post_install_message: ! "Please note that watir-webdriver 0.5.0 brings some backwards
+  incompatible changes:\n\n  * Watir::Select#selected_options no longer returns Array<String>,
+  but Array<Watir::Option>\n      [ https://github.com/watir/watir-webdriver/issues/21
+  ]\n  * Finding elements by :class now matches partial class attributes.\n      [
+  https://github.com/watir/watir-webdriver/issues/36 ]\n\nAdditionally, watir-webdriver
+  0.5.1 removes the following deprecated methods:\n\n  * element_by_xpath  : replaced
+  by .element(:xpath, '...')\n  * elements_by_xpath : replaced by .elements(:xpath,
+  '...')\n\nAnd deprecates the following methods:\n\n * Browser#clear_cookies - replaced
+  by Browser#cookies API\n   [ https://github.com/watir/watir-webdriver/issues/24
+  ]\n\n"
 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: watir-webdriver
-rubygems_version: 1.8.15
+rubygems_version: 1.8.20
 signing_key: 
 specification_version: 3
 summary: Watir on WebDriver
-test_files: 
+test_files:
 - spec/alert_spec.rb
 - spec/browser_spec.rb
 - spec/click_spec.rb