watir 6.14.0 → 6.15.0

data/lib/watir/elements/element.rb

@@ -45,7 +45,14 @@ module Watir
     #
 
     def exists?
-      return false if located? && stale?
+      if located? && stale?
+        Watir.logger.deprecate 'Checking `#exists? == false` to determine a stale element',
+                               '`#stale? == true`',
+                               reference: 'http://watir.com/staleness-changes',
+                               ids: [:stale_exists]
+        # TODO: Change this to `reset!` after removing deprecation
+        return false
+      end
 
       assert_exists
       true
@@ -246,15 +253,13 @@ module Watir
     end
 
     #
-    # Returns value of the element.
+    # Returns list of class values.
     #
-    # @return [String]
+    # @return [Array]
     #
 
-    def value
-      attribute_value('value') || ''
-    rescue Selenium::WebDriver::Error::InvalidElementStateError
-      ''
+    def classes
+      class_name.split
     end
 
     #
@@ -448,7 +453,7 @@ module Watir
       Watir.logger.warn msg, ids: [:visible_element]
       displayed = display_check
       if displayed.nil? && display_check
-        Watir.logger.deprecate 'Checking `#present? == false` to determine a stale element',
+        Watir.logger.deprecate 'Checking `#visible? == false` to determine a stale element',
                                '`#stale? == true`',
                                reference: 'http://watir.com/staleness-changes',
                                ids: [:stale_visible]
@@ -490,6 +495,21 @@ module Watir
       false
     end
 
+    #
+    # Returns true if the element's center point is covered by a non-descendant element.
+    #
+    # @return [Boolean]
+    #
+
+    def obscured?
+      element_call do
+        return true unless present?
+
+        scroll_into_view
+        execute_js(:elementObscured, self)
+      end
+    end
+
     #
     # Returns given style property of this element.
     #
@@ -557,7 +577,7 @@ module Watir
     #
 
     def stale?
-      raise Watir::Exception::Error, 'Can not check staleness of unused element' unless @element
+      raise Error, 'Can not check staleness of unused element' unless @element
 
       ensure_context
       stale_in_context?
@@ -581,6 +601,7 @@ module Watir
     def locate
       ensure_context
       locate_in_context
+      self
     end
 
     #
@@ -627,7 +648,7 @@ module Watir
       begin
         @query_scope.wait_for_exists unless @query_scope.is_a? Browser
         wait_until(&:exists?)
-      rescue Watir::Wait::TimeoutError
+      rescue Wait::TimeoutError
         msg = "timed out after #{Watir.default_timeout} seconds, waiting for #{inspect} to be located"
         raise unknown_exception, msg
       end
@@ -639,8 +660,8 @@ module Watir
 
       begin
         @query_scope.wait_for_present unless @query_scope.is_a? Browser
-        wait_until_present
-      rescue Watir::Wait::TimeoutError
+        wait_until(&:present?)
+      rescue Wait::TimeoutError
         msg = "element located, but timed out after #{Watir.default_timeout} seconds, " \
               "waiting for #{inspect} to be present"
         raise unknown_exception, msg
@@ -651,11 +672,12 @@ module Watir
       return assert_enabled unless Watir.relaxed_locate?
 
       wait_for_exists
-      return if [Input, Button, Select, Option].none? { |c| is_a? c }
+      return unless [Input, Button, Select, Option].any? { |c| is_a? c } || @content_editable
+      return if enabled?
 
       begin
         wait_until(&:enabled?)
-      rescue Watir::Wait::TimeoutError
+      rescue Wait::TimeoutError
         raise_disabled
       end
     end
@@ -666,12 +688,12 @@ module Watir
         raise_writable unless !respond_to?(:readonly?) || !readonly?
       end
 
+      return if !respond_to?(:readonly?) || !readonly?
+
       begin
         wait_until { !respond_to?(:readonly?) || !readonly? }
-      rescue Watir::Wait::TimeoutError
-        message = "element present and enabled, but timed out after #{Watir.default_timeout} seconds, " \
-                  "waiting for #{inspect} to not be readonly"
-        raise ObjectReadOnlyException, message
+      rescue Wait::TimeoutError
+        raise_writable
       end
     end
 
@@ -696,7 +718,7 @@ module Watir
     private
 
     def unknown_exception
-      Watir::Exception::UnknownObjectException
+      UnknownObjectException
     end
 
     def raise_writable
@@ -721,16 +743,12 @@ module Watir
       self.class
     end
 
-    def attribute?(attribute_name)
-      !attribute_value(attribute_name).nil?
-    end
-
     def assert_enabled
       raise ObjectDisabledException, "object is disabled #{inspect}" unless element_call { @element.enabled? }
     end
 
     def assert_is_element(obj)
-      raise TypeError, "execpted Watir::Element, got #{obj.inspect}:#{obj.class}" unless obj.is_a? Watir::Element
+      raise TypeError, "execpted Watir::Element, got #{obj.inspect}:#{obj.class}" unless obj.is_a? Element
     end
 
     # Removes duplication in #present? & #visible? and makes setting deprecation notice easier
@@ -777,7 +795,7 @@ module Watir
         raise_disabled unless %i[wait_for_present wait_for_enabled wait_for_writable].include?(precondition)
         retry
       rescue Selenium::WebDriver::Error::NoSuchWindowError
-        raise Exception::NoMatchingWindowFoundException, 'browser window was closed'
+        raise NoMatchingWindowFoundException, 'browser window was closed'
       ensure
         Watir.logger.info "<- `Completed #{inspect}##{caller}`"
         Wait.timer.reset! unless already_locked

data/lib/watir/elements/hidden.rb

@@ -5,7 +5,7 @@ module Watir
     end
 
     def click
-      raise Watir::Exception::ObjectDisabledException, 'click is not available on the hidden field element'
+      raise ObjectDisabledException, 'click is not available on the hidden field element'
     end
   end
 

data/lib/watir/elements/iframe.rb

@@ -45,7 +45,7 @@ module Watir
     #
 
     def execute_script(script, *args)
-      args.map! { |e| e.is_a?(Watir::Element) ? e.wd : e }
+      args.map! { |e| e.is_a?(Element) ? e.wd : e }
       returned = driver.execute_script(script, *args)
 
       browser.wrap_elements_in(self, returned)
@@ -77,7 +77,7 @@ module Watir
     private
 
     def unknown_exception
-      Watir::Exception::UnknownFrameException
+      UnknownFrameException
     end
   end # IFrame
 
@@ -105,6 +105,8 @@ module Watir
   #
 
   class FramedDriver
+    include Exception
+
     def initialize(element, browser)
       @element = element
       @browser = browser
@@ -125,15 +127,15 @@ module Watir
       @driver.switch_to.frame @element
       @browser.default_context = false
     rescue Selenium::WebDriver::Error::NoSuchFrameError => e
-      raise Exception::UnknownFrameException, e.message
+      raise UnknownFrameException, e.message
     end
 
     def wd
       @element
     end
 
-    def respond_to_missing?(meth)
-      @driver.respond_to?(meth) || @element.respond_to?(meth)
+    def respond_to_missing?(meth, _include_private = false)
+      @driver.respond_to?(meth) || @element.respond_to?(meth) || super
     end
 
     def method_missing(meth, *args, &blk)

data/lib/watir/elements/option.rb

@@ -46,24 +46,13 @@ module Watir
     #
     # Returns the text of option.
     #
-    # Note that the text is either one of the following respectively:
-    #   * label attribute
-    #   * text attribute
-    #   * inner element text
+    # getAttribute atom pulls the text value if the label does not exist
     #
     # @return [String]
     #
 
     def text
-      # A little unintuitive - we'll return the 'label' or 'text' attribute if
-      # they exist, otherwise the inner text of the element
-
-      %i[label text].each do |a|
-        val = attribute_value(a)
-        return val unless val.nil?
-      end
-
-      super
+      attribute_value(:label)
     end
   end # Option
 end # Watir

data/lib/watir/elements/select.rb

@@ -1,13 +1,11 @@
 module Watir
   class Select < HTMLElement
-    include Watir::Exception
-
     #
     # Clears all selected options.
     #
 
     def clear
-      raise Error, 'you can only clear multi-selects' unless multiple?
+      raise Exception::Error, 'you can only clear multi-selects' unless multiple?
 
       selected_options.each(&:click)
     end
@@ -146,13 +144,11 @@ module Watir
     def select_by(str_or_rx)
       found = find_options(:value, str_or_rx)
 
-      if found && found.size > 1
+      if found.size > 1
         Watir.logger.deprecate 'Selecting Multiple Options with #select', '#select_all',
                                ids: [:select_by]
       end
-      return select_matching(found) if found&.any?
-
-      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
+      select_matching(found)
     end
 
     def select_by!(str_or_rx, number)
@@ -189,7 +185,7 @@ module Watir
         next unless what.is_a?(String) ? value == what : value =~ what
         return true if opt.enabled?
 
-        raise Watir::Exception::ObjectDisabledException, "option matching #{what} by #{how} on #{inspect} is disabled"
+        raise ObjectDisabledException, "option matching #{what} by #{how} on #{inspect} is disabled"
       end
       false
     end
@@ -199,9 +195,7 @@ module Watir
 
       found = find_options :text, str_or_rx
 
-      return select_matching(found) if found
-
-      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
+      select_matching(found)
     end
 
     def find_options(how, str_or_rx)
@@ -216,6 +210,7 @@ module Watir
           raise TypeError, "expected String or Regexp, got #{str_or_rx.inspect}:#{str_or_rx.class}"
         end
       end
+      # TODO: Remove conditional when remove relaxed_locate toggle
       return @found unless @found.empty?
 
       raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
@@ -228,17 +223,6 @@ module Watir
       elements.each { |e| e.click unless e.selected? }
       elements.first.exist? ? elements.first.text : ''
     end
-
-    def matches_regexp?(how, element, exp)
-      case how
-      when :text
-        element.text =~ exp || element.label =~ exp
-      when :value
-        element.value =~ exp
-      else
-        raise Error, "unknown how: #{how.inspect}"
-      end
-    end
   end # Select
 
   module Container

data/lib/watir/elements/table.rb

@@ -27,7 +27,7 @@ module Watir
 
     def hashes
       all_rows = rows.locate
-      header_row = all_rows.first || raise(Exception::Error, 'no rows in table')
+      header_row = all_rows.first || raise(Error, 'no rows in table')
 
       all_rows.entries[1..-1].map do |row|
         cell_size_check(header_row, row)
@@ -69,7 +69,7 @@ module Watir
 
       index = cell_row.selector[:index]
       row_id = index ? "row at index #{index - 1}" : 'designated row'
-      raise Exception::Error, "#{row_id} has #{row_size} cells, while header row has #{header_size}"
+      raise Error, "#{row_id} has #{row_size} cells, while header row has #{header_size}"
     end
   end # Table
 end # Watir

data/lib/watir/exception.rb

@@ -7,9 +7,8 @@ module Watir
     class ObjectDisabledException < Error; end
     class ObjectReadOnlyException < Error; end
     class NoValueFoundException < Error; end
-    class UnknownCellException < Error; end
     class NoMatchingWindowFoundException < Error; end
     class UnknownFrameException < Error; end
-    class UnknownRowException < Error; end
+    class LocatorException < Error; end
   end # Exception
 end # Watir

data/lib/watir/generator/base/idl_sorter.rb

@@ -2,7 +2,7 @@ require 'tsort'
 
 module Watir
   module Generator
-    module Base
+    class Base
       class IDLSorter
         include TSort
 

data/lib/watir/generator/base/spec_extractor.rb

@@ -1,6 +1,6 @@
 module Watir
   module Generator
-    module Base
+    class Base
       class SpecExtractor
         IDL_SELECTOR = "//pre[contains(@class, 'idl')]".freeze
 
@@ -49,7 +49,7 @@ module Watir
         private
 
         def download_and_parse
-          URI.open(@uri) { |io| @doc = Nokogiri.HTML(io) }
+          File.open(@uri) { |io| @doc = Nokogiri.HTML(io) }
         end
 
         def extract_idl_parts

data/lib/watir/generator/base/visitor.rb

@@ -1,6 +1,6 @@
 module Watir
   module Generator
-    module Base
+    class Base
       class Visitor < WebIDL::RubySexpVisitor
         STRING_TYPES = ['WindowProxy', 'ValidityState', 'TimeRanges', 'Location',
                         'Any', 'TimedTrackArray', 'TimedTrack', 'TextTrackArray', 'TextTrack',

data/lib/watir/generator/html/generator.rb

@@ -4,7 +4,6 @@ module Watir
       private
 
       def ignored_tags
-        # ignore the link element for now
         %w[link]
       end
 

data/lib/watir/generator/html/spec_extractor.rb

@@ -1,6 +1,6 @@
 module Watir
   module Generator
-    module HTML
+    class HTML
       class SpecExtractor < Base::SpecExtractor
         private
 

data/lib/watir/generator/html/visitor.rb

@@ -1,6 +1,6 @@
 module Watir
   module Generator
-    module HTML
+    class HTML
       class Visitor < Base::Visitor
         def classify_regexp
           /^HTML(.+)Element$/

data/lib/watir/generator/svg/spec_extractor.rb

@@ -1,6 +1,6 @@
 module Watir
   module Generator
-    module SVG
+    class SVG
       class SpecExtractor < Base::SpecExtractor
         private
 

data/lib/watir/generator/svg/visitor.rb

@@ -1,6 +1,6 @@
 module Watir
   module Generator
-    module SVG
+    class SVG
       class Visitor < Base::Visitor
         def classify_regexp
           /^SVG(.+)Element$/

data/lib/watir/js_execution.rb

@@ -148,5 +148,16 @@ module Watir
     def select_text(str)
       element_call { execute_js :selectText, @element, str }
     end
+
+    #
+    # Selects text on page (as if dragging clicked mouse across provided text).
+    #
+    # @example
+    #   browser.li(id: 'non_link_1').selected_text
+    #
+
+    def selected_text
+      element_call { execute_js :selectedText }
+    end
   end # JSExecution
 end # Watir