watir 6.0.0.beta3 → 6.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415906101dfc75ea43c273284261099c71e45448
-  data.tar.gz: 5423e34c7bd7ed2aaa931b8c4e3d6c2c36de19de
+  metadata.gz: 04b089bcf4e58208a441dedb2d2404b8e20e2967
+  data.tar.gz: 1994d0b6cc7f8c5c763da8558447f73bade0d3b9
 SHA512:
-  metadata.gz: 73d3a41a599ed85ef1fd8fd16471d740d93781f590d8322eb3c09ad58e9100a914c96832267151fadc9d75e0ae46d69305db648dc951ee9cfdc4c558ce05e6eb
-  data.tar.gz: 0c073bc094065d5e986cd1d1a7ae38509a966c7845a9189b31b1b0034b782214ae362e3082f1f10a79ddf5ea2b0ce8925b281eabcc95419aa3f85c51c80d0aac
+  metadata.gz: 4cdae8a09deebfaab7adb7cf413d5f3a4043485d716fa52c87deadf00d6c4d46e8644d9e16c1b1c285abdc4e6f5fe3104f10ace01264b897332835169d0003d7
+  data.tar.gz: b220f0b235362602d735a17967c8e87859f864a65df54145ff87ed1a08ed4b650a07908e64513f2adaf558f1d5713dd2d35cd9e84b0e4b66b4e5edf65e2d8239

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 rvm:
   - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3.1
 addons:
   firefox: latest
   apt:
@@ -24,12 +24,6 @@ before_script:
 script: bundle exec rake $RAKE_TASK
 env:
   - RAKE_TASK=spec:firefox
-  - RAKE_TASK=spec:firefox ALWAYS_LOCATE=false
-  - RAKE_TASK=spec:firefox PREFER_CSS=1 SELECTOR_STATS=1
   - RAKE_TASK=spec:chrome
-  - RAKE_TASK=spec:chrome ALWAYS_LOCATE=false
-  - RAKE_TASK=spec:chrome PREFER_CSS=1 SELECTOR_STATS=1
   - RAKE_TASK=spec:phantomjs
-  - RAKE_TASK=spec:phantomjs ALWAYS_LOCATE=false
-  - RAKE_TASK=spec:phantomjs PREFER_CSS=1 SELECTOR_STATS=1
   - RAKE_TASK=yard:doctest

data/CHANGES.md

@@ -1,3 +1,11 @@
+### 6.0.0.beta4 (2016-09-12)
+
+* Deprecate Watir#prefer_css setting
+* Deprecate Watir#always_locate setting
+* Add `Element#stale?`
+* Add `Element#wait_until_stale`
+* Allow locating date/time/etc. input types with `#text_field` (#295)
+
 ### 6.0.0.beta3 (2016-08-07)
 
 * Deprecate `require "watir-webdriver"` in favor of `require "watir"`

data/lib/watir.rb

@@ -14,45 +14,61 @@ require 'watir/screenshot'
 require 'watir/after_hooks'
 
 module Watir
-  @always_locate = true
 
   class << self
-    def always_locate?
-      @always_locate
-    end
 
     #
-    # Whether or not Watir should cache element references or always re-locate an Element on use.
-    # Defaults to true.
+    # Whether or not Watir should re-locate a stale Element on use.
     #
 
-    def always_locate=(bool)
-      @always_locate = bool
+    def always_locate?
+      always_locate_message
+      true
     end
 
-    def default_timeout
-      @default_timeout ||= 30
+    def always_locate=(_bool)
+      always_locate_message
+    end
+
+    def always_locate_message
+      warn <<-EOS
+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.
+      EOS
     end
 
     #
-    # Default wait time for wait methods.
+    # Whether or not Watir should prefer CSS when translating the Watir selectors to Selenium.
     #
 
-    def default_timeout=(value)
-      @default_timeout = value
+    def prefer_css?
+      prefer_css_message
+      false
     end
 
-    def prefer_css?
-      @prefer_css
+    def prefer_css=(_bool)
+      prefer_css_message
+    end
+
+    def prefer_css_message
+      warn <<-EOS
+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
+      EOS
+    end
+
+    def default_timeout
+      @default_timeout ||= 30
     end
 
     #
-    # Whether or not Watir should prefer CSS when translating the Watir selectors to Selenium.
-    # Defaults to false.
+    # Default wait time for wait methods.
     #
 
-    def prefer_css=(bool)
-      @prefer_css = bool
+    def default_timeout=(value)
+      @default_timeout = value
     end
 
     def locator_namespace

data/lib/watir/atoms.rb

@@ -8,7 +8,6 @@ module Watir
     end
 
     load :fireEvent
-    load :getAttribute
     load :getOuterHtml
     load :getInnerHtml
     load :getParentElement

data/lib/watir/browser.rb

@@ -152,9 +152,9 @@ module Watir
     # Returns browser name.
     #
     # @example
-    #   browser = Watir::Browser.new :chrome
+    #   browser = Watir::Browser.new :phantomjs
     #   browser.name
-    #   #=> :chrome
+    #   #=> :phantomjs
     #
     # @return [Symbol]
     #

data/lib/watir/element_collection.rb

@@ -7,8 +7,8 @@ module Watir
   class ElementCollection
     include Enumerable
 
-    def initialize(parent, selector)
-      @parent   = parent
+    def initialize(query_scope, selector)
+      @query_scope = query_scope
       @selector = selector
     end
 
@@ -50,7 +50,7 @@ module Watir
     #
 
     def [](idx)
-      to_a[idx] || element_class.new(@parent, @selector.merge(index: idx))
+      to_a[idx] || element_class.new(@query_scope, @selector.merge(index: idx))
     end
 
     #
@@ -81,17 +81,17 @@ module Watir
 
     def to_a
       # TODO: optimize - lazy element_class instance?
-      @to_a ||= elements.map { |e| element_class.new(@parent, element: e) }
+      @to_a ||= elements.map { |e| element_class.new(@query_scope, element: e) }
     end
 
     private
 
     def elements
-      @parent.is_a?(IFrame) ? @parent.switch_to! : @parent.send(:assert_exists)
+      @query_scope.is_a?(IFrame) ? @query_scope.switch_to! : @query_scope.send(:assert_exists)
 
       element_validator = element_validator_class.new
-      selector_builder = selector_builder_class.new(@parent, @selector, element_class.attribute_list)
-      locator = locator_class.new(@parent, @selector, selector_builder, element_validator)
+      selector_builder = selector_builder_class.new(@query_scope, @selector, element_class.attribute_list)
+      locator = locator_class.new(@query_scope, @selector, selector_builder, element_validator)
 
       @elements ||= locator.locate_all
     end

data/lib/watir/elements/element.rb

@@ -22,10 +22,10 @@ module Watir
     attribute String, :id, :id
     attribute String, :class_name, :className
 
-    def initialize(parent, selector)
-      @parent   = parent
+    def initialize(query_scope, selector)
+      @query_scope = query_scope
       @selector = selector
-      @element  = nil
+      @element = nil
 
       unless @selector.kind_of? Hash
         raise ArgumentError, "invalid argument: #{selector.inspect}"
@@ -371,7 +371,7 @@ module Watir
       e = element_call { execute_atom :getParentElement, @element }
 
       if e.kind_of?(Selenium::WebDriver::Element)
-        Watir.element_class_for(e.tag_name.downcase).new(@parent, element: e)
+        Watir.element_class_for(e.tag_name.downcase).new(@query_scope, element: e)
       end
     end
 
@@ -380,7 +380,7 @@ module Watir
     #
 
     def driver
-      @parent.driver
+      @query_scope.driver
     end
 
     #
@@ -407,6 +407,7 @@ module Watir
     # Returns true if this element is present and enabled on the page.
     #
     # @return [Boolean]
+    # @see Watir::Wait
     #
 
     def enabled?
@@ -480,7 +481,7 @@ module Watir
         klass = Watir.element_class_for(tag_name)
       end
 
-      klass.new(@parent, element: elem)
+      klass.new(@query_scope, element: elem)
     end
 
     #
@@ -490,7 +491,22 @@ module Watir
     #
 
     def browser
-      @parent.browser
+      @query_scope.browser
+    end
+
+    #
+    # Returns true if a previously located element is no longer attached to DOM.
+    #
+    # @return [Boolean]
+    # @see Watir::Wait
+    #
+
+    def stale?
+      raise Watir::Exception::Error, "Can not check staleness of unused element" unless @element
+      @element.enabled? # any wire call will check for staleness
+      false
+    rescue Selenium::WebDriver::Error::ObsoleteElementError
+      true
     end
 
     protected
@@ -508,29 +524,16 @@ module Watir
       assert_element_found
     end
 
-    # Ensure that the element isn't stale, by relocating if it is (unless always_locate = false)
+    # Ensure that the element isn't stale, by relocating if it is
     def ensure_not_stale
+      ensure_context
+
       # Performance shortcut; only need recursive call to ensure context if stale in current context
       return unless stale?
-
-      ensure_context
-      if stale?
-        if Watir.always_locate? && !@selector[:element]
-          @element = locate
-        else
-          reset!
-        end
-      end
+      @element = @selector.key?(:element) ? nil : locate
       assert_element_found
     end
 
-    def stale?
-      @element.enabled? # any wire call will check for staleness
-      false
-    rescue Selenium::WebDriver::Error::ObsoleteElementError
-      true
-    end
-
     def assert_element_found
       unless @element
         raise UnknownObjectException, "unable to locate element, using #{selector_string}"
@@ -545,8 +548,8 @@ module Watir
       ensure_context
 
       element_validator = element_validator_class.new
-      selector_builder = selector_builder_class.new(@parent, @selector, self.class.attribute_list)
-      locator = locator_class.new(@parent, @selector, selector_builder, element_validator)
+      selector_builder = selector_builder_class.new(@query_scope, @selector, self.class.attribute_list)
+      locator = locator_class.new(@query_scope, @selector, selector_builder, element_validator)
 
       locator.locate
     end
@@ -581,14 +584,11 @@ module Watir
 
     # Ensure the driver is in the desired browser context
     def ensure_context
-      @parent.is_a?(IFrame) ? @parent.switch_to! : @parent.assert_exists
+      @query_scope.is_a?(IFrame) ? @query_scope.switch_to! : @query_scope.assert_exists
     end
 
-    def attribute?(attribute)
-      assert_exists
-      element_call do
-        !!execute_atom(:getAttribute, @element, attribute.to_s.downcase)
-      end
+    def attribute?(attribute_name)
+      !attribute_value(attribute_name).nil?
     end
 
     def assert_enabled
@@ -620,11 +620,7 @@ module Watir
     def element_call
       yield
     rescue Selenium::WebDriver::Error::StaleElementReferenceError
-      if Watir.always_locate? && !@selector[:element]
-        @element = locate
-      else
-        reset!
-      end
+      @element = @selector.key?(:element) ? nil : locate
       assert_element_found
       retry
     end

data/lib/watir/elements/iframe.rb

@@ -2,12 +2,12 @@ module Watir
   class IFrame < HTMLElement
 
     def locate
-      @parent.assert_exists
+      @query_scope.assert_exists
 
       selector = @selector.merge(tag_name: frame_tag)
       element_validator = element_validator_class.new
-      selector_builder = selector_builder_class.new(@parent, selector, self.class.attribute_list)
-      locator = locator_class.new(@parent, selector, selector_builder, element_validator)
+      selector_builder = selector_builder_class.new(@query_scope, selector, self.class.attribute_list)
+      locator = locator_class.new(@query_scope, selector, selector_builder, element_validator)
 
       element = locator.locate
       element or raise UnknownFrameException, "unable to locate #{@selector[:tag_name]} using #{selector_string}"
@@ -69,7 +69,7 @@ module Watir
       # index will return nil. That's why `#all_elements` should always
       # be called after `#elements.`
       element_indexes = elements.map { |el| all_elements.index(el) }
-      element_indexes.map { |idx| element_class.new(@parent, tag_name: @selector[:tag_name], index: idx) }
+      element_indexes.map { |idx| element_class.new(@query_scope, tag_name: @selector[:tag_name], index: idx) }
     end
 
     private
@@ -78,8 +78,8 @@ module Watir
       selector = { tag_name: @selector[:tag_name] }
 
       element_validator = element_validator_class.new
-      selector_builder = selector_builder_class.new(@parent, selector, element_class.attribute_list)
-      locator = locator_class.new(@parent, selector, selector_builder, element_validator)
+      selector_builder = selector_builder_class.new(@query_scope, selector, element_class.attribute_list)
+      locator = locator_class.new(@query_scope, selector, selector_builder, element_validator)
 
       locator.locate_all
     end

data/lib/watir/elements/text_field.rb

@@ -2,7 +2,7 @@ module Watir
   class TextField < Input
     include UserEditable
 
-    NON_TEXT_TYPES = %w[file radio checkbox submit reset image button hidden datetime date month week time datetime-local range color]
+    NON_TEXT_TYPES = %w[file radio checkbox submit reset image button hidden range color]
 
     inherit_attributes_from Watir::TextArea
     remove_method :type # we want Input#type here, which was overriden by TextArea's attributes

data/lib/watir/locators.rb

@@ -1,5 +1,6 @@
 require 'watir/locators/element/locator'
 require 'watir/locators/element/selector_builder'
+require 'watir/locators/element/selector_builder/xpath'
 require 'watir/locators/element/validator'
 
 require 'watir/locators/button/locator'

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

@@ -28,8 +28,8 @@ module Watir
           \z
         }x
 
-        def initialize(parent, selector, selector_builder, element_validator)
-          @parent = parent # either element or browser
+        def initialize(query_scope, selector, selector_builder, element_validator)
+          @query_scope = query_scope # either element or browser
           @selector = selector.dup
           @selector_builder = selector_builder
           @element_validator = element_validator
@@ -72,7 +72,7 @@ module Watir
           tag_name = selector.delete(:tag_name)
           return unless selector.empty? # multiple attributes
 
-          element = @parent.wd.find_element(:id, id)
+          element = @query_scope.wd.find_element(:id, id)
           return if tag_name && !element_validator.validate(element, selector)
 
           element
@@ -98,9 +98,9 @@ module Watir
           if how
             # could build xpath/css for selector
             if idx
-              @parent.wd.find_elements(how, what)[idx]
+              @query_scope.wd.find_elements(how, what)[idx]
             else
-              @parent.wd.find_element(how, what)
+              @query_scope.wd.find_element(how, what)
             end
           else
             # can't use xpath, probably a regexp in there
@@ -132,7 +132,7 @@ module Watir
 
           how, what = selector_builder.build(selector)
           if how
-            @parent.wd.find_elements(how, what)
+            @query_scope.wd.find_elements(how, what)
           else
             wd_find_by_regexp_selector(selector, :select)
           end
@@ -140,7 +140,7 @@ module Watir
 
         def wd_find_all_by(how, what)
           if what.is_a? String
-            @parent.wd.find_elements(how, what)
+            @query_scope.wd.find_elements(how, what)
           else
             all_elements.select { |element| fetch_value(element, how) =~ what }
           end
@@ -160,19 +160,19 @@ module Watir
         end
 
         def all_elements
-          @parent.wd.find_elements(xpath: ".//*")
+          @query_scope.wd.find_elements(xpath: ".//*")
         end
 
         def wd_find_first_by(how, what)
           if what.is_a? String
-            @parent.wd.find_element(how, what)
+            @query_scope.wd.find_element(how, what)
           else
             all_elements.find { |element| fetch_value(element, how) =~ what }
           end
         end
 
         def wd_find_by_regexp_selector(selector, method = :find)
-          parent = @parent.wd
+          query_scope = @query_scope.wd
           rx_selector = delete_regexps_from(selector)
 
           if rx_selector.key?(:label) && selector_builder.should_use_label_element?
@@ -180,7 +180,7 @@ module Watir
             if (id = label.attribute(:for))
               selector[:id] = id
             else
-              parent = label
+              query_scope = label
             end
           end
 
@@ -199,7 +199,7 @@ module Watir
             end
           end
 
-          elements = parent.find_elements(how, what)
+          elements = query_scope.find_elements(how, what)
           elements.__send__(method) { |el| matches_selector?(el, rx_selector) }
         end
 
@@ -217,7 +217,7 @@ module Watir
 
         def label_from_text(label_exp)
           # TODO: this won't work correctly if @wd is a sub-element
-          @parent.wd.find_elements(:tag_name, 'label').find do |el|
+          @query_scope.wd.find_elements(:tag_name, 'label').find do |el|
             matches_selector?(el, text: label_exp)
           end
         end

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

@@ -1,6 +1,3 @@
-require 'watir/locators/element/selector_builder/css'
-require 'watir/locators/element/selector_builder/xpath'
-
 module Watir
   module Locators
     class Element
@@ -8,8 +5,8 @@ module Watir
         VALID_WHATS = [String, Regexp]
         WILDCARD_ATTRIBUTE = /^(aria|data)_(.+)$/
 
-        def initialize(parent, selector, valid_attributes)
-          @parent = parent # either element or browser
+        def initialize(query_scope, selector, valid_attributes)
+          @query_scope = query_scope # either element or browser
           @selector = selector
           @valid_attributes = valid_attributes
         end
@@ -98,9 +95,8 @@ module Watir
         end
 
         def build_wd_selector(selectors)
-          unless selectors.values.any? { |e| e.is_a? Regexp }
-            build_css(selectors) || build_xpath(selectors)
-          end
+          return if selectors.values.any? { |e| e.is_a? Regexp }
+          build_xpath(selectors)
         end
 
         def valid_attribute?(attribute)
@@ -122,25 +118,12 @@ module Watir
           xpath_builder.build(selectors)
         end
 
-        def build_css(selectors)
-          css_builder.build(selectors)
-        end
-
         def xpath_builder_class
           Kernel.const_get("#{self.class.name}::XPath")
         rescue
           XPath
         end
 
-        def css_builder
-          @css_builder ||= css_builder_class.new
-        end
-
-        def css_builder_class
-          Kernel.const_get("#{self.class.name}::CSS")
-        rescue
-          CSS
-        end
       end
     end
   end

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

@@ -7,7 +7,7 @@ module Watir
           selectors.delete(:tag_name) || raise("internal error: no tag_name?!")
 
           expressions = %w[./tr]
-          unless %w[tbody tfoot thead].include?(@parent.tag_name.downcase)
+          unless %w[tbody tfoot thead].include?(@query_scope.tag_name.downcase)
             expressions += %w[./tbody/tr ./thead/tr ./tfoot/tr]
           end
 

data/lib/watir/wait.rb

@@ -242,8 +242,24 @@ module Watir
       timeout ||= Watir.default_timeout
       message = "waiting for #{selector_string} to disappear"
       Watir::Wait.while(timeout, message) { present? }
-    rescue Selenium::WebDriver::Error::StaleElementReferenceError
-      # it's not present
+    end
+
+    #
+    # Waits until the element is stale.
+    #
+    # @example
+    #   browser.text_field(name: "abrakadbra").wait_until_stale
+    #
+    # @param [Fixnum] timeout seconds to wait before timing out
+    #
+    # @see Watir::Wait
+    # @see Watir::Element#stale?
+    #
+
+    def wait_until_stale(timeout = nil)
+      timeout ||= Watir.default_timeout
+      message = "waiting for #{selector_string} to become stale"
+      Watir::Wait.until(timeout, message) { stale? }
     end
 
   end # EventuallyPresent

data/spec/browser_spec.rb

@@ -46,24 +46,22 @@ describe Watir::Browser do
     end
   end
 
-  bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1260233", :firefox do
-    describe "#send_key{,s}" do
-      it "sends keystrokes to the active element" do
-        browser.goto WatirSpec.url_for "forms_with_input_elements.html"
+  describe "#send_key{,s}" do
+    it "sends keystrokes to the active element" do
+      browser.goto WatirSpec.url_for "forms_with_input_elements.html"
 
-        browser.send_keys "hello"
-        expect(browser.text_field(id: "new_user_first_name").value).to eq "hello"
-      end
+      browser.send_keys "hello"
+      expect(browser.text_field(id: "new_user_first_name").value).to eq "hello"
+    end
 
-      it "sends keys to a frame" do
-        browser.goto WatirSpec.url_for "frames.html"
-        tf = browser.frame.text_field(id: "senderElement")
-        tf.clear
+    it "sends keys to a frame" do
+      browser.goto WatirSpec.url_for "frames.html"
+      tf = browser.frame.text_field(id: "senderElement")
+      tf.clear
 
-        browser.frame.send_keys "hello"
+      browser.frame.send_keys "hello"
 
-        expect(tf.value).to eq "hello"
-      end
+      expect(tf.value).to eq "hello"
     end
   end
 

data/spec/element_locator_spec.rb

@@ -15,42 +15,26 @@ describe Watir::Locators::Element::Locator do
 
     describe "with selectors not supported by Selenium" do
       it "handles selector with tag name and a single attribute" do
-        if Watir.prefer_css?
-          expect_one :css, 'div[title="foo"]'
-        else
-          expect_one :xpath, ".//div[@title='foo']"
-        end
+        expect_one :xpath, ".//div[@title='foo']"
 
         locate_one tag_name: "div",
                    title: "foo"
       end
 
       it "handles selector with no tag name and and a single attribute" do
-        if Watir.prefer_css?
-          expect_one :css, '[title="foo"]'
-        else
-          expect_one :xpath, ".//*[@title='foo']"
-        end
+        expect_one :xpath, ".//*[@title='foo']"
 
         locate_one title: "foo"
       end
 
       it "handles single quotes in the attribute string" do
-        if Watir.prefer_css?
-          expect_one :css, %{[title="foo and 'bar'"]}
-        else
-          expect_one :xpath, %{.//*[@title=concat('foo and ',"'",'bar',"'",'')]}
-        end
+        expect_one :xpath, %{.//*[@title=concat('foo and ',"'",'bar',"'",'')]}
 
         locate_one title: "foo and 'bar'"
       end
 
       it "handles selector with tag name and multiple attributes" do
-        if Watir.prefer_css?
-          expect_one :css, 'div[title="foo"][dir="bar"]'
-        else
-          expect_one :xpath, ".//div[@title='foo' and @dir='bar']"
-        end
+        expect_one :xpath, ".//div[@title='foo' and @dir='bar']"
 
         locate_one [:tag_name, "div",
                     :title   , "foo",
@@ -58,11 +42,7 @@ describe Watir::Locators::Element::Locator do
       end
 
       it "handles selector with no tag name and multiple attributes" do
-        if Watir.prefer_css?
-          expect_one :css, '[dir="foo"][title="bar"]'
-        else
-          expect_one :xpath, ".//*[@dir='foo' and @title='bar']"
-        end
+        expect_one :xpath, ".//*[@dir='foo' and @title='bar']"
 
         locate_one [:dir,   "foo",
                     :title, "bar"]
@@ -84,44 +64,28 @@ describe Watir::Locators::Element::Locator do
       end
 
       it "translates :class_name to :class" do
-        if Watir.prefer_css?
-          expect_one :css, "div.foo"
-        else
-          expect_one :xpath, ".//div[contains(concat(' ', @class, ' '), ' foo ')]"
-        end
+        expect_one :xpath, ".//div[contains(concat(' ', @class, ' '), ' foo ')]"
 
         locate_one tag_name: "div",
                    class_name: "foo"
       end
 
       it "handles data-* attributes" do
-        if Watir.prefer_css?
-          expect_one :css, 'div[data-name="foo"]'
-        else
-          expect_one :xpath, ".//div[@data-name='foo']"
-        end
+        expect_one :xpath, ".//div[@data-name='foo']"
 
         locate_one tag_name: "div",
                    data_name: "foo"
       end
 
       it "handles aria-* attributes" do
-        if Watir.prefer_css?
-          expect_one :css, 'div[aria-label="foo"]'
-        else
-          expect_one :xpath, ".//div[@aria-label='foo']"
-        end
+        expect_one :xpath, ".//div[@aria-label='foo']"
 
         locate_one tag_name: "div",
                    aria_label: "foo"
       end
 
       it "normalizes space for the :href attribute" do
-        if Watir.prefer_css?
-          expect_one :css, 'a[href~="foo"]'
-        else
-          expect_one :xpath, ".//a[normalize-space(@href)='foo']"
-        end
+        expect_one :xpath, ".//a[normalize-space(@href)='foo']"
 
         selector = {
           tag_name: "a",
@@ -164,11 +128,7 @@ describe Watir::Locators::Element::Locator do
       end
 
       it "translates ruby attribute names to content attribute names" do
-        if Watir.prefer_css?
-          expect_one :css, 'meta[http-equiv="foo"]'
-        else
-          expect_one :xpath, ".//meta[@http-equiv='foo']"
-        end
+        expect_one :xpath, ".//meta[@http-equiv='foo']"
 
         selector = {
           tag_name: "meta",
@@ -188,11 +148,7 @@ describe Watir::Locators::Element::Locator do
           element(tag_name: "div", attributes: { class: "foob"})
         ]
 
-        if Watir.prefer_css?
-          expect_all(:css, "div").and_return(elements)
-        else
-          expect_all(:xpath, "(.//div)[contains(@class, 'oob')]").and_return(elements)
-        end
+        expect_all(:xpath, "(.//div)[contains(@class, 'oob')]").and_return(elements)
 
         expect(locate_one(tag_name: "div", class: /oob/)).to eq elements[1]
       end
@@ -203,11 +159,7 @@ describe Watir::Locators::Element::Locator do
           element(tag_name: "div", attributes: { class: "foo" })
         ]
 
-        if Watir.prefer_css?
-          expect_all(:css, "div").and_return(elements)
-        else
-          expect_all(:xpath, "(.//div)[contains(@class, 'foo')]").and_return(elements)
-        end
+        expect_all(:xpath, "(.//div)[contains(@class, 'foo')]").and_return(elements)
 
         selector = {
           tag_name: "div",
@@ -256,11 +208,7 @@ describe Watir::Locators::Element::Locator do
           element(tag_name: "div", attributes: { dir: "foo", title: "baz" })
         ]
 
-        if Watir.prefer_css?
-          expect_all(:css, 'div[dir="foo"]').and_return(elements)
-        else
-          expect_all(:xpath, "(.//div[@dir='foo'])[contains(@title, 'baz')]").and_return(elements)
-        end
+        expect_all(:xpath, "(.//div[@dir='foo'])[contains(@title, 'baz')]").and_return(elements)
 
         selector = {
           tag_name: "div",
@@ -277,12 +225,7 @@ describe Watir::Locators::Element::Locator do
           element(tag_name: "div", attributes: { :'data-automation-id' => "bar" })
         ]
 
-        if Watir.prefer_css?
-          expect_all(:css, 'div').and_return(elements)
-        else
-          expect_all(:xpath, "(.//div)[contains(@data-automation-id, 'bar')]").and_return(elements)
-        end
-
+        expect_all(:xpath, "(.//div)[contains(@data-automation-id, 'bar')]").and_return(elements)
 
         selector = {
           tag_name: "div",
@@ -300,13 +243,7 @@ describe Watir::Locators::Element::Locator do
         div_elements = [element(tag_name: "div")]
 
         expect_all(:tag_name, "label").ordered.and_return(label_elements)
-
-        if Watir.prefer_css?
-          expect_all(:css, 'div[id="baz"]').ordered.and_return(div_elements)
-        else
-          expect_all(:xpath, ".//div[@id='baz']").ordered.and_return(div_elements)
-        end
-
+        expect_all(:xpath, ".//div[@id='baz']").ordered.and_return(div_elements)
         expect(locate_one(tag_name: "div", label: /oob/)).to eq div_elements.first
       end
 
@@ -323,11 +260,7 @@ describe Watir::Locators::Element::Locator do
         element(tag_name: "div")
       ]
 
-      if Watir.prefer_css?
-        expect_all(:css, 'div[dir="foo"]').and_return(elements)
-      else
-        expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
-      end
+      expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
 
       selector = {
         tag_name: "div",
@@ -382,35 +315,20 @@ describe Watir::Locators::Element::Locator do
 
     describe "with an empty selector" do
       it "finds all when an empty selctor is given" do
-        if Watir.prefer_css?
-          expect_all :css, '*'
-        else
-          expect_all :xpath, './/*'
-        end
-
+        expect_all :xpath, './/*'
         locate_all({})
       end
     end
 
     describe "with selectors not supported by Selenium" do
       it "handles selector with tag name and a single attribute" do
-        if Watir.prefer_css?
-          expect_all :css, 'div[dir="foo"]'
-        else
-          expect_all :xpath, ".//div[@dir='foo']"
-        end
-
+        expect_all :xpath, ".//div[@dir='foo']"
         locate_all tag_name: "div",
                    dir: "foo"
       end
 
       it "handles selector with tag name and multiple attributes" do
-        if Watir.prefer_css?
-          expect_all :css, 'div[dir="foo"][title="bar"]'
-        else
-          expect_all :xpath, ".//div[@dir='foo' and @title='bar']"
-        end
-
+        expect_all :xpath, ".//div[@dir='foo' and @title='bar']"
         locate_all [:tag_name, "div",
                     :dir     , "foo",
                     :title   , 'bar']
@@ -426,12 +344,7 @@ describe Watir::Locators::Element::Locator do
           element(tag_name: "div", attributes: { class: "noob"})
         ]
 
-        if Watir.prefer_css?
-          expect_all(:css, "div").and_return(elements)
-        else
-          expect_all(:xpath, "(.//div)[contains(@class, 'oob')]").and_return(elements)
-        end
-
+        expect_all(:xpath, "(.//div)[contains(@class, 'oob')]").and_return(elements)
         expect(locate_all(tag_name: "div", class: /oob/)).to eq elements.last(3)
       end
 
@@ -442,11 +355,7 @@ describe Watir::Locators::Element::Locator do
           element(tag_name: "div", attributes: { dir: "foo", title: "bazt"})
         ]
 
-        if Watir.prefer_css?
-          expect_all(:css, 'div[dir="foo"]').and_return(elements)
-        else
-          expect_all(:xpath, "(.//div[@dir='foo'])[contains(@title, 'baz')]").and_return(elements)
-        end
+        expect_all(:xpath, "(.//div[@dir='foo'])[contains(@title, 'baz')]").and_return(elements)
 
         selector = {
           tag_name: "div",
@@ -458,10 +367,6 @@ describe Watir::Locators::Element::Locator do
       end
 
       context "and xpath" do
-        before do
-          expect(Watir).to receive(:prefer_css?).and_return(false)
-        end
-
         it "converts a leading run of regexp literals to a contains() expression" do
           elements = [
             element(tag_name: "div", attributes: { class: "foo" }),

data/spec/element_spec.rb

@@ -93,11 +93,7 @@ describe Watir::Element do
         watir_element.send(:element_call) { watir_element.instance_variable_get('@element').text }
       end
 
-      if Watir.always_locate?
-        expect { watir_element.text }.to_not raise_error
-      else
-        expect { watir_element.text }.to raise_error Watir::Exception::UnknownObjectException
-      end
+      expect { watir_element.text }.to_not raise_error
     end
 
   end

data/spec/spec_helper.rb

@@ -11,14 +11,6 @@ require 'rspec'
 
 include Watir
 
-if ENV['ALWAYS_LOCATE'] == "false"
-  Watir.always_locate = false
-end
-
-if ENV['PREFER_CSS']
-  Watir.prefer_css = true
-end
-
 SELENIUM_SELECTORS = %i(class class_name css id tag_name xpath)
 
 if ENV['TRAVIS']

data/support/travis.sh

@@ -14,7 +14,9 @@ fi
 if [[ "$RAKE_TASK" = "spec:chrome" ]] || [[ "$RAKE_TASK" = "yard:doctest" ]]; then
   # https://omahaproxy.appspot.com
   # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/
-  CHROME_REVISION=386257
+  # CHROME_REVISION=`curl -s http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/LAST_CHANGE`
+  CHROME_REVISION=417841
+
   curl -L -O "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/${CHROME_REVISION}/chrome-linux.zip"
   unzip chrome-linux.zip
 

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.0.0.beta3'
+  s.version     = '6.0.0.beta4'
   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.0.0.beta3
+  version: 6.0.0.beta4
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -206,7 +206,6 @@ files:
 - lib/watir/atoms.rb
 - lib/watir/atoms/README
 - lib/watir/atoms/fireEvent.js
-- lib/watir/atoms/getAttribute.js
 - lib/watir/atoms/getInnerHtml.js
 - lib/watir/atoms/getOuterHtml.js
 - lib/watir/atoms/getParentElement.js
@@ -271,7 +270,6 @@ files:
 - lib/watir/locators/cell/selector_builder.rb
 - lib/watir/locators/element/locator.rb
 - lib/watir/locators/element/selector_builder.rb
-- lib/watir/locators/element/selector_builder/css.rb
 - lib/watir/locators/element/selector_builder/xpath.rb
 - lib/watir/locators/element/validator.rb
 - lib/watir/locators/row/locator.rb
@@ -289,7 +287,6 @@ files:
 - lib/watir/wait/timer.rb
 - lib/watir/window.rb
 - lib/watir/xpath_support.rb
-- spec/always_locate_spec.rb
 - spec/browser_spec.rb
 - spec/click_spec.rb
 - spec/container_spec.rb
@@ -329,7 +326,6 @@ signing_key:
 specification_version: 4
 summary: Watir powered by Selenium
 test_files:
-- spec/always_locate_spec.rb
 - spec/browser_spec.rb
 - spec/click_spec.rb
 - spec/container_spec.rb

data/lib/watir/atoms/getAttribute.js

@@ -1,18 +0,0 @@
-// Copyright 2011 Software Freedom Conservatory
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-function(){return function(){var d=null,e=this;function f(b,a){function c(){}c.prototype=a.prototype;b.g=a.prototype;b.prototype=new c};function g(b){for(var a=1;a<arguments.length;a++)var c=String(arguments[a]).replace(/\$/g,"$$$$"),b=b.replace(/\%s/,c);return b}function i(b){return b.replace(/^[\s\xa0]+|[\s\xa0]+$/g,"")}function j(b,a){if(b<a)return-1;else if(b>a)return 1;return 0};var k,l,m,p;function q(){return e.navigator?e.navigator.userAgent:d}p=m=l=k=!1;var r;if(r=q()){var s=e.navigator;k=r.indexOf("Opera")==0;l=!k&&r.indexOf("MSIE")!=-1;m=!k&&r.indexOf("WebKit")!=-1;p=!k&&!m&&s.product=="Gecko"}var t=l,u=p,x=m,y;
-a:{var z="",A;if(k&&e.opera)var B=e.opera.version,z=typeof B=="function"?B():B;else if(u?A=/rv\:([^\);]+)(\)|;)/:t?A=/MSIE\s+([^\);]+)(\)|;)/:x&&(A=/WebKit\/(\S+)/),A)var C=A.exec(q()),z=C?C[1]:"";if(t){var D,E=e.document;D=E?E.documentMode:void 0;if(D>parseFloat(z)){y=String(D);break a}}y=z}var F={};
-function G(b){var a;if(!(a=F[b])){a=0;for(var c=i(String(y)).split("."),h=i(String(b)).split("."),v=Math.max(c.length,h.length),w=0;a==0&&w<v;w++){var U=c[w]||"",V=h[w]||"",W=RegExp("(\\d*)(\\D*)","g"),X=RegExp("(\\d*)(\\D*)","g");do{var n=W.exec(U)||["","",""],o=X.exec(V)||["","",""];if(n[0].length==0&&o[0].length==0)break;a=j(n[1].length==0?0:parseInt(n[1],10),o[1].length==0?0:parseInt(o[1],10))||j(n[2].length==0,o[2].length==0)||j(n[2],o[2])}while(a==0)}a=F[b]=a>=0}return a};function H(b){this.stack=Error().stack||"";if(b)this.message=String(b)}f(H,Error);H.prototype.name="CustomError";function I(b,a){H.call(this,a);this.code=b;this.name=J[b]||J[13]}f(I,H);
-var J,K={NoSuchElementError:7,NoSuchFrameError:8,UnknownCommandError:9,StaleElementReferenceError:10,ElementNotVisibleError:11,InvalidElementStateError:12,UnknownError:13,ElementNotSelectableError:15,XPathLookupError:19,NoSuchWindowError:23,InvalidCookieDomainError:24,UnableToSetCookieError:25,ModalDialogOpenedError:26,NoModalDialogOpenError:27,ScriptTimeoutError:28,InvalidSelectorError:32,SqlDatabaseError:33,MoveTargetOutOfBoundsError:34},L={},M;for(M in K)L[K[M]]=M;J=L;
-I.prototype.toString=function(){return"["+this.name+"] "+this.message};function N(b,a){a.unshift(b);H.call(this,g.apply(d,a));a.shift();this.f=b}f(N,H);N.prototype.name="AssertionError";function O(b){var a=P;if(typeof a=="string"){if(typeof b!="string"||b.length!=1)return-1;return a.indexOf(b,0)}for(var c=0;c<a.length;c++)if(c in a&&a[c]===b)return c;return-1};!t||G("9");!u&&!t||t&&G("9")||u&&G("1.9.1");t&&G("9");function Q(b,a,c,h,v){this.b=!!a;if(b&&(this.a=b))this.c=typeof h=="number"?h:this.a.nodeType!=1?0:this.b?-1:1;this.d=v!=void 0?v:this.c||0;this.b&&(this.d*=-1);this.e=!c}f(Q,function(){});Q.prototype.a=d;Q.prototype.c=0;f(function(b,a,c,h){Q.call(this,b,a,c,d,h)},Q);var P=["async","autofocus","autoplay","checked","compact","complete","controls","declare","defaultchecked","defaultselected","defer","disabled","draggable","ended","formnovalidate","hidden","indeterminate","iscontenteditable","ismap","itemscope","loop","multiple","muted","nohref","noresize","noshade","novalidate","nowrap","open","paused","pubdate","readonly","required","reversed","scoped","seamless","seeking","selected","spellcheck","truespeed","willvalidate"];function R(b,a){if(8==b.nodeType)return d;a=a.toLowerCase();if(a=="style"){var c=i(b.style.cssText).toLowerCase();return c.charAt(c.length-1)==";"?c:c+";"}c=b.getAttributeNode(a);t&&!c&&G(8)&&O(a)>=0&&(c=b[a]);if(!c)return d;if(O(a)>=0)return t&&c.value=="false"?d:"true";return c.specified?c.value:d}var S="_".split("."),T=e;!(S[0]in T)&&T.execScript&&T.execScript("var "+S[0]);for(var Y;S.length&&(Y=S.shift());)!S.length&&R!==void 0?T[Y]=R:T=T[Y]?T[Y]:T[Y]={};; return this._.apply(null,arguments);}.apply({navigator:typeof window!='undefined'?window.navigator:null}, arguments);}

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

@@ -1,65 +0,0 @@
-module Watir
-  module Locators
-    class Element
-      class SelectorBuilder
-        class CSS
-          def build(selectors)
-            return unless use_css?(selectors)
-
-            if selectors.empty?
-              css = '*'
-            else
-              css = ''
-              css << (selectors.delete(:tag_name) || '')
-
-              klass = selectors.delete(:class)
-              if klass
-                if klass.include? ' '
-                  css << %([class="#{css_escape klass}"])
-                else
-                  css << ".#{klass}"
-                end
-              end
-
-              href = selectors.delete(:href)
-              if href
-                css << %([href~="#{css_escape href}"])
-              end
-
-              selectors.each do |key, value|
-                key = key.to_s.tr("_", "-")
-                css << %([#{key}="#{css_escape value}"]) # TODO: proper escaping
-              end
-            end
-
-            [:css, css]
-          end
-
-          private
-
-          def use_css?(selectors)
-            return false unless Watir.prefer_css?
-
-            if selectors.key?(:text) || selectors.key?(:label) || selectors.key?(:index)
-              return false
-            end
-
-            if selectors[:tag_name] == 'input' && selectors.key?(:type)
-              return false
-            end
-
-            if selectors.key?(:class) && selectors[:class] !~ /^[\w-]+$/ui
-              return false
-            end
-
-            true
-          end
-
-          def css_escape(str)
-            str.gsub('"', '\\"')
-          end
-        end
-      end
-    end
-  end
-end

data/spec/always_locate_spec.rb

@@ -1,43 +0,0 @@
-require File.expand_path('watirspec/spec_helper', File.dirname(__FILE__))
-
-describe 'Watir' do
-  describe '#always_locate?' do
-
-    before do
-      browser.goto WatirSpec.url_for('removed_element.html')
-    end
-
-    it 'determines whether #exist? returns false for stale element' do
-      element = browser.div(id: "text")
-      expect(element.exists?).to be true
-
-      browser.refresh
-
-      expect(element.exists?).to be Watir.always_locate?
-    end
-
-    it 'allows using cached elements regardless of setting, when element is not stale' do
-      element = browser.div(id: "text")
-      expect(element.exists?).to be true
-
-      # exception raised if element is re-looked up
-      allow(browser.driver).to receive(:find_element).with(:id, 'text') { raise }
-
-      expect { element.exists? }.to_not raise_error
-    end
-
-    it 'determines whether an exception is raised when taking an action on a stale element' do
-      element = browser.div(id: "text")
-      expect(element.exists?).to be true
-
-      browser.refresh
-      browser.div(id: "text").wait_until_present
-
-      if Watir.always_locate?
-        expect { element.text }.to_not raise_error
-      else
-        expect { element.text }.to raise_error Watir::Exception::UnknownObjectException
-      end
-    end
-  end
-end