watir-webdriver 0.6.11 → 0.7.0

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

@@ -27,7 +27,6 @@ module Watir
     def locate
       e = by_id and return e # short-circuit if :id is given
 
-
       if @selector.size == 1
         element = find_first_by_one
       else
@@ -39,7 +38,7 @@ module Watir
       # It is also used to alter behavior of methods locating more than one type of element
       # (e.g. text_field locates both input and textarea)
       validate_element(element) if element
-    rescue Selenium::WebDriver::Error::NoSuchElementError, Selenium::WebDriver::Error::ObsoleteElementError
+    rescue Selenium::WebDriver::Error::NoSuchElementError, Selenium::WebDriver::Error::StaleElementReferenceError
       nil
     end
 
@@ -253,8 +252,6 @@ module Watir
       return if tag_name && !tag_name_matches?(element.tag_name.downcase, tag_name)
 
       element
-    rescue Selenium::WebDriver::Error::NoSuchElementError
-      nil
     end
 
     def all_elements
@@ -298,26 +295,30 @@ module Watir
     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}"
+      if selectors.empty?
+        css = '*'
+      else
+        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
-      end
 
-      href = selectors.delete(:href)
-      if href
-        css << %([href~="#{css_escape href}"])
-      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
+        selectors.each do |key, value|
+          key = key.to_s.gsub("_", "-")
+          css << %([#{key}="#{css_escape value}"]) # TODO: proper escaping
+        end
       end
 
       [:css, css]

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

@@ -65,15 +65,23 @@ module Watir
     end
 
     def by_id
-      el = super
-      el if el and not NON_TEXT_TYPES.include? el.attribute(:type)
+      element = super
+
+      if element && !NON_TEXT_TYPES.include?(element.attribute(:type))
+        check_deprecation(element)
+        element
+      end
     end
 
     def validate_element(element)
+      check_deprecation(element)
+      super
+    end
+
+    def check_deprecation(element)
       if element.tag_name.downcase == 'textarea'
         warn "Locating textareas with '#text_field' is deprecated. Please, use '#textarea' method instead."
       end
-      super
     end
 
   end # TextFieldLocator

data/lib/watir-webdriver/user_editable.rb

@@ -8,11 +8,8 @@ module Watir
     #
 
     def set(*args)
-      assert_exists
-      assert_writable
-
-      @element.clear
-      @element.send_keys(*args)
+      clear
+      element_call { @element.send_keys(*args) }
     end
     alias_method :value=, :set
 
@@ -23,10 +20,7 @@ module Watir
     #
 
     def append(*args)
-      assert_exists
-      assert_writable
-
-      @element.send_keys(*args)
+      send_keys(*args)
     end
     alias_method :<<, :append
 
@@ -36,7 +30,8 @@ module Watir
 
     def clear
       assert_exists
-      @element.clear
+      assert_writable
+      element_call { @element.clear }
     end
 
   end # UserEditable

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.6.11"
+  VERSION = '0.7.0'
 end

data/lib/watir-webdriver/wait.rb

@@ -29,22 +29,15 @@ module Watir
       # Waits until the block evaluates to true or times out.
       #
       # @example
-      #   Watir::Wait.until { browser.a(:id => "ajaxed").visible? }
+      #   Watir::Wait.until { browser.text_field(:name => "new_user_first_name").visible? }
       #
       # @param [Fixnum] timeout How long to wait in seconds
       # @param [String] message Message to raise if timeout is exceeded
       # @raise [TimeoutError] if timeout is exceeded
       #
 
-      def until(timeout = nil, message = nil, &block)
-        timeout ||= Watir.default_timeout
-
-        timer.wait(timeout) do
-          result = yield(self)
-          return result if result
-          sleep INTERVAL
-        end
-
+      def until(timeout = nil, message = nil)
+        run_with_timer(timeout) { return true if yield(self) }
         raise TimeoutError, message_for(timeout, message)
       end
 
@@ -52,21 +45,15 @@ module Watir
       # Wait while the block evaluates to true or times out.
       #
       # @example
-      #   Watir::Wait.while { browser.a(:id => "ajaxed").visible? }
+      #   Watir::Wait.while { browser.text_field(:name => "abrakadbra").present? }
       #
       # @param [Fixnum] timeout How long to wait in seconds
       # @param [String] message Message to raise if timeout is exceeded
       # @raise [TimeoutError] if timeout is exceeded
       #
 
-      def while(timeout = nil, message = nil, &block)
-        timeout ||= Watir.default_timeout
-
-        timer.wait(timeout) do
-          return unless yield(self)
-          sleep INTERVAL
-        end
-
+      def while(timeout = nil, message = nil)
+        run_with_timer(timeout) { return unless yield(self) }
         raise TimeoutError, message_for(timeout, message)
       end
 
@@ -79,6 +66,19 @@ module Watir
         err
       end
 
+      def run_with_timer(timeout = nil, &block)
+        timeout ||= Watir.default_timeout
+
+        if timeout == 0
+          block.call
+        else
+          timer.wait(timeout) do
+            block.call
+            sleep INTERVAL
+          end
+        end
+      end
+
     end # self
   end # Wait
 
@@ -134,9 +134,9 @@ module Watir
     # Waits until the element is present.
     #
     # @example
-    #   browser.button(:id => 'foo').when_present.click
-    #   browser.div(:id => 'bar').when_present { |div| ... }
-    #   browser.p(:id => 'baz').when_present(60).text
+    #   browser.text_field(:name => "new_user_first_name").when_present.click
+    #   browser.text_field(:name => "new_user_first_name").when_present { |field| field.set "Watir" }
+    #   browser.text_field(:name => "new_user_first_name").when_present(60).text
     #
     # @param [Fixnum] timeout seconds to wait before timing out
     #
@@ -160,7 +160,7 @@ module Watir
     # Waits until the element is present.
     #
     # @example
-    #   browser.button(:id => 'foo').wait_until_present
+    #   browser.text_field(:name => "new_user_first_name").wait_until_present
     #
     # @param [Fixnum] timeout seconds to wait before timing out
     #
@@ -178,9 +178,9 @@ module Watir
     # Waits while the element is present.
     #
     # @example
-    #   browser.button(:id => 'foo').wait_while_present
+    #   browser.text_field(:name => "abrakadbra").wait_while_present
     #
-    # @param [Integer] timeout seconds to wait before timing out
+    # @param [Fixnum] timeout seconds to wait before timing out
     #
     # @see Watir::Wait
     # @see Watir::Element#present?
@@ -190,7 +190,7 @@ module Watir
       timeout ||= Watir.default_timeout
       message = "waiting for #{selector_string} to disappear"
       Watir::Wait.while(timeout, message) { present? }
-    rescue Selenium::WebDriver::Error::ObsoleteElementError
+    rescue Selenium::WebDriver::Error::StaleElementReferenceError
       # it's not present
     end
 

data/lib/watir-webdriver/window.rb

@@ -3,11 +3,11 @@ module Watir
     include EventuallyPresent
 
     def initialize(driver, selector)
-      @driver   = driver
+      @driver = driver
       @selector = selector
 
       if selector.empty?
-        @handle = driver.window_handle
+        @handle = current_window
       elsif selector.has_key? :handle
         @handle = selector.delete :handle
       else
@@ -103,29 +103,21 @@ module Watir
     #
 
     def exists?
-      handle
+      assert_exists
       true
     rescue Exception::NoMatchingWindowFoundException
       false
     end
 
-    #
-    # Returns true if window is present.
-    #
-    # @return [Boolean]
-    #
-
-    def present?
-      @handle = nil # relocate
-
-      exists?
-    end
+    alias_method :present?, :exists?
+    alias_method :exist?, :exists?
 
     #
     # Returns true if two windows are equal.
     #
     # @example
-    #   browser.window(:index => 1) == browser.window(:index => 2)
+    #   browser.window(:index => 0) == browser.window(:index => 1)
+    #   #=> false
     #
     # @param [Window] other
     #
@@ -150,11 +142,11 @@ module Watir
     #
 
     def current?
-      @driver.window_handle == handle
+      current_window == handle
     end
 
     #
-    # CLoses window.
+    # Closes window.
     #
 
     def close
@@ -191,12 +183,13 @@ module Watir
     # Switches to given window and executes block, then switches back.
     #
     # @example
-    #   browser.window(:title => "2nd window").use do
-    #     browser.button(:id => "close").click
+    #   browser.window(:title => "closeable window").use do
+    #     browser.a(:id => "close").click
     #   end
     #
 
     def use(&blk)
+      assert_exists
       @driver.switch_to.window(handle, &blk)
       self
     end
@@ -209,18 +202,30 @@ module Watir
 
     private
 
+    # Referenced in EventuallyPresent
     def selector_string
       @selector.inspect
     end
 
     def locate
-      handle = if @selector.has_key?(:index)
-                  @driver.window_handles[Integer(@selector[:index])]
-                else
-                  @driver.window_handles.find { |wh| matches?(wh) }
-                end
+      if @selector.empty?
+        nil
+      elsif @selector.has_key?(:index)
+        @driver.window_handles[Integer(@selector[:index])]
+      else
+        @driver.window_handles.find { |wh| matches?(wh) }
+      end
+    end
+
+    def assert_exists
+      raise(Exception::NoMatchingWindowFoundException, @selector.inspect) unless @driver.window_handles.include?(handle)
+    end
 
-      handle or raise Exception::NoMatchingWindowFoundException, @selector.inspect
+    # return a handle to the currently active window if it is still open; otherwise nil
+    def current_window
+      @driver.window_handle
+    rescue Selenium::WebDriver::Error::NoSuchWindowError
+      nil
     end
 
     def matches?(handle)

data/spec/always_locate_spec.rb

@@ -0,0 +1,42 @@
+require File.expand_path('watirspec/spec_helper', File.dirname(__FILE__))
+
+describe 'Watir' do
+  describe '#always_locate?' do
+
+    before do
+      browser.goto WatirSpec.url_for('removed_element.html', :needs_server => true)
+    end
+
+    it 'determines whether #exist? returns false for stale element' do
+      element = browser.div(:id => "text")
+      expect(element.exists?).to be true
+
+      browser.refresh
+
+      expect(element.exists?).to be Watir.always_locate?
+    end
+
+    it 'allows using cached elements regardless of setting, when element is not stale' do
+      element = browser.div(:id => "text")
+      expect(element.exists?).to be true
+
+      # exception raised if element is re-looked up
+      allow(browser.driver).to receive(:find_element).with(:id, 'text') { raise }
+
+      expect { element.exists? }.to_not raise_error
+    end
+
+    it 'determines whether an exception is raised when taking an action on a stale element' do
+      element = browser.div(:id => "text")
+      expect(element.exists?).to be true
+
+      browser.refresh
+
+      if Watir.always_locate?
+        expect { element.text }.to_not raise_error
+      else
+        expect { element.text }.to raise_error
+      end
+    end
+  end
+end

data/spec/browser_spec.rb

@@ -70,7 +70,7 @@ describe Watir::Browser do
     b.goto WatirSpec.url_for "definition_lists.html"
     b.close
 
-    expect { b.dl(:id => "experience-list").id }.to raise_error(Error, "browser was closed")
+    expect { b.dl(:id => "experience-list").id }.to raise_error(Watir::Exception::Error, "browser was closed")
   end
 
   describe "#wait_while" do

data/spec/element_locator_spec.rb

@@ -368,7 +368,7 @@ describe Watir::ElementLocator do
         valid_attributes = Watir::Input.attributes
 
         expect { locate_one(bad_selector, valid_attributes) }.to \
-        raise_error(MissingWayOfFindingObjectException, "invalid attribute: :href")
+        raise_error(Watir::Exception::MissingWayOfFindingObjectException, "invalid attribute: :href")
       end
     end
   end
@@ -383,6 +383,18 @@ describe Watir::ElementLocator do
       end
     end
 
+    describe "with an empty selector" do
+      it "finds all when an empty selctor is given" do
+        if Watir.prefer_css?
+          expect_all :css, '*'
+        else
+          expect_all :xpath, './/*'
+        end
+
+        locate_all({})
+      end
+    end
+
     describe "with selectors not supported by webdriver" do
       it "handles selector with tag name and a single attribute" do
         if Watir.prefer_css?