watir 6.4.2 → 6.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e0a1f0202b470c924e61682c83185857184d45
-  data.tar.gz: 62bf58042ab3107d7dfa66310db75328d2a6f361
+  metadata.gz: 02350fa770d3f560edf82f8fdb3efb33667b5c79
+  data.tar.gz: f25ed98f3c07012a3e7e6f940939872bd08e0a7b
 SHA512:
-  metadata.gz: 433a40d59782c7f1444c95a995b9b3bffdea122f22c21a680f2c552bd5926b4bd9d97587dc4255f432b8fa673a2e24a7cad46c92b7941b5bc2afeeb5c7ac38ce
-  data.tar.gz: 4c91feef374e9cece2aa66f889880579183cbfe058a3aa183db016e9be5325e4a8c8b369553c2dacacbbd7adffea430554929f400c7f56a9ad832851e2d60b78
+  metadata.gz: 62938c328cc2a16ac0d4ba6c48aa2bc09f0ac155a73adcd1bf63449120ed49139ecdba3cda0a4eab39e7eb4d6cde1e598e0a023f867be83aca6813336b5b4f94
+  data.tar.gz: 7b206faceabf70654fb6217fdcd7bb2be3f2ba9096c13dcbf97aaf68c5ea1af09e3d959b1c069397bf46caa7e5d990feae92fe77e7ced866df13c95e95ae5667

data/CHANGES.md

@@ -1,6 +1,10 @@
+### 6.4.3 (2017-07-19)
+
+* Fix bug with element relocation from ElementCollection 
+
 ### 6.4.2 (2017-07-14)
 
-* Fix bug with element relocation from ElementCollection (#571) 
+* No changes 
 
 ### 6.4.1 (2017-07-13)
 

data/lib/watir/browser.rb

@@ -102,9 +102,9 @@ module Watir
     # Returns URL of current page.
     #
     # @example
-    #   browser.goto "watir.github.io"
+    #   browser.goto "watir.com"
     #   browser.url
-    #   #=> "http://watir.github.io/"
+    #   #=> "http://watir.com/"
     #
     # @return [String]
     #

data/lib/watir/element_collection.rb

@@ -80,10 +80,21 @@ module Watir
     #
 
     def to_a
-      @to_a ||= elements.map.with_index do |e, idx|
-        element = element_class.new(@query_scope, @selector.merge(element: e, index: idx))
-        element_class == Watir::HTMLElement ? element.to_subtype : element
-      end
+      hash = {}
+      @to_a ||=
+          elements.map.with_index do |e, idx|
+            element = element_class.new(@query_scope, @selector.merge(element: e, index: idx))
+            if [Watir::HTMLElement, Watir::Input].include? element.class
+              element = element.to_subtype
+              hash[element.class] ||= []
+              hash[element.class] << element
+              element.class.new(@query_scope, @selector.merge(element: e,
+                                                              tag_name: element.tag_name,
+                                                              index: hash[element.class].size - 1))
+            else
+              element
+            end
+          end
     end
 
     #

data/spec/watirspec/elements/collections_spec.rb

@@ -24,4 +24,12 @@ describe "Collections" do
     expect(collection.any? { |el| el.is_a? Watir::Span}).to eq true
     expect(collection.any? { |el| el.is_a? Watir::Div}).to eq true
   end
+
+  it "relocates the same element" do
+    browser.goto(WatirSpec.url_for("nested_elements.html"))
+    collection = browser.div(id: "parent").children
+    tag = collection[3].tag_name
+    browser.refresh
+    expect(collection[3].tag_name).to eq tag
+  end
 end

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.4.2'
+  s.version     = '6.4.3'
   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.4.2
+  version: 6.4.3
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver