watir 6.8.2 → 6.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 727cd5c1020e932467833d4750dc61716f60b8fb
-  data.tar.gz: b0e81b12faace42be3914ef54de2b1d25fddb4cb
+  metadata.gz: f82528cb00ff57b97bbc4e8960b4ed829d64b397
+  data.tar.gz: 923b153593c0e8585dea3ba7b8666f23a384d329
 SHA512:
-  metadata.gz: 4ba07e681cc33793a02bd6a1deff4419bdff895374d7329bb3c55a6c83e820bc9456b56fc4d80ffc2dc9079760615311119b90e5ef76e774f6b85ffc0a506f38
-  data.tar.gz: bee368388abe7453cd081bfd55c7f8e9e2417016230a373b3451ea89b48ac49b2ce9ce4e6015ebf8a9540dccf96c484e3a5eb1da741f0c8c0d5a39316d91adfc
+  metadata.gz: 56daeb06087a30354f7f3ee8efd2a8b3c13f1fc89ddd20b7717db4dd9ac137b9dc7258c927fc96974ce2514fa11610c0990d0dcb9d574c94860a185085d0bdb7
+  data.tar.gz: 82ae8b170360fe4dd60793dc2a80271b4fd3acd08f96a91e0b6f691f0cf06e1d295baf5b2a8edc67dead5bdc55904e3e0f2f7708a3b5855c49e0c0b8e8951345

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 6.8.3 (2017-09-07)
+
+* Fix bug with non-interactable elements not being waited on (#636)
+
 ### 6.8.2 (2017-09-06)
 
 * Fix bug to prevent after_hooks from running when an alert is present
@@ -6,7 +10,7 @@
 ### 6.8.1 (2017-09-05)
 
 * Ignore index locator when value is zero
-* Fix bug with `Select#select!` doing partial string matches
+* Fix bug with `Select#select!` doing partial string matches (thanks Justin Ko )
 
 ### 6.8.0 (2017-08-28)
 

data/lib/watir.rb

@@ -115,6 +115,7 @@ require the watir_css gem - https://github.com/watir/watir_css
   end
 
 end
+require 'watir/locators'
 
 require 'watir/attribute_helper'
 require 'watir/row_container'
@@ -152,7 +153,6 @@ require 'watir/elements/text_field'
 require 'watir/elements/input'
 require 'watir/radio_set'
 
-require 'watir/locators'
 require 'watir/aliases'
 
 Watir.tag_to_class.freeze

data/lib/watir/element_collection.rb

@@ -6,6 +6,7 @@ module Watir
 
   class ElementCollection
     include Enumerable
+    include Locators::ClassHelpers
 
     def initialize(query_scope, selector)
       @query_scope = query_scope
@@ -129,28 +130,6 @@ module Watir
       @elements ||= locator.locate_all
     end
 
-    def locator_class
-      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::Locator")
-    rescue NameError
-      Kernel.const_get("#{Watir.locator_namespace}::Element::Locator")
-    end
-
-    def element_validator_class
-      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::Validator")
-    rescue NameError
-      Kernel.const_get("#{Watir.locator_namespace}::Element::Validator")
-    end
-
-    def selector_builder_class
-      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::SelectorBuilder")
-    rescue NameError
-      Kernel.const_get("#{Watir.locator_namespace}::Element::SelectorBuilder")
-    end
-
-    def element_class_name
-      element_class.to_s.split('::').last
-    end
-
     def element_class
       Kernel.const_get(self.class.name.sub(/Collection$/, ''))
     end

data/lib/watir/elements/element.rb

@@ -13,6 +13,7 @@ module Watir
     include Waitable
     include Adjacent
     include JSExecution
+    include Locators::ClassHelpers
 
     attr_accessor :keyword
     attr_reader :selector
@@ -625,26 +626,8 @@ module Watir
       raise unknown_exception, "element located, but timed out after #{Watir.default_timeout} seconds, waiting for #{inspect} to be present"
     end
 
-    def locator_class
-      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::Locator")
-    rescue NameError
-      Kernel.const_get("#{Watir.locator_namespace}::Element::Locator")
-    end
-
-    def element_validator_class
-      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::Validator")
-    rescue NameError
-      Kernel.const_get("#{Watir.locator_namespace}::Element::Validator")
-    end
-
-    def selector_builder_class
-      Kernel.const_get("#{Watir.locator_namespace}::#{element_class_name}::SelectorBuilder")
-    rescue NameError
-      Kernel.const_get("#{Watir.locator_namespace}::Element::SelectorBuilder")
-    end
-
-    def element_class_name
-      self.class.name.split('::').last
+    def element_class
+      self.class
     end
 
     def attribute?(attribute_name)
@@ -682,10 +665,9 @@ module Watir
         raise_present unless Wait.timer.remaining_time > 0
         raise_present unless exist_check == :wait_for_present || exist_check == :wait_for_enabled
         retry
-      rescue Selenium::WebDriver::Error::InvalidElementStateError => ex
+      rescue Selenium::WebDriver::Error::InvalidElementStateError
         raise_disabled unless Wait.timer.remaining_time > 0
         raise_disabled unless exist_check == :wait_for_writable || exist_check == :wait_for_enabled
-        raise_disabled unless ex.message.include?('user-editable')
         retry
       rescue Selenium::WebDriver::Error::NoSuchWindowError
         raise Exception::NoMatchingWindowFoundException, "browser window was closed"

data/lib/watir/locators.rb

@@ -21,3 +21,40 @@ require 'watir/locators/text_field/locator'
 require 'watir/locators/text_field/selector_builder'
 require 'watir/locators/text_field/selector_builder/xpath'
 require 'watir/locators/text_field/validator'
+
+module Watir
+  module Locators
+    module ClassHelpers
+      def locator_class
+        class_from_string("#{Watir.locator_namespace}::#{element_class_name}::Locator") ||
+            class_from_string("Watir::Locators::#{element_class_name}::Locator") ||
+            class_from_string("#{Watir.locator_namespace}::Element::Locator") ||
+            Watir::Locators::Element::Locator
+      end
+
+      def element_validator_class
+        class_from_string("#{Watir.locator_namespace}::#{element_class_name}::Validator") ||
+            class_from_string("Watir::Locators::#{element_class_name}::Validator") ||
+            class_from_string("#{Watir.locator_namespace}::Element::Validator") ||
+            Watir::Locators::Element::Validator
+      end
+
+      def selector_builder_class
+        class_from_string("#{Watir.locator_namespace}::#{element_class_name}::SelectorBuilder") ||
+            class_from_string("Watir::Locators::#{element_class_name}::SelectorBuilder") ||
+            class_from_string("#{Watir.locator_namespace}::Element::SelectorBuilder") ||
+            Watir::Locators::Element::SelectorBuilder
+      end
+
+      def class_from_string(string)
+        Kernel.const_get(string)
+      rescue NameError
+        nil
+      end
+
+      def element_class_name
+        element_class.to_s.split('::').last
+      end
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Watir
         ]
 
         # Regular expressions that can be reliably converted to xpath `contains`
-        # expressions in order to optimize the .
+        # expressions in order to optimize the locator.
         CONVERTABLE_REGEXP = %r{
           \A
             ([^\[\]\\^$.|?*+()]*) # leading literal characters
@@ -139,6 +139,7 @@ module Watir
                   else
                     wd_find_by_regexp_selector(selector, :select)
                   end
+          return [] if found.nil?
           filter_elements found, visible, nil, :multiple
         end
 
@@ -181,7 +182,7 @@ module Watir
 
           if rx_selector.key?(:label) && selector_builder.should_use_label_element?
             label = label_from_text(rx_selector.delete(:label)) || return
-            if (id = label.attribute(:for))
+            if (id = label.attribute('for'))
               selector[:id] = id
             else
               query_scope = label

data/spec/element_locator_spec.rb

@@ -249,8 +249,8 @@ describe Watir::Locators::Element::Locator do
 
       it "handles :label => /regexp/ selector" do
         label_elements = [
-          element(tag_name: "label", text: "foo", attributes: { for: "bar"}),
-          element(tag_name: "label", text: "foob", attributes: { for: "baz"})
+          element(tag_name: "label", text: "foo", attributes: { 'for' => "bar"}),
+          element(tag_name: "label", text: "foob", attributes: { 'for' => "baz"})
         ]
         div_elements = [element(tag_name: "div")]
 

data/spec/watirspec/elements/element_spec.rb

@@ -98,7 +98,7 @@ describe "Element" do
       expect(browser.elements(xpath: "//a").length).to eq 1
     end
 
-    it "finds finds several elements by arbitrary attribute" do
+    it "finds several elements by arbitrary attribute" do
       expect(browser.elements(id: /^new_user/).length).to eq 33
     end
 

data/spec/watirspec/elements/filefield_spec.rb

@@ -162,9 +162,9 @@ describe "FileField" do
       not_compliant_on :internet_explorer, %i(chrome windows) do
         bug "Raises InvalidArgumentError: File not found", :firefox do
           it "does not alter its argument" do
-            value = File.expand_path 'support/travis.sh'
+            value = File.expand_path '.travis.yml'
             browser.file_field.value = value
-            expect(value).to match /support\/travis\.sh$/
+            expect(value).to match /\.travis\.yml$/
           end
         end
       end

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.8.2'
+  s.version     = '6.8.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.8.2
+  version: 6.8.3
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver