watir 6.16.0 → 6.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63d608d81ce067739aacf522e62047450f0c0599
-  data.tar.gz: 135b27602f2a190dd6aa15401d93ecb0fbbd68a9
+  metadata.gz: d2b4db146f289ef46ceb5bf9b9faabdad94743ba
+  data.tar.gz: 4b54ec483198de8c748bffdfda298770c4c9c40e
 SHA512:
-  metadata.gz: b294891e79600c34327a05b06f01929f136a18400695b7ff03428ed264c8f66c4fae06e48e7879d691eac491029af5913ba275515eb319596c410f1cc98ba6c9
-  data.tar.gz: f258febcb8fbe41ff1ceacb3c96ada0ef27a8d19787e51bc45dd2d8f1901a64f5b76047a94446f427ce8338e4e4e5b4a85de12c9e83fe90283824cc40aeca402
+  metadata.gz: f1c78b53e3d1243c9a6dc0aa94d6844f174460798da81b76488449e34b2ca695b61e18bc8739a8ee2095d430a6d904bd8cd0cb3b6f8464129d7b1c5f3670c068
+  data.tar.gz: 26147c5fa67a6b6289488ad39eae1ec3ad2f82af18a886d6d13935658fdaf138a8a8278a8dda58a5a71b82f9467a3aa9bfc96e0e80aa5f0a321a4317c4202605

data/.rubocop.yml

@@ -75,6 +75,7 @@ Metrics/ClassLength:
     - 'lib/watir/elements/element.rb'
     - 'lib/watir/elements/select.rb'
     - 'lib/watir/generator/base/spec_extractor.rb'
+    - 'lib/watir/element_collection.rb'
 
 Metrics/PerceivedComplexity:
   Max: 10

data/CHANGES.md

@@ -1,3 +1,9 @@
+### 6.16.1 (2018-12-23)
+
+* Improve collection performance with JavaScript (thanks Lucas Tierney)
+* Update deprecation warnings
+* Improve performance when using previously located elements
+
 ### 6.16.0 (2018-12-16)
 
 * Fix bug that did not re-locate Stale elements when taking an action on them (#814)

data/LICENSE

@@ -2,6 +2,7 @@
 
 Copyright (c) 2009-2015 Jari Bakken
 Copyright (c) 2015-2018 Alex Rodionov, Titus Fortner
+Copyright (c) 2018 Justin Ko
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -109,4 +109,5 @@ on wire calls.
 
 Copyright (c) 2009-2015 Jari Bakken
 Copyright (c) 2015-2018 Alex Rodionov, Titus Fortner
+Copyright (c) 2018 Justin Ko
 See LICENSE for details

data/appveyor.yml

@@ -4,7 +4,6 @@ clone_depth: 100
 install:
   - set PATH=C:\Ruby23\bin;%PATH%
   - bundle install
-  - support/appveyor.cmd
 test_script:
   - bundle exec rake %RAKE_TASK%
 environment:

data/lib/watir.rb

@@ -46,12 +46,9 @@ module Watir
     end
 
     def always_locate_message
-      msg = <<~ALWAYS_LOCATE.tr("\n", ' ')
-        Watir#always_locate is deprecated; elements are always cached and will always
-        be re-located if they go stale before use.
-        Use Element#stale? or Element#wait_until(&:stale?) if needed for flow control.
-      ALWAYS_LOCATE
-      Watir.logger.warn msg, ids: %i[always_locate deprecations]
+      msg = 'Watir#always_locate'
+      repl_msg = 'Element#stale? or Element#wait_until(&:stale?) if needed for flow control'
+      Watir.logger.deprecate msg, repl_msg, ids: [:always_locate]
     end
 
     #
@@ -64,12 +61,10 @@ module Watir
     end
 
     def prefer_css_message
-      msg = <<~PREFER_CSS.tr("\n", ' ')
-        Watir#prefer_css is deprecated; all elements that can not be passed directly
-        as Selenium locators will be translated to XPath. To continue using CSS Selectors
-        require the watir_css gem - https://github.com/watir/watir_css
-      PREFER_CSS
-      Watir.logger.warn msg, ids: %i[prefer_css deprecations]
+      msg = 'Watir#prefer_css'
+      repl_msg = 'watir_css gem - https://github.com/watir/watir_css'
+
+      Watir.logger.deprecate msg, repl_msg, ids: [:prefer_css]
     end
 
     #

data/lib/watir/browser.rb

@@ -263,8 +263,11 @@ module Watir
     end
 
     def ensure_context
-      driver.switch_to.default_content unless @default_context
+      return if @default_context
+
+      driver.switch_to.default_content
       @default_context = true
+      after_hooks.run
     end
 
     #

data/lib/watir/element_collection.rb

@@ -5,6 +5,8 @@ module Watir
 
   class ElementCollection
     include Enumerable
+    include Exception
+    include JSSnippets
     include Locators::ClassHelpers
 
     def initialize(query_scope, selector)
@@ -92,12 +94,12 @@ module Watir
     def to_a
       hash = {}
       @to_a ||=
-        elements.map.with_index do |el, idx|
+        elements_with_tags.map.with_index do |(el, tag_name), idx|
           selector = @selector.dup
           selector[:index] = idx unless idx.zero?
           element = element_class.new(@query_scope, selector)
           if [HTMLElement, Input].include? element.class
-            construct_subtype(element, hash).tap { |e| e.cache = el }
+            construct_subtype(element, hash, tag_name).tap { |e| e.cache = el }
           else
             element.tap { |e| e.cache = el }
           end
@@ -162,6 +164,23 @@ module Watir
       end
     end
 
+    def elements_with_tags
+      els = elements
+      if @selector[:tag_name]
+        els.map { |e| [e, @selector[:tag_name]] }
+      else
+        retries = 0
+        begin
+          els.zip(execute_js(:getElementTags, els))
+        rescue Selenium::WebDriver::Error::StaleElementReferenceError
+          retries += 1
+          sleep 0.5
+          retry unless retries > 2
+          raise LocatorException, "Unable to locate element collection from #{@selector} due to changing page"
+        end
+      end
+    end
+
     def ensure_context
       @query_scope.locate if @query_scope.relocate?
       @query_scope.switch_to! if @query_scope.is_a?(IFrame)
@@ -175,9 +194,8 @@ module Watir
       Kernel.const_get(self.class.name.sub(/Collection$/, ''))
     end
 
-    def construct_subtype(element, hash)
+    def construct_subtype(element, hash, tag_name)
       selector = element.selector
-      tag_name = selector[:tag_name] || element.tag_name
       hash[tag_name] ||= 0
       hash[tag_name] += 1
       selector[:index] = hash[tag_name] - 1

data/lib/watir/elements/element.rb

@@ -670,7 +670,7 @@ module Watir
 
     def wait_for_exists
       return assert_exists unless Watir.relaxed_locate?
-      return if exists? # Performance shortcut
+      return if located? # Performance shortcut
 
       begin
         @query_scope.wait_for_exists unless @query_scope.is_a? Browser

data/lib/watir/elements/iframe.rb

@@ -128,6 +128,7 @@ module Watir
     def switch!
       @driver.switch_to.frame @element
       @browser.default_context = false
+      @browser.after_hooks.run
     rescue Selenium::WebDriver::Error::NoSuchFrameError => e
       raise UnknownFrameException, e.message
     end

data/lib/watir/elements/select.rb

@@ -226,7 +226,8 @@ module Watir
     def select_matching(elements)
       elements = [elements.first] unless multiple?
       elements.each { |e| e.click unless e.selected? }
-      elements.first.exist? ? elements.first.text : ''
+      # TODO: this can go back to #exist? after `:stale_exists` deprecation removed
+      elements.first.stale? ? '' : elements.first.text
     end
   end # Select
 

data/lib/watir/js_snippets/getElementTags.js

@@ -0,0 +1,3 @@
+function(){
+    return arguments[0].map(function(e) {return e.localName});
+}

data/lib/watir/legacy_wait.rb

@@ -77,9 +77,9 @@ module Watir
     #
 
     def when_present(timeout = nil)
-      warning = '#when_present has been deprecated and is unlikely to be needed; '
-      warning << 'replace this with #wait_until_present if a wait is still needed'
-      Watir.logger.warn warning, ids: %i[when_present deprecations]
+      msg = '#when_present'
+      repl_msg = '#wait_until_present if a wait is still needed'
+      Watir.logger.deprecate msg, repl_msg, ids: [:when_present]
 
       timeout ||= Watir.default_timeout
       message = "waiting for #{selector_string} to become present"
@@ -105,8 +105,9 @@ module Watir
     #
 
     def when_enabled(timeout = nil)
-      Watir.logger.warn '#when_enabled has been deprecated and is unlikely to be needed',
-                        ids: %i[when_enabled deprecations]
+      msg = '#when_enabled'
+      repl_msg = 'wait_until(&:enabled?)'
+      Watir.logger.deprecate msg, repl_msg, ids: [:when_enabled]
 
       timeout ||= Watir.default_timeout
       message = "waiting for #{selector_string} to become enabled"

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

@@ -71,7 +71,7 @@ module Watir
             end
           end
 
-          deprecate_text_regexp(element, values_to_match, matches) if values_to_match[:text]
+          deprecate_text_regexp(element, values_to_match) if values_to_match[:text] && matches
 
           matches
         end
@@ -110,11 +110,11 @@ module Watir
           matches_values?(element.tag_name.downcase, tag_name)
         end
 
-        def deprecate_text_regexp(element, selector, matches)
+        def deprecate_text_regexp(element, selector)
           new_element = Watir::Element.new(@query_scope, element: element)
           text_content = new_element.text_content
-          text_content_matches = text_content =~ /#{selector[:text]}/
-          return if matches == !!text_content_matches
+
+          return if text_content =~ /#{selector[:text]}/
 
           key = @selector.key?(:text) ? 'text' : 'label'
           selector_text = selector[:text].inspect

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

@@ -126,6 +126,8 @@ module Watir
             end
           when :caption
             # This allows any element to be located with 'caption' instead of 'text'
+            # It is deprecated because caption is a valid attribute on a Table
+            # It is also a valid Element, so it also needs to be removed from the Table attributes list
             Watir.logger.deprecate('Locating elements with :caption', ':text locator', ids: [:caption])
             [:text, what]
           else

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

@@ -142,11 +142,6 @@ module Watir
 
             # TODO: This conditional can be removed when we remove this deprecation
             if label.is_a?(Regexp)
-              if @built.key?(:label_element)
-                dep = "Using :label locator with RegExp #{label} to match an element that includes hidden text"
-                Watir.logger.deprecate(dep, ":visible_#{key}", ids: [:text_regexp])
-              end
-
               @built[:label_element] = label
               ''
             else

data/lib/watir/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '6.16.0'.freeze
+  VERSION = '6.16.1'.freeze
 end

data/spec/spec_helper.rb

@@ -1,21 +1,21 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'coveralls'
-require 'simplecov'
-require 'simplecov-console'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [
-  Coveralls::SimpleCov::Formatter,
-  SimpleCov::Formatter::HTMLFormatter,
-  SimpleCov::Formatter::Console
-]
-SimpleCov.start do
-  add_filter %r{/spec/}
-  add_filter 'lib/watir/elements/html_elements.rb'
-  add_filter 'lib/watir/elements/svg_elements.rb'
-  add_filter 'lib/watir/legacy_wait.rb'
-  add_filter 'lib/watirspec'
-  refuse_coverage_drop
+if ENV['TRAVIS'] || ENV['COVERAGE']
+  require 'coveralls'
+  require 'simplecov'
+  require 'simplecov-console'
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [Coveralls::SimpleCov::Formatter,
+                                                                  SimpleCov::Formatter::HTMLFormatter,
+                                                                  SimpleCov::Formatter::Console]
+  SimpleCov.start do
+    add_filter %r{/spec/}
+    add_filter 'lib/watir/elements/html_elements.rb'
+    add_filter 'lib/watir/elements/svg_elements.rb'
+    add_filter 'lib/watir/legacy_wait.rb'
+    add_filter 'lib/watirspec'
+    refuse_coverage_drop
+  end
 end
 
 require 'watir'

data/spec/unit/match_elements/element_spec.rb

@@ -5,7 +5,7 @@ describe Watir::Locators::Element::Matcher do
 
   let(:query_scope) { @query_scope || browser }
   let(:values_to_match) { @values_to_match || {} }
-  let(:matcher) { described_class.new(query_scope) }
+  let(:matcher) { described_class.new(query_scope, values_to_match) }
 
   describe '#match' do
     context 'a label element' do
@@ -364,5 +364,61 @@ describe Watir::Locators::Element::Matcher do
         expect(matcher.match(elements, values_to_match, @filter)).to eq [elements[0], elements[2]]
       end
     end
+
+    # TODO: These should have the same tests for label locators, but the mocking is more complex
+    # See equivalent tests in checkbox_spec
+    context 'text_regexp deprecations' do
+      let(:filter) { :first }
+      let(:elements) do
+        [wd_element(text: 'all visible'),
+         wd_element(text: 'some visible')]
+      end
+
+      it 'not thrown when still matched by text content' do
+        @values_to_match = {text: /some visible/}
+        allow(browser).to receive(:execute_script).and_return('some visible some hidden')
+
+        expect {
+          expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
+        }.not_to have_deprecated_text_regexp
+      end
+
+      it 'not thrown with complex regexp matched by text content' do
+        @values_to_match = {text: /some (in|)visible/}
+        allow(browser).to receive(:execute_script).and_return('some visible some hidden')
+
+        expect {
+          expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
+        }.not_to have_deprecated_text_regexp
+      end
+
+      not_compliant_on :watigiri do
+        it 'thrown when no longer matched by text content' do
+          @values_to_match = {text: /some visible$/}
+          allow(browser).to receive(:execute_script).and_return('some visible some hidden')
+
+          expect {
+            expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
+          }.to have_deprecated_text_regexp
+        end
+      end
+
+      not_compliant_on :watigiri do
+        it 'not thrown when element does not exist' do
+          @values_to_match = {text: /definitely not there/}
+
+          expect {
+            expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
+          }.to_not have_deprecated_text_regexp
+        end
+      end
+
+      # Note: This will work after:text_regexp deprecation removed
+      it 'keeps element from being located' do
+        @values_to_match = {text: /some visible some hidden/}
+
+        expect(matcher.match(elements, values_to_match, filter)).to be_nil
+      end
+    end
   end
 end

data/spec/unit/selector_builder/element_spec.rb

@@ -95,12 +95,13 @@ describe Watir::Locators::Element::SelectorBuilder do
         expect(selector_builder.build(selector)).to eq built
       end
 
-      # TODO: This functionality is deprecated with "class_array"
       it 'values with spaces' do
         selector = {class_name: 'multiple classes here'}
         built = {xpath: ".//*[contains(concat(' ', @class, ' '), ' multiple classes here ')]"}
 
-        expect(selector_builder.build(selector)).to eq built
+        expect {
+          expect(selector_builder.build(selector)).to eq built
+        }.to have_deprecated_class_array
       end
 
       it 'single String concatenates' do
@@ -280,12 +281,13 @@ describe Watir::Locators::Element::SelectorBuilder do
         expect(selector_builder.build(selector)).to eq built
       end
 
-      # Deprecated with :caption
       it 'with caption attribute' do
         selector = {caption: 'Add user'}
         built = {xpath: ".//*[normalize-space()='Add user']"}
 
-        expect(selector_builder.build(selector)).to eq built
+        expect {
+          expect(selector_builder.build(selector)).to eq built
+        }.to have_deprecated_caption
       end
 
       it 'raises exception when text is not a String or Regexp' do

data/spec/watirspec/after_hooks_spec.rb

@@ -113,6 +113,28 @@ describe 'Browser::AfterHooks' do
       end
     end
 
+    it 'runs after_hooks after FramedDriver#switch!' do
+      browser.goto(WatirSpec.url_for('iframes.html'))
+      @page_after_hook = proc { @yield = browser.title == 'Iframes' }
+      browser.after_hooks.add @page_after_hook
+
+      browser.iframe.element(css: '#senderElement').exists?
+
+      expect(@yield).to be true
+    end
+
+    it 'runs after_hooks after Browser#ensure_context if not @default_context' do
+      browser.goto(WatirSpec.url_for('iframes.html'))
+      browser.iframe.element(css: '#senderElement').locate
+
+      @page_after_hook = proc { @yield = browser.title == 'Iframes' }
+      browser.after_hooks.add @page_after_hook
+
+      browser.locate
+
+      expect(@yield).to be true
+    end
+
     not_compliant_on :headless do
       it 'runs after_hooks after Alert#ok' do
         browser.goto(WatirSpec.url_for('alerts.html'))

data/spec/watirspec/alert_spec.rb

@@ -10,7 +10,7 @@ not_compliant_on :headless do
       browser.alert.ok if browser.alert.exists?
     end
 
-    not_compliant_on :not_relaxed_locate do
+    compliant_on :relaxed_locate do
       context 'Relaxed Waits' do
         context 'when acting on an alert' do
           it 'raises exception after timing out' do

data/spec/watirspec/browser_spec.rb

@@ -151,7 +151,7 @@ describe 'Browser' do
   end
 
   describe '#new' do
-    not_compliant_on :remote do
+    not_compliant_on :remote, :appveyor do
       context 'with parameters' do
         let(:url) { 'http://localhost:4544/wd/hub/' }
 

data/spec/watirspec/elements/button_spec.rb

@@ -40,8 +40,13 @@ describe 'Button' do
     end
 
     it 'returns true if the button exists (how = :caption)' do
-      expect(browser.button(caption: 'Button 2')).to exist
-      expect(browser.button(caption: /Button 2/)).to exist
+      expect {
+        expect(browser.button(caption: 'Button 2')).to exist
+      }.to have_deprecated_caption
+
+      expect {
+        expect(browser.button(caption: /Button 2/)).to exist
+      }.to have_deprecated_caption
     end
 
     it 'returns the first button if given no args' do

data/spec/watirspec/elements/checkbox_spec.rb

@@ -26,6 +26,26 @@ describe 'CheckBox' do
       expect(browser.checkbox(xpath: "//input[@id='new_user_interests_books']")).to exist
     end
 
+    it 'handles text_regexp deprecations for label locators' do
+      expect {
+        expect(browser.checkbox(label: /some visible/)).to exist
+      }.to_not have_deprecated_text_regexp
+
+      expect {
+        expect(browser.checkbox(label: /some (visible|Jeff)/)).to exist
+      }.to_not have_deprecated_text_regexp
+
+      expect {
+        expect(browser.checkbox(label: /this will not match/)).to exist
+      }.to_not have_deprecated_text_regexp
+
+      expect(browser.checkbox(label: /some visible some hidden/)).to_not exist
+
+      expect {
+        expect(browser.checkbox(label: /some visible$/)).to exist
+      }.to have_deprecated_text_regexp
+    end
+
     it 'returns true if the checkbox button exists (search by name and value)' do
       expect(browser.checkbox(name: 'new_user_interests', value: 'cars')).to exist
       browser.checkbox(xpath: "//input[@name='new_user_interests' and @value='cars']").set

data/spec/watirspec/elements/checkboxes_spec.rb

@@ -13,7 +13,7 @@ describe 'CheckBoxes' do
 
   describe '#length' do
     it 'returns the number of checkboxes' do
-      expect(browser.checkboxes.length).to eq 8
+      expect(browser.checkboxes.length).to eq 11
     end
   end
 

data/spec/watirspec/elements/collections_spec.rb

@@ -17,6 +17,14 @@ describe 'Collections' do
     expect(collection.all? { |el| el.is_a? Watir::Span }).to eq true
   end
 
+  it 'returns correct subtype of elements without tag_name' do
+    browser.goto(WatirSpec.url_for('collections.html'))
+    collection = browser.span(id: 'a_span').elements
+    collection.locate
+    expect(collection.first).to be_a Watir::Div
+    expect(collection.last).to be_a Watir::Span
+  end
+
   it 'can contain more than one type of element' do
     browser.goto(WatirSpec.url_for('nested_elements.html'))
     collection = browser.div(id: 'parent').children
@@ -71,4 +79,45 @@ describe 'Collections' do
     expect(elements[1]).to be_stale
     expect { elements[1] }.to_not raise_unknown_object_exception
   end
+
+  it 'does not retrieve tag_name on elements when specifying tag_name' do
+    browser.goto(WatirSpec.url_for('collections.html'))
+    collection = browser.span(id: 'a_span').spans
+
+    expect_any_instance_of(Selenium::WebDriver::Element).to_not receive(:tag_name)
+    collection.locate
+  end
+
+  it 'does not retrieve tag_name on elements without specifying tag_name' do
+    browser.goto(WatirSpec.url_for('collections.html'))
+    collection = browser.span(id: 'a_span').elements
+
+    expect_any_instance_of(Selenium::WebDriver::Element).to_not receive(:tag_name)
+    collection.locate
+  end
+
+  it 'does not execute_script to retrieve tag_names when specifying tag_name' do
+    browser.goto(WatirSpec.url_for('collections.html'))
+    collection = browser.span(id: 'a_span').spans
+
+    expect(browser.wd).to_not receive(:execute_script)
+    collection.locate
+  end
+
+  it 'returns correct containers without specifying tag_name' do
+    browser.goto(WatirSpec.url_for('collections.html'))
+    elements = browser.span(id: 'a_span').elements.to_a
+    expect(elements[0]).to be_a(Watir::Div)
+    expect(elements[-1]).to be_a(Watir::Span)
+  end
+
+  it 'Raises Exception if any element in collection continues to go stale' do
+    browser.goto(WatirSpec.url_for('collections.html'))
+
+    stale_exception = Selenium::WebDriver::Error::StaleElementReferenceError
+    expect(browser.wd).to receive(:execute_script).and_raise(stale_exception).exactly(3).times
+
+    msg = 'Unable to locate element collection from {:xpath=>".//span"} due to changing page'
+    expect { browser.span.elements(xpath: './/span').to_a }.to raise_exception Watir::Exception::LocatorException, msg
+  end
 end

data/spec/watirspec/elements/div_spec.rb

@@ -129,23 +129,28 @@ describe 'Div' do
   describe 'Deprecation Warnings' do
     describe 'text locator with RegExp values' do
       it 'does not throw deprecation when still matched by text content' do
-        expect { browser.div(text: /some visible/).exists? }.not_to have_deprecated_text_regexp
+        expect { browser.div(text: /some visible/).locate }.not_to have_deprecated_text_regexp
+      end
+
+      it 'does not throw deprecation with complex regexp matched by text content' do
+        expect { browser.div(text: /some (in|)visible/).locate }.not_to have_deprecated_text_regexp
       end
 
       not_compliant_on :watigiri do
         it 'throws deprecation when no longer matched by text content' do
-          expect { browser.div(text: /some visible$/).exists? }.to have_deprecated_text_regexp
+          expect { browser.div(text: /some visible$/).locate }.to have_deprecated_text_regexp
         end
       end
 
       not_compliant_on :watigiri do
-        it 'throws deprecation when begins to be matched by text content' do
-          expect { browser.div(text: /some hidden/).exists? }.to have_deprecated_text_regexp
+        it 'does not throw deprecation when element does not exist' do
+          expect { browser.div(text: /definitely not there/).locate }.not_to have_deprecated_text_regexp
         end
       end
 
-      it 'does not throw deprecation when still not matched by text content' do
-        expect { browser.div(text: /does not exist/).exists? }.not_to have_deprecated_text_regexp
+      # Note: This will work after:text_regexp deprecation removed
+      it 'does not locate entire content with regular expressions' do
+        expect(browser.div(text: /some visible some hidden/)).to_not exist
       end
     end
   end

data/spec/watirspec/elements/element_spec.rb

@@ -40,11 +40,13 @@ describe 'Element' do
       expect { element.text }.to_not raise_error
     end
 
-    it 'relocates stale element when taking an action on it' do
-      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-      element = browser.text_field(id: 'new_user_first_name').locate
-      browser.refresh
-      expect { element.click }.not_to raise_exception
+    compliant_on :relaxed_locate do
+      it 'relocates stale element when taking an action on it' do
+        browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
+        element = browser.text_field(id: 'new_user_first_name').locate
+        browser.refresh
+        expect { element.click }.not_to raise_exception
+      end
     end
   end
 
@@ -293,7 +295,9 @@ describe 'Element' do
       element.cache = wd
 
       browser.refresh
-      expect(element).to_not exist
+      expect {
+        expect(element).to_not exist
+      }.to have_deprecated_stale_exists
     end
   end
 
@@ -921,10 +925,12 @@ describe 'Element' do
       end
     end
 
-    it 'returns false if element\'s center is surrounded by non-descendants' do
-      btn = browser.button(id: 'surrounded')
-      expect(btn).not_to be_obscured
-      expect { btn.click }.not_to raise_exception
+    not_compliant_on %i[firefox appveyor] do
+      it 'returns false if element\'s center is surrounded by non-descendants' do
+        btn = browser.button(id: 'surrounded')
+        expect(btn).not_to be_obscured
+        expect { btn.click }.not_to raise_exception
+      end
     end
 
     it 'scrolls interactive element into view before checking if obscured' do

data/spec/watirspec/elements/iframe_spec.rb

@@ -10,7 +10,8 @@ describe 'IFrame' do
   end
 
   not_compliant_on :safari do
-    bug 'Firefox 58 broke this, apperas to be working in Nightly', %i[firefox linux] do
+    bug 'Firefox 58 broke this, appears to be working in Nightly',
+        %i[firefox linux], %i[firefox appveyor] do
       it 'handles crossframe javascript' do
         browser.goto WatirSpec.url_for('iframes.html')
 

data/spec/watirspec/elements/labels_spec.rb

@@ -13,7 +13,7 @@ describe 'Labels' do
 
   describe '#length' do
     it 'returns the number of labels' do
-      expect(browser.labels.length).to eq 42
+      expect(browser.labels.length).to eq 45
     end
   end
 

data/spec/watirspec/elements/table_spec.rb

@@ -103,7 +103,6 @@ describe 'Table' do
 
     it 'finds rows belonging to this table' do
       expect(table.row(id: 'outer_last')).to exist
-      table.row(text: 'Table 1, Row 1, Cell 1').locate
       expect(table.row(text: /Table 1, Row 1, Cell 1/)).to exist
     end
 

data/spec/watirspec/html/forms_with_input_elements.html

@@ -178,5 +178,16 @@
   <select id="single-quote">
     <option>'foo'</option>
   </select>
+
+  <fieldset id="visible_label">
+      <label for="all_visible_label">all visible</label>
+      <input type="checkbox" id="all_visible_label">
+
+      <label for="some_visible_label">some visible<span style="display:none;"> some hidden</span></label>
+      <input type="checkbox" id="some_visible_label">
+
+      <label for="no_visible_label" style="display:none;">none visible</label>
+      <input type="checkbox" id="no_visible_label">
+  </fieldset>
   </body>
 </html>

data/spec/watirspec/relaxed_locate_spec.rb

@@ -1,7 +1,7 @@
 require 'watirspec_helper'
 
 describe 'Watir#relaxed_locate?' do
-  not_compliant_on :not_relaxed_locate do
+  compliant_on :relaxed_locate do
     context 'when true' do
       before :each do
         browser.goto(WatirSpec.url_for('wait.html'))

data/spec/watirspec/support/rspec_matchers.rb

@@ -2,6 +2,7 @@ if defined?(RSpec)
   DEPRECATION_WARNINGS = %i[selector_parameters
                             element_cache
                             ready_state
+                            caption
                             class_array
                             use_capabilities
                             visible_text
@@ -26,6 +27,8 @@ if defined?(RSpec)
       end
 
       failure_message do |_actual|
+        return 'unexpected exception in the custom matcher block' unless @stdout_message
+
         deprecations_found = @stdout_message[/WARN Watir \[DEPRECATION\] ([^.*\ ]*)/, 1]
         but_message = if deprecations_found.nil?
                         'no Warnings were found'

data/spec/watirspec/window_switching_spec.rb

@@ -403,16 +403,16 @@ describe 'Window' do
       it 'should get the size of the current window' do
         size = browser.window.size
 
-        expect(size.width).to be > 0
-        expect(size.height).to be > 0
+        expect(size.width).to eq browser.execute_script('return window.outerWidth;')
+        expect(size.height).to eq browser.execute_script('return window.outerHeight;')
       end
     end
 
     it 'should get the position of the current window' do
       pos = browser.window.position
 
-      expect(pos.x).to be >= 0
-      expect(pos.y).to be >= 0
+      expect(pos.x).to eq browser.execute_script('return window.screenX;')
+      expect(pos.y).to eq browser.execute_script('return window.screenY;')
     end
 
     not_compliant_on :headless do

data/spec/watirspec_helper.rb

@@ -29,9 +29,13 @@ class LocalConfig
   def load_webdrivers
     case browser
     when :chrome
+      Webdrivers::Chromedriver.version = 2.44 if ENV['APPVEYOR']
       Webdrivers::Chromedriver.update
+      Watir.logger.info "chromedriver version: #{Webdrivers::Chromedriver.current_version.version}"
     when :firefox
+      Webdrivers::Geckodriver.version = '0.20.1' if ENV['APPVEYOR']
       Webdrivers::Geckodriver.update
+      Watir.logger.info "geckodriver version: #{Webdrivers::Geckodriver.current_version.version}"
     end
   end
 
@@ -78,13 +82,15 @@ class LocalConfig
   end
 
   def common_guards
-    matching_guards = [:webdriver]
-
-    matching_guards << browser
+    matching_guards = [browser]
     matching_guards << [browser, Selenium::WebDriver::Platform.os]
     matching_guards << :relaxed_locate if Watir.relaxed_locate?
-    matching_guards << :not_relaxed_locate unless Watir.relaxed_locate?
     matching_guards << :headless if @imp.browser_args.last[:headless]
+    # TODO: Replace this with Selenium::WebDriver::Platform.ci after next Selenium Release
+    if ENV['APPVEYOR']
+      matching_guards << :appveyor
+      matching_guards << [browser, :appveyor]
+    end
 
     if !Selenium::WebDriver::Platform.linux? || ENV['DESKTOP_SESSION']
       # some specs (i.e. Window#maximize) needs a window manager on linux

data/watir.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.3.0'
 
   s.platform = Gem::Platform::RUBY
-  s.authors = ['Alex Rodionov', 'Titus Fortner']
-  s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com']
+  s.authors = ['Alex Rodionov', 'Titus Fortner', 'Justin Ko']
+  s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com', 'jkotests@gmail.com ']
   s.homepage = 'http://github.com/watir/watir'
   s.summary = 'Watir powered by Selenium'
   s.description = <<~DESCRIPTION_MESSAGE
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'selenium_statistics'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simplecov-console'
-  s.add_development_dependency 'webdrivers', '~> 3.4.2'
+  s.add_development_dependency 'webdrivers', '~> 3.5.2'
   s.add_development_dependency 'webidl', '>= 0.2.2'
   s.add_development_dependency 'yard', '> 0.8.2.1'
   s.add_development_dependency 'yard-doctest', '>= 0.1.8'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.16.0
+  version: 6.16.1
 platform: ruby
 authors:
 - Alex Rodionov
 - Titus Fortner
+- Justin Ko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2018-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -219,14 +220,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: webidl
   requirement: !ruby/object:Gem::Requirement
@@ -275,6 +276,7 @@ description: |
 email:
 - p0deje@gmail.com
 - titusfortner@gmail.com
+- 'jkotests@gmail.com '
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -357,6 +359,7 @@ files:
 - lib/watir/js_snippets/elementObscured.js
 - lib/watir/js_snippets/fireEvent.js
 - lib/watir/js_snippets/focus.js
+- lib/watir/js_snippets/getElementTags.js
 - lib/watir/js_snippets/getInnerHtml.js
 - lib/watir/js_snippets/getInnerText.js
 - lib/watir/js_snippets/getOuterHtml.js
@@ -434,7 +437,6 @@ files:
 - spec/watirspec/alert_spec.rb
 - spec/watirspec/attributes_spec.rb
 - spec/watirspec/browser_spec.rb
-- spec/watirspec/click_spec.rb
 - spec/watirspec/cookies_spec.rb
 - spec/watirspec/drag_and_drop_spec.rb
 - spec/watirspec/element_hidden_spec.rb
@@ -595,7 +597,6 @@ files:
 - spec/watirspec/wait_spec.rb
 - spec/watirspec/window_switching_spec.rb
 - spec/watirspec_helper.rb
-- support/appveyor.cmd
 - support/doctest_helper.rb
 - support/travis.sh
 - support/version_differ.rb
@@ -649,7 +650,6 @@ test_files:
 - spec/watirspec/alert_spec.rb
 - spec/watirspec/attributes_spec.rb
 - spec/watirspec/browser_spec.rb
-- spec/watirspec/click_spec.rb
 - spec/watirspec/cookies_spec.rb
 - spec/watirspec/drag_and_drop_spec.rb
 - spec/watirspec/element_hidden_spec.rb

data/spec/watirspec/click_spec.rb

@@ -1,19 +0,0 @@
-require 'watirspec_helper'
-
-describe Watir::Element do
-  describe '#click' do
-    before do
-      browser.goto WatirSpec.url_for('clicks.html')
-    end
-
-    let(:clicker) { browser.element(id: 'click-logger') }
-    let(:log)     { browser.element(id: 'log').ps.map(&:text) }
-
-    bug 'https://github.com/watir/watir/issues/343', :webdriver do
-      it 'clicks an element with text in nested text node using text selector' do
-        browser.element(text: 'Can You Click This?').click
-        expect(browser.element(text: 'You Clicked It!')).to exist
-      end
-    end
-  end
-end

data/support/appveyor.cmd

@@ -1,9 +0,0 @@
-if "%RAKE_TASK%"=="spec:firefox" (
-  choco install -y curl
-  choco install -y 7zip.commandline
-  curl -L -O --insecure https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-win32.zip
-  7za e geckodriver-v0.11.1-win32.zip
-  move geckodriver.exe C:\Tools\WebDriver
-
-  geckodriver.exe --version
-)