watir 6.16.1 → 6.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2b4db146f289ef46ceb5bf9b9faabdad94743ba
-  data.tar.gz: 4b54ec483198de8c748bffdfda298770c4c9c40e
+  metadata.gz: d9b4ce5fc3a28e83b85751052967ecdaa6d87b4d
+  data.tar.gz: 82dc5e6c96e4f259c12865a198503b39674094b7
 SHA512:
-  metadata.gz: f1c78b53e3d1243c9a6dc0aa94d6844f174460798da81b76488449e34b2ca695b61e18bc8739a8ee2095d430a6d904bd8cd0cb3b6f8464129d7b1c5f3670c068
-  data.tar.gz: 26147c5fa67a6b6289488ad39eae1ec3ad2f82af18a886d6d13935658fdaf138a8a8278a8dda58a5a71b82f9467a3aa9bfc96e0e80aa5f0a321a4317c4202605
+  metadata.gz: f57ef0d029dd2c0bd703d416288a1f65cfd0a1aaab36e33bd79924b54ae5cb796774fa44e2a728e508d1af0cf8e11bb7b595851d0d59b3ee587c5feed42f808e
+  data.tar.gz: 18f052aaca388fef0191bf23c115cac21bff5aed3f692d6e5c1794ef13cf555f6745f2b8b569f7f3a760a843226844f6ef53dc43ef9c95efb532bf0e6a7e9d67

data/CHANGES.md

@@ -1,3 +1,9 @@
+### 6.16.2 (2018-12-24)
+
+* Fix bug merging scope when locating nested elements with css locator (#841)
+* Fix bug with IFrame#to_subtype
+* Improve performance for nested frames
+
 ### 6.16.1 (2018-12-23)
 
 * Improve collection performance with JavaScript (thanks Lucas Tierney)

data/lib/watir/after_hooks.rb

@@ -65,9 +65,12 @@ module Watir
     #
 
     def run
-      return unless @after_hooks.any? && @browser.window.present? && !@browser.alert.exists?
+      # We can't just rescue exception because Firefox automatically closes alert when exception raised
+      return unless @after_hooks.any? && !@browser.alert.exists?
 
       each { |after_hook| after_hook.call(@browser) }
+    rescue Selenium::WebDriver::Error::NoSuchWindowError => ex
+      Watir.logger.info "Could not execute After Hooks because browser window was closed #{ex}"
     end
 
     #

data/lib/watir/browser.rb

@@ -270,18 +270,6 @@ module Watir
       after_hooks.run
     end
 
-    #
-    # @api private
-    #
-    # Always relocate a Browser to ensure proper context switching
-    #
-    # @return [Boolean]
-    #
-
-    def relocate?
-      true
-    end
-
     def browser
       self
     end

data/lib/watir/element_collection.rb

@@ -182,7 +182,7 @@ module Watir
     end
 
     def ensure_context
-      @query_scope.locate if @query_scope.relocate?
+      @query_scope.locate if @query_scope.is_a?(Browser) || @query_scope.located? && @query_scope.stale?
       @query_scope.switch_to! if @query_scope.is_a?(IFrame)
     end
 

data/lib/watir/elements/element.rb

@@ -643,19 +643,6 @@ module Watir
       @element = element
     end
 
-    #
-    # @api private
-    #
-    # This is a performance shortcut for ensuring context
-    # Returns true if ensuring context requires relocating the element.
-    #
-    # @return [Boolean]
-    #
-
-    def relocate?
-      located? && stale?
-    end
-
     #
     # @api private
     #
@@ -733,7 +720,7 @@ module Watir
     end
 
     def ensure_context
-      @query_scope.locate if @query_scope.relocate?
+      @query_scope.locate if @query_scope.is_a?(Browser) || @query_scope.located? && @query_scope.stale?
       @query_scope.switch_to! if @query_scope.is_a?(IFrame)
     end
 

data/lib/watir/elements/iframe.rb

@@ -65,15 +65,12 @@ module Watir
     end
 
     #
-    # @api private
-    #
-    # Always relocate a FramedDriver to ensure proper context switching
-    #
-    # @return [Boolean]
+    # Cast this Element instance to a more specific subtype.
+    # Cached element needs to be the IFrame element, not the FramedDriver
     #
 
-    def relocate?
-      true
+    def to_subtype
+      super.tap { |el| el.cache = @element }
     end
 
     private

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

@@ -25,8 +25,8 @@ module Watir
                                  ids: [:value_button])
         end
 
-        def validate_tag(element, _tag_name)
-          tag_name = element.tag_name.downcase
+        def validate_tag(element, _expected)
+          tag_name = fetch_value(element, :tag_name)
           return unless %w[input button].include?(tag_name)
 
           # TODO: - Verify this is desired behavior based on https://bugzilla.mozilla.org/show_bug.cgi?id=1290963

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

@@ -2,7 +2,7 @@ module Watir
   module Locators
     class Cell
       class SelectorBuilder < Element::SelectorBuilder
-        def use_scope?
+        def merge_scope?
           false
         end
       end

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

@@ -14,7 +14,7 @@ module Watir
 
         def locate(built)
           @built = built.dup
-          @driver_scope = (@built.delete(:scope) || @query_scope.browser).wd
+          @driver_scope = locator_scope.wd
           matching_elements(@built, :first)
         rescue Selenium::WebDriver::Error::NoSuchElementError
           nil
@@ -22,7 +22,7 @@ module Watir
 
         def locate_all(built)
           @built = built.dup
-          @driver_scope = (@built.delete(:scope) || @query_scope.browser).wd
+          @driver_scope = locator_scope.wd
           raise ArgumentError, "can't locate all elements by :index" if built.key?(:index)
 
           [matching_elements(@built, :all)].flatten
@@ -52,6 +52,10 @@ module Watir
           end
         end
 
+        def locator_scope
+          @built.delete(:scope) || @query_scope.browser
+        end
+
         def locate_element(how, what, scope = driver_scope)
           scope.find_element(how, what)
         end

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

@@ -82,6 +82,8 @@ module Watir
 
         def fetch_value(element, how)
           case how
+          when :tag_name
+            element.tag_name.downcase
           when :text
             element.text
           when :visible
@@ -106,8 +108,9 @@ module Watir
           idx.abs - 1
         end
 
-        def validate_tag(element, tag_name)
-          matches_values?(element.tag_name.downcase, tag_name)
+        def validate_tag(element, expected)
+          tag_name = fetch_value(element, :tag_name)
+          matches_values?(tag_name, expected)
         end
 
         def deprecate_text_regexp(element, selector)

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

@@ -31,7 +31,7 @@ module Watir
           inspected = selector.inspect
           scope = @query_scope unless @selector.key?(:scope) || @query_scope.is_a?(Watir::Browser)
 
-          @built = wd_locator(@selector.keys).nil? ? build_wd_selector(@selector) : @selector
+          @built = wd_locators.empty? ? build_wd_selector(@selector) : @selector
           @built.delete(:index) if @built[:index]&.zero?
           @built[:scope] = scope if scope
 
@@ -39,17 +39,16 @@ module Watir
           @built
         end
 
-        def wd_locator(keys)
-          (Watir::Locators::W3C_FINDERS & keys).first
+        def wd_locators
+          Watir::Locators::W3C_FINDERS & @selector.keys
         end
 
         private
 
         def normalize_selector
-          wd_locators = @selector.keys & Watir::Locators::W3C_FINDERS
           raise LocatorException, "Can not locate element with #{wd_locators}" if wd_locators.size > 1
 
-          @selector[:scope] = @query_scope.selector_builder.built if use_scope?
+          @selector[:scope] = @query_scope.selector_builder.built if merge_scope?
 
           if @selector.key?(:class) || @selector.key?(:class_name)
             classes = ([@selector[:class]].flatten + [@selector.delete(:class_name)].flatten).compact
@@ -75,13 +74,13 @@ module Watir
           end
         end
 
-        def use_scope?
-          return false if @query_scope.is_a?(Browser)
+        def merge_scope?
+          return false unless (Watir::Locators::W3C_FINDERS + [:adjacent] & @selector.keys).empty?
 
-          !@selector.key?(:adjacent) &&
-            (Watir::Locators::W3C_FINDERS & @selector.keys).empty? &&
-            !(@query_scope.is_a?(Watir::IFrame) || @query_scope.is_a?(Watir::Radio)) &&
-            @query_scope.selector_builder.built&.size == 1
+          return false if [Watir::Browser, Watir::IFrame].any? { |k| @query_scope.is_a?(k) }
+
+          scope_invalid_locators = @query_scope.selector_builder.built.keys.reject { |key| key == wd_locator }
+          scope_invalid_locators.empty?
         end
 
         def deprecate_class_array(class_name)
@@ -142,9 +141,17 @@ module Watir
           @custom_attributes << attribute.to_s
         end
 
-        # Implement this method when creating a different selector builder
+        # Extensions implement this method when creating a different selector builder
+        def implementation_class
+          Kernel.const_get("#{self.class.name}::XPath")
+        end
+
         def build_wd_selector(selector)
-          Kernel.const_get("#{self.class.name}::XPath").new.build(selector)
+          implementation_class.new.build(selector)
+        end
+
+        def wd_locator
+          implementation_class::LOCATOR
         end
 
         def valid_attribute?(attribute)

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

@@ -8,6 +8,8 @@ module Watir
 
           CAN_NOT_BUILD = %i[visible visible_text visible_label_element].freeze
 
+          LOCATOR = :xpath
+
           def build(selector)
             @selector = selector
 

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

@@ -4,10 +4,10 @@ module Watir
       class SelectorBuilder < Element::SelectorBuilder
         def build_wd_selector(selector)
           scope_tag_name = @query_scope.selector[:tag_name] || @query_scope.tag_name
-          Kernel.const_get("#{self.class.name}::XPath").new.build(selector, scope_tag_name)
+          implementation_class.new.build(selector, scope_tag_name)
         end
 
-        def use_scope?
+        def merge_scope?
           false
         end
       end

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

@@ -29,8 +29,9 @@ module Watir
           # does not apply to text_field
         end
 
-        def validate_tag(element, _tag_name)
-          matches_values?(element.tag_name.downcase, 'input')
+        def validate_tag(element, _expected)
+          tag_name = fetch_value(element, :tag_name)
+          matches_values?(tag_name, 'input')
         end
       end
     end

data/lib/watir/version.rb

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

data/spec/unit/selector_builder/element_spec.rb

@@ -44,7 +44,7 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'raises exception when using xpath & css' do
         selector = {xpath: './/*', css: 'div'}
-        msg = 'Can not locate element with [:xpath, :css]'
+        msg = 'Can not locate element with [:css, :xpath]'
 
         expect { selector_builder.build(selector) }.to raise_exception Watir::Exception::LocatorException, msg
       end
@@ -668,9 +668,9 @@ describe Watir::Locators::Element::SelectorBuilder do
       end
     end
 
-    context 'with element scope' do
+    context 'with generic element scope' do
       let(:query_scope) { instance_double Watir::HTMLElement }
-      let(:scope_built) { @scope_built || {xpath: ".//*[local-name()='div'][@id='table-rows-test']"} }
+      let(:scope_built) { {xpath: ".//*[local-name()='div'][@id='table-rows-test']"} }
 
       before do
         allow(query_scope).to receive(:selector_builder).and_return(selector_builder)
@@ -709,11 +709,31 @@ describe Watir::Locators::Element::SelectorBuilder do
         expect(build_selector.delete(:scope)).to_not be_nil
         expect(build_selector).to eq built
       end
+    end
+
+    context 'with invalid query scopes' do
+      let(:query_scope) { instance_double Watir::HTMLElement }
 
       it 'does not use scope if query_scope built has multiple keys' do
+        scope_built = {xpath: ".//*[local-name()='div']", visible: true}
+        allow(selector_builder).to receive(:built).and_return(scope_built)
+        allow(query_scope).to receive(:selector_builder).and_return(selector_builder)
+
+        selector = {tag_name: 'div'}
+        built = {xpath: ".//*[local-name()='div']"}
+
+        build_selector = selector_builder.build(selector)
+        expect(build_selector.delete(:scope)).to_not be_nil
+        expect(build_selector).to eq built
+      end
+
+      it 'does not use scope if query_scope uses different Selenium Locator' do
+        scope_built = {css: '#foo'}
+        allow(selector_builder).to receive(:built).and_return(scope_built)
+        allow(query_scope).to receive(:selector_builder).and_return(selector_builder)
+
         selector = {tag_name: 'div'}
         built = {xpath: ".//*[local-name()='div']"}
-        scope_built[:visible] = true
 
         build_selector = selector_builder.build(selector)
         expect(build_selector.delete(:scope)).to_not be_nil
@@ -721,7 +741,7 @@ describe Watir::Locators::Element::SelectorBuilder do
       end
     end
 
-    context 'with specific scope' do
+    context 'with specific element scope' do
       let(:scope_built) { {xpath: ".//*[local-name()='iframe'][@id='one']"} }
 
       it 'does not use scope if query scope is an IFrame' do

data/spec/watirspec/after_hooks_spec.rb

@@ -160,64 +160,56 @@ describe 'Browser::AfterHooks' do
     end
 
     not_compliant_on :safari, :headless do
-      bug 'chromedriver 2.43 https://bugs.chromium.org/p/chromedriver/issues/detail?id=2615', :chrome do
-        it 'does not run error checks with alert present' do
-          browser.goto WatirSpec.url_for('alerts.html')
+      it 'does not run error checks with alert present' do
+        browser.goto WatirSpec.url_for('alerts.html')
 
-          @page_after_hook = proc { @yield = browser.title == 'Alerts' }
-          browser.after_hooks.add @page_after_hook
+        @page_after_hook = proc { @yield = browser.title == 'Alerts' }
+        browser.after_hooks.add @page_after_hook
 
-          browser.button(id: 'alert').click
-          expect(@yield).to be_nil
+        browser.button(id: 'alert').click
+        expect(@yield).to be_nil
 
-          browser.alert.ok
-          expect(@yield).to eq true
-        end
+        browser.alert.ok
+        expect(@yield).to eq true
       end
     end
 
     not_compliant_on :headless do
-      bug 'chromedriver 2.43 https://bugs.chromium.org/p/chromedriver/issues/detail?id=2615', :chrome do
-        it 'does not raise error when running error checks using #after_hooks#without with alert present' do
-          url = WatirSpec.url_for('alerts.html')
-          @page_after_hook = proc { browser.url }
-          browser.after_hooks.add @page_after_hook
-          browser.goto url
-          expect { browser.after_hooks.without { browser.button(id: 'alert').click } }.to_not raise_error
-          browser.alert.ok
-        end
+      it 'does not raise error when running error checks using #after_hooks#without with alert present' do
+        url = WatirSpec.url_for('alerts.html')
+        @page_after_hook = proc { browser.url }
+        browser.after_hooks.add @page_after_hook
+        browser.goto url
+        expect { browser.after_hooks.without { browser.button(id: 'alert').click } }.to_not raise_error
+        browser.alert.ok
+      end
+    end
+
+    not_compliant_on :headless do
+      it 'does not raise error if no error checks are defined with alert present' do
+        url = WatirSpec.url_for('alerts.html')
+        @page_after_hook = proc { browser.url }
+        browser.after_hooks.add @page_after_hook
+        browser.goto url
+        browser.after_hooks.delete @page_after_hook
+        expect { browser.button(id: 'alert').click }.to_not raise_error
+        browser.alert.ok
       end
     end
 
-    bug 'chromedriver 2.43 https://bugs.chromium.org/p/chromedriver/issues/detail?id=2615', :chrome do
+    bug 'https://bugzilla.mozilla.org/show_bug.cgi?id=1223277', :firefox do
       not_compliant_on :headless do
-        it 'does not raise error if no error checks are defined with alert present' do
-          url = WatirSpec.url_for('alerts.html')
+        it 'does not raise error when running error checks on closed window' do
+          url = WatirSpec.url_for('window_switching.html')
           @page_after_hook = proc { browser.url }
           browser.after_hooks.add @page_after_hook
           browser.goto url
-          browser.after_hooks.delete @page_after_hook
-          expect { browser.button(id: 'alert').click }.to_not raise_error
-          browser.alert.ok
-        end
-      end
-    end
+          browser.a(id: 'open').click
 
-    bug 'chromedriver 2.43 https://bugs.chromium.org/p/chromedriver/issues/detail?id=2615', :chrome do
-      bug 'https://bugzilla.mozilla.org/show_bug.cgi?id=1223277', :firefox do
-        not_compliant_on :headless do
-          it 'does not raise error when running error checks on closed window' do
-            url = WatirSpec.url_for('window_switching.html')
-            @page_after_hook = proc { browser.url }
-            browser.after_hooks.add @page_after_hook
-            browser.goto url
-            browser.a(id: 'open').click
-
-            window = browser.window(title: 'closeable window')
-            window.use
-            expect { browser.a(id: 'close').click }.to_not raise_error
-            browser.original_window.use
-          end
+          window = browser.window(title: 'closeable window')
+          window.use
+          expect { browser.a(id: 'close').click }.to_not raise_error
+          browser.original_window.use
         end
       end
     end

data/spec/watirspec/elements/checkbox_spec.rb

@@ -26,24 +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
+    not_compliant_on :watigiri do
+      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
     end
 
     it 'returns true if the checkbox button exists (search by name and value)' do

data/spec/watirspec/elements/div_spec.rb

@@ -149,8 +149,10 @@ describe 'Div' do
       end
 
       # 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
+      not_compliant_on :watigiri do
+        it 'does not locate entire content with regular expressions' do
+          expect(browser.div(text: /some visible some hidden/)).to_not exist
+        end
       end
     end
   end

data/spec/watirspec/elements/iframe_spec.rb

@@ -115,7 +115,6 @@ describe 'IFrame' do
       not_compliant_on :safari do
         it 'handles nested iframes' do
           browser.goto(WatirSpec.url_for('nested_iframes.html'))
-
           browser.iframe(id: 'two').iframe(id: 'three').link(id: 'four').click
 
           Watir::Wait.until { browser.title == 'definition_lists' }
@@ -151,7 +150,7 @@ describe 'IFrame' do
 
   it 'switches when the frame is created by subtype' do
     subtype = browser.iframe.to_subtype
-    expect { subtype.iframe.exist? }.to_not raise_exception
+    expect { subtype.element.locate }.to_not raise_exception
   end
 
   it 'switches back to top level browsing context' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.16.1
+  version: 6.16.2
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2018-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver