watir 6.0.0.beta4 → 6.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b089bcf4e58208a441dedb2d2404b8e20e2967
-  data.tar.gz: 1994d0b6cc7f8c5c763da8558447f73bade0d3b9
+  metadata.gz: 935a787298648718688deca84d844924d69dc5b0
+  data.tar.gz: d6e4f016435c83c21ab6045eac35365c2fb0b370
 SHA512:
-  metadata.gz: 4cdae8a09deebfaab7adb7cf413d5f3a4043485d716fa52c87deadf00d6c4d46e8644d9e16c1b1c285abdc4e6f5fe3104f10ace01264b897332835169d0003d7
-  data.tar.gz: b220f0b235362602d735a17967c8e87859f864a65df54145ff87ed1a08ed4b650a07908e64513f2adaf558f1d5713dd2d35cd9e84b0e4b66b4e5edf65e2d8239
+  metadata.gz: 7e215494da9556e98fe9542a042ff80a64bedbef8071bc920a9653806b629e4876a0708f0b06cb318f69b8cdbc16855dc0704b630df0de83fac3b36225f406a5
+  data.tar.gz: 4b77b7a781336fc2534b5a91051e1b66e590eabdc85162dd8ee6aebf4ba1cecb79d29a766d284d0bc849b42b82e025c51e627b543d59981a0756f5e0c31d8065

data/CHANGES.md

@@ -1,3 +1,9 @@
+### 6.0.0.beta5 (2016-09-25)
+
+* Elements in collections can now be relocated after going stale
+* Added visible locator to filter out matching elements that are hidden 
+* Element not found error messages now include selector information from parent elements
+
 ### 6.0.0.beta4 (2016-09-12)
 
 * Deprecate Watir#prefer_css setting

data/lib/watir/browser.rb

@@ -311,11 +311,6 @@ module Watir
         true
       end
     end
-    alias_method :ensure_not_stale, :assert_exists
-
-    def reset!
-      # no-op
-    end
 
     def browser
       self

data/lib/watir/element_collection.rb

@@ -81,7 +81,9 @@ module Watir
 
     def to_a
       # TODO: optimize - lazy element_class instance?
-      @to_a ||= elements.map { |e| element_class.new(@query_scope, element: e) }
+      @to_a ||= elements.map.with_index do |e, idx|
+        element_class.new(@query_scope, @selector.merge(element: e, index: idx))
+      end
     end
 
     private

data/lib/watir/elements/element.rb

@@ -24,12 +24,13 @@ module Watir
 
     def initialize(query_scope, selector)
       @query_scope = query_scope
-      @selector = selector
-      @element = nil
 
-      unless @selector.kind_of? Hash
+      unless selector.kind_of? Hash
         raise ArgumentError, "invalid argument: #{selector.inspect}"
       end
+
+      @element = selector.delete(:element)
+      @selector = selector
     end
 
     #
@@ -47,7 +48,7 @@ module Watir
     alias_method :exist?, :exists?
 
     def inspect
-      if @selector.key?(:element)
+      if @selector.empty?
         '#<%s:0x%x located=%s selector=%s>' % [self.class, hash*2, !!@element, '{element: (selenium element)}']
       else
         '#<%s:0x%x located=%s selector=%s>' % [self.class, hash*2, !!@element, selector_string]
@@ -513,10 +514,11 @@ module Watir
 
     # Ensure that the element exists, making sure that it is not stale and located if necessary
     def assert_exists
-      @element ||= @selector[:element]
-
-      if @element
-        ensure_not_stale # ensure not stale
+      if @element && @selector.empty?
+        ensure_context
+        @element = nil if stale?
+      elsif @element && !stale?
+        return
       else
         @element = locate
       end
@@ -524,27 +526,14 @@ module Watir
       assert_element_found
     end
 
-    # Ensure that the element isn't stale, by relocating if it is
-    def ensure_not_stale
-      ensure_context
-
-      # Performance shortcut; only need recursive call to ensure context if stale in current context
-      return unless stale?
-      @element = @selector.key?(:element) ? nil : locate
-      assert_element_found
-    end
-
     def assert_element_found
       unless @element
         raise UnknownObjectException, "unable to locate element, using #{selector_string}"
       end
     end
 
-    def reset!
-      @element = nil
-    end
-
     def locate
+      return if @selector.empty?
       ensure_context
 
       element_validator = element_validator_class.new
@@ -554,6 +543,18 @@ module Watir
       locator.locate
     end
 
+    protected
+
+    def selector_string
+      return @selector.inspect if @query_scope.is_a?(Browser)
+      query_scope = if @query_scope.is_a?(IFrame)
+                      @query_scope.element.instance_variable_get("@query_scope")
+                    else
+                      @query_scope
+                    end
+      "#{query_scope.selector_string} --> #{@selector.inspect}"
+    end
+
     private
 
     def locator_class
@@ -578,10 +579,6 @@ module Watir
       self.class.name.split('::').last
     end
 
-    def selector_string
-      @selector.inspect
-    end
-
     # Ensure the driver is in the desired browser context
     def ensure_context
       @query_scope.is_a?(IFrame) ? @query_scope.switch_to! : @query_scope.assert_exists
@@ -620,7 +617,7 @@ module Watir
     def element_call
       yield
     rescue Selenium::WebDriver::Error::StaleElementReferenceError
-      @element = @selector.key?(:element) ? nil : locate
+      @element = locate
       assert_element_found
       retry
     end

data/lib/watir/elements/iframe.rb

@@ -2,6 +2,7 @@ module Watir
   class IFrame < HTMLElement
 
     def locate
+      return if @selector.empty?
       @query_scope.assert_exists
 
       selector = @selector.merge(tag_name: frame_tag)
@@ -15,6 +16,11 @@ module Watir
       FramedDriver.new(element, driver)
     end
 
+    def ==(other)
+      return false unless other.is_a?(self.class)
+      wd == other.wd.is_a?(FramedDriver) ? other.wd.send(:wd) : other.wd
+    end
+
     def switch_to!
       locate.send :switch!
     end
@@ -62,28 +68,6 @@ module Watir
 
 
   class IFrameCollection < ElementCollection
-
-    def to_a
-      # In case `#all_elements` returns empty array, but `#elements`
-      # returns non-empty array (i.e. any frame has loaded between these two calls),
-      # index will return nil. That's why `#all_elements` should always
-      # be called after `#elements.`
-      element_indexes = elements.map { |el| all_elements.index(el) }
-      element_indexes.map { |idx| element_class.new(@query_scope, tag_name: @selector[:tag_name], index: idx) }
-    end
-
-    private
-
-    def all_elements
-      selector = { tag_name: @selector[:tag_name] }
-
-      element_validator = element_validator_class.new
-      selector_builder = selector_builder_class.new(@query_scope, selector, element_class.attribute_list)
-      locator = locator_class.new(@query_scope, selector, selector_builder, element_validator)
-
-      locator.locate_all
-    end
-
   end # IFrameCollection
 
 

data/lib/watir/elements/image.rb

@@ -27,32 +27,6 @@ module Watir
       driver.execute_script "return arguments[0].width", @element
     end
 
-    #
-    # Returns the image's height in pixels.
-    #
-    # @return [Fixnum] width
-    #
-
-    def height
-      assert_exists
-      driver.execute_script "return arguments[0].height", @element
-    end
-
-    def file_created_date
-      assert_exists
-      raise NotImplementedError, "not currently supported by Selenium"
-    end
-
-    def file_size
-      assert_exists
-      raise NotImplementedError, "not currently supported by Selenium"
-    end
-
-    def save(path)
-      assert_exists
-      raise NotImplementedError, "not currently supported by Selenium"
-    end
-
   end # Image
 
   module Container

data/lib/watir/elements/row.rb

@@ -8,10 +8,10 @@ module Watir
   end # Row
 
   class RowCollection < TableRowCollection
-    def elements
+    def to_a
       # we do this craziness since the xpath used will find direct child rows
       # before any rows inside thead/tbody/tfoot...
-      super.sort_by { |e| e.attribute(:rowIndex).to_i }
+      super.sort_by { |e| e.attribute_value(:rowIndex).to_i }
     end
   end
 end # Watir

data/lib/watir/elements/text_field.rb

@@ -7,13 +7,18 @@ module Watir
     inherit_attributes_from Watir::TextArea
     remove_method :type # we want Input#type here, which was overriden by TextArea's attributes
 
-    private
+    protected
 
     def selector_string
       selector = @selector.dup
       selector[:type] = '(any text type)'
       selector[:tag_name] = "input or textarea"
-      selector.inspect
+
+      if @query_scope.is_a?(Browser) || @query_scope.is_a?(IFrame)
+        super
+      else
+        "#{@query_scope.selector_string} --> #{selector.inspect}"
+      end
     end
   end # TextField
 

data/lib/watir/locators/element/locator.rb

@@ -38,11 +38,11 @@ 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
-            element = find_first_by_multiple
-          end
+          element = if @selector.size == 1
+                      find_first_by_one
+                    else
+                      find_first_by_multiple
+                    end
 
           # This actually only applies when finding by xpath/css - browser.text_field(:xpath, "//input[@type='radio']")
           # We don't need to validate the element if we built the xpath ourselves.
@@ -64,16 +64,15 @@ module Watir
         private
 
         def by_id
-          return unless id = @selector[:id] and id.is_a? String
-
           selector = @selector.dup
-          selector.delete(:id)
+          id = selector.delete(:id)
+          return unless id.is_a? String
 
           tag_name = selector.delete(:tag_name)
           return unless selector.empty? # multiple attributes
 
           element = @query_scope.wd.find_element(:id, id)
-          return if tag_name && !element_validator.validate(element, selector)
+          return if tag_name && !element_validator.validate(element, {tag_name: tag_name})
 
           element
         end
@@ -93,19 +92,27 @@ module Watir
           selector = selector_builder.normalized_selector
 
           idx = selector.delete(:index)
+          visible = selector.delete(:visible)
+
           how, what = selector_builder.build(selector)
 
           if how
             # could build xpath/css for selector
-            if idx
-              @query_scope.wd.find_elements(how, what)[idx]
+            if idx || !visible.nil?
+              idx ||= 0
+              elements = @query_scope.wd.find_elements(how, what)
+              elements = elements.select { |el| visible == el.displayed? } unless visible.nil?
+              elements[idx] unless elements.nil?
             else
               @query_scope.wd.find_element(how, what)
             end
           else
             # can't use xpath, probably a regexp in there
-            if idx
-              wd_find_by_regexp_selector(selector, :select)[idx]
+            if idx || !visible.nil?
+              idx ||= 0
+              elements = wd_find_by_regexp_selector(selector, :select)
+              elements = elements.select { |el| visible == el.displayed? } unless visible.nil?
+              elements[idx] unless elements.nil?
             else
               wd_find_by_regexp_selector(selector, :find)
             end

data/lib/watir/locators/element/selector_builder.rb

@@ -30,6 +30,10 @@ module Watir
             unless what.is_a?(Fixnum)
               raise TypeError, "expected Fixnum, got #{what.inspect}:#{what.class}"
             end
+          when :visible
+            unless what.is_a?(TrueClass) || what.is_a?(FalseClass)
+              raise TypeError, "expected TrueClass or FalseClass, got #{what.inspect}:#{what.class}"
+            end
           else
             unless VALID_WHATS.any? { |t| what.is_a? t }
               raise TypeError, "expected one of #{VALID_WHATS.inspect}, got #{what.inspect}:#{what.class}"
@@ -53,7 +57,7 @@ module Watir
 
         def normalize_selector(how, what)
           case how
-          when :tag_name, :text, :xpath, :index, :class, :label, :css
+          when :tag_name, :text, :xpath, :index, :class, :label, :css, :visible
             # include :class since the valid attribute is 'class_name'
             # include :for since the valid attribute is 'html_for'
             [how, what]

data/lib/watir/window.rb

@@ -200,13 +200,13 @@ module Watir
       @handle ||= locate
     end
 
-    private
-
     # Referenced in EventuallyPresent
     def selector_string
       @selector.inspect
     end
 
+    private
+
     def locate
       if @selector.empty?
         nil

data/spec/element_spec.rb

@@ -49,34 +49,24 @@ describe Watir::Element do
     end
   end
 
-  describe "#reset!" do
-    it "successfully relocates collection elements after a reset!" do
-      browser.goto(WatirSpec.url_for("wait.html"))
-      element = browser.div(id: 'foo')
-      expect(element).to exist
-      browser.refresh
-      browser.div(id: 'foo').wait_until_present
-
-      expect(element.exist?).to be false unless Watir.always_locate?
-      element.send :reset!
-      expect(element).to exist
-    end
-  end
-
   describe "#exists?" do
     before do
       browser.goto WatirSpec.url_for('removed_element.html')
     end
 
-    it "returns false when an element from a collection becomes stale" do
+    it "relocates element from a collection when it becomes stale" do
       watir_element = browser.divs(id: "text").first
       expect(watir_element).to exist
 
       browser.refresh
 
-      expect(watir_element).to_not exist
+      expect(watir_element).to exist
     end
 
+    it "returns false when tag name does not match id" do
+      watir_element = browser.span(id: "text")
+      expect(watir_element).to_not exist
+    end
   end
 
   describe "#element_call" do
@@ -129,4 +119,34 @@ describe Watir::Element do
       end.to output.to_stderr
     end
   end
+
+  describe "#selector_string" do
+    it "displays selector string for regular element" do
+      browser.goto(WatirSpec.url_for("wait.html"))
+      delegator = browser.div(:id, 'foo').when_present
+      message = delegator.instance_variable_get('@message')
+      expect(message).to eq 'waiting for {:id=>"foo", :tag_name=>"div"} to become present'
+    end
+
+    it "displays selector string for element from colection" do
+      browser.goto(WatirSpec.url_for("wait.html"))
+      delegator = browser.divs.last.when_present
+      message = delegator.instance_variable_get('@message')
+      expect(message).to match /waiting for {:tag_name=>\"div\", :index=>3} to become present/
+    end
+
+    it "displays selector string for nested element" do
+      browser.goto(WatirSpec.url_for("wait.html"))
+      delegator = browser.div(index: -1).div(:id, 'foo').when_present
+      message = delegator.instance_variable_get('@message')
+      expect(message).to eq 'waiting for {:index=>-1, :tag_name=>"div"} --> {:id=>"foo", :tag_name=>"div"} to become present'
+    end
+
+    it "displays selector string for nested element under frame" do
+      browser.goto(WatirSpec.url_for("nested_iframes.html"))
+      delegator = browser.iframe(id: 'one').iframe(:id, 'three').when_present
+      message = delegator.instance_variable_get('@message')
+      expect(message).to eq 'waiting for {:id=>"one", :tag_name=>"iframe"} --> {:id=>"three", :tag_name=>"iframe"} to become present'
+    end
+  end
 end

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.0.0.beta4'
+  s.version     = '6.0.0.beta5'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alex Rodionov', 'Titus Fortner']
   s.email       = ['p0deje@gmail.com', 'titusfortner@gmail.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta4
+  version: 6.0.0.beta5
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver