watir 6.11.0.beta2 → 6.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e5bd05d8b6ed813503264d89bcaf6aceb4b67d5ad2217569c4aef4b7762ca5
-  data.tar.gz: 49c34f4a6e37dec3788fdc5c91ae3d06368b6b0d34c5365387e46d2ee07fe922
+  metadata.gz: 8eaa5c46491ba52da6c95709e75cc9759e51de70b8a5687c2d44668c1bcd7bee
+  data.tar.gz: e66fd1830e0442e4165476ecdca900ec5aaf0aa7879f8006c223402d9442ad0d
 SHA512:
-  metadata.gz: b654a96f43a8d9dc84645cc595c018a6263f180f3bd2e8dc20f03ed8ff2d43c135a267d0cf65f7c87c5cfe1ac9d3524cd438a77d13830ebfb179c9cbb4802693
-  data.tar.gz: d358cfee80f3afae74f39f8aa1d91ba9e98ed6d231735ab19d535ccb3932a0ef273e29e5749dc3ca51778c6220a58e84e5774a26e44403ab0c1592db5fc1ade3
+  metadata.gz: 3492caa375debcda81ccc04efec7d2c34af1caa9689ad66e6d60d44bc23f51c103a60070e493d0d1e54255fc77837f10e5aa54054dd66ae1c794546f6ec29ceb
+  data.tar.gz: d27c43b7e043a1f2602959bc48be08efe4d4a12fa6ce5f353c1ea38f4b629452153c5232a393510dbed4608fd18fd8f69fbf7a08c573036ee3017d163d781e82

data/CHANGES.md

@@ -1,3 +1,8 @@
+### 6.11.0 (2018-05-18)
+
+* Improve lazy loading of element collections
+* Fix regressions (#726, #730)
+
 ### 6.11.0.beta2 (2018-05-10)
 
 * Additional performance updates

data/lib/watir/element_collection.rb

@@ -37,15 +37,29 @@ module Watir
     #
     # Get the element at the given index.
     #
-    # Also note that because of Watir's lazy loading, this will return an Element
-    # instance even if the index is out of bounds.
+    # Any call to an ElementCollection including an adjacent selector
+    # can not be lazy loaded because it must store correct type
     #
     # @param [Integer] idx Index of wanted element, 0-indexed
     # @return [Watir::Element] Returns an instance of a Watir::Element subclass
     #
 
     def [](idx)
-      element_class.new(@query_scope, @selector.merge(index: idx))
+      if @selector.key? :adjacent
+        to_a[idx] || element_class.new(@query_scope, {invalid_locator: true})
+      else
+        element_class.new(@query_scope, @selector.merge(index: idx))
+      end
+    end
+
+    #
+    # First element of the collection
+    #
+    # @return [Watir::Element] Returns an instance of a Watir::Element subclass
+    #
+
+    def first
+      self[0]
     end
 
     #

data/lib/watir/elements/element.rb

@@ -405,6 +405,7 @@ module Watir
       assert_exists
       @element.displayed?
     rescue Selenium::WebDriver::Error::StaleElementReferenceError
+      reset!
       raise unknown_exception
     end
 

data/lib/watir/elements/select.rb

@@ -206,7 +206,7 @@ module Watir
     end
 
     def find_options(how, str_or_rx)
-      browser.wait_while do
+      wait_while do
         case str_or_rx
         when String, Numeric, Regexp
           @found = how == :value ? options(value: str_or_rx) : []

data/spec/watirspec/adjacent_spec.rb

@@ -53,6 +53,8 @@ describe "Adjacent Elements" do
 
     it "accepts a class_name argument" do
       siblings = browser.div(id: "second_sibling").siblings(class_name: 'b')
+      expect(siblings.first).to be_a Watir::Div
+      expect(siblings[0]).to be_a Watir::Div
       expect(siblings.size).to eq 2
       expect(siblings.all? { |sib| sib.is_a? Watir::Div }).to eq true
     end
@@ -111,7 +113,7 @@ describe "Adjacent Elements" do
       expect(browser.div(id: "second_sibling").following_siblings(tag_name: :div).first).to be_a Watir::Div
     end
 
-    it "accepts class_name argument" do
+    it "accepts class_name argument for single class" do
       expect(browser.div(id: "second_sibling").following_siblings(class_name: 'b').size).to eq 1
       expect(browser.div(id: "second_sibling").following_siblings(class_name: 'b').first).to be_a Watir::Div
     end

data/spec/watirspec/html/wait.html

@@ -54,6 +54,7 @@
     <a id="hide_foo" href="#" onclick="setTimeoutDisplay('foo', 'none', 500);">hide foo</a>
     <a id="remove_foo" href="#" onclick="setTimeoutRemove('foo', 1000);">remove foo</a>
     <a id="add_foobar" href="#" onclick="setTimeoutAddDisplay('foobar', 'bar', 1000);">add foobar</a>
+    <a id="readd_bar" href="#" onclick="setTimeoutRemove('bar', 500); setTimeoutAddDisplay('bar', 'foo', 1000);">re-add bar</a>
     <div id="buttons">
       <button id="btn" type="button" onclick="setDisabled('btn', true, 0)" disabled>Click To Disable!</button>
       <a id="enable_btn" href="#" onclick="setDisabled('btn', false, 500);">enable btn</a>

data/spec/watirspec/wait_spec.rb

@@ -204,6 +204,11 @@ describe Watir::Element do
       expect { browser.div(id: 'bar').wait_until_present(timeout: 5) }.to_not raise_exception
     end
 
+    it "waits until the element re-appears" do
+      browser.link(id: 'readd_bar').click
+      expect { browser.div(id: 'bar').wait_until_present }.to_not raise_exception
+    end
+
     it "times out if the element doesn't appear" do
       inspected = '#<Watir::Div: located: false; {:id=>"bar", :tag_name=>"div"}>'
       error = Watir::Wait::TimeoutError
@@ -259,7 +264,6 @@ describe Watir::Element do
       Watir.default_timeout = 1
       element = browser.link(name: 'add_select').wait_until(&:exists?)
       begin
-        start_time = ::Time.now
         browser.link(id: 'change_select').click
         expect { element.wait_while_present }.not_to raise_error
       ensure

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.11.0.beta2'
+  s.version     = '6.11.0'
   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.11.0.beta2
+  version: 6.11.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -520,9 +520,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: watir
 rubygems_version: 2.7.3