watir 6.12.0 → 6.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea86da9b066569e766ab50f2f0657d7bc77501ab
-  data.tar.gz: 07ad7bd26a6dc2b01b998fe64ef5254289541dc1
+  metadata.gz: ee77498367fb399c13c754467a7e0b751cff3b3e
+  data.tar.gz: 38566fb0f06601dc54206268cc4904d184d193fa
 SHA512:
-  metadata.gz: 4814e526875cba217e35219544f3322baecd947df1e00cb347224bf544cdc806bcd51768ca6394130f792b575010240dbcaba141468760aab448cfcd9e14228e
-  data.tar.gz: a6fc636ad8301a955430501f5d293094b4028337a80ef9b2c7a6dfdc634f4482dab0c7c84216651f8a8037b5c0f310be06467e359a43707a0477eb6e64bf1c89
+  metadata.gz: 3538e96c26022ffc51d3a9e8bf3a40eedf4ac739001547059f015cc3d034b24c3dd9a99b3477a7a3c3125ee074edb94cdaa130f440ac8e5e6ff0c32f5f43de36
+  data.tar.gz: 480541837a063fa207523e68e32a72f6ad8d39dc18362d466c25adc410bf1686370e0a58b9fbf2e06dcbf4c03f4706ca93c55c486f0492795233086b45f5ce6d

data/.document

@@ -1,5 +1,4 @@
 README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
 LICENSE
+lib/watir/**/*.rb
+lib/watir.rb

data/CHANGES.md

@@ -1,3 +1,12 @@
+### 6.13.0 (2018-09-02)
+
+* Allow wait methods to wait for values of any attribute
+* Allow locating custom elements with adjacent methods
+* Support how latest IEDrivers are handling stale elements
+* Restore support for using of previously cached elements in collections
+* Fix bug preventing clicking option when select list is not displayed
+* Allow elements with content-editable attribute to use UserEditable module methods 
+
 ### 6.12.0 (2018-07-24)
 
 * Allow elements to be located with attributes that have underscores (thanks John Fitisoff)

data/README.md

@@ -17,21 +17,27 @@ require 'watir'
 browser = Watir::Browser.new
 
 browser.goto 'watir.com'
-browser.link(text: 'documentation').click
+browser.link(text: 'Guides').click
 
 puts browser.title
-# => 'Documentation – Watir Project...'
+# => 'Guides – Watir Project'
 browser.close
 ```
 
-## Description
+## Using Watir
 
-The majority of element methods Watir provides with is autogenerated from specifications.
+Everything you need is on the [Watir website](http://watir.com): news, guides, additional resources, support information and more.
+
+If you are interested in contributing to the project or the ecosystem, continue reading this README.
+
+## Implementation
+
+The majority of element methods Watir provides is autogenerated from specifications.
 This is done by extracting the IDL parts from the spec and processing them with the WebIDL gem (link below).
 Currently supported specifications are:
 
-* [HTML](https://www.whatwg.org/specs/web-apps/current-work/) (`lib/watir/elements/html_generated.rb`)
-* [SVG](http://www.w3.org/TR/SVG2/single-page.html) (`lib/watir/elements/svg_generated.rb`)
+* [HTML](https://www.w3.org/TR/2017/PR-html51-20170803/single-page.html) (`lib/watir/elements/html_elements.rb`)
+* [SVG](https://www.w3.org/TR/2016/CR-SVG2-20160915/single-page.html) (`lib/watir/elements/svg_elements.rb`)
 
 ## Specs
 
@@ -65,7 +71,7 @@ After initialized, just follow the instructions to customize Watir implementatio
 
 Specs specific to Watir are found in `spec/*_spec.rb`, with watirspec in `spec/watirspec/`.
 
-## Doctests
+### Doctests
 
 Watir uses [yard-doctest](https://github.com/p0deje/yard-doctest) for testing documentation examples.
 
@@ -73,31 +79,16 @@ Watir uses [yard-doctest](https://github.com/p0deje/yard-doctest) for testing do
 rake yard:doctest
 ```
 
-## API Documentation
-
-* http://rdoc.info/gems/watir/ (updated on every release)
-
-## See Also
-
-* http://watir.github.io
-* http://github.com/jarib/webidl
-* http://github.com/watir/watirspec
-* https://github.com/seleniumhq/selenium
-
-## Dependencies
-
-* selenium-webdriver
-* rack (for watirspec)
-
 ## Note on Patches/Pull Requests
 
 * Fork the project.
+* Clone onto your local machine.
+* Create a new feature branch (bonus points for good names).
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with Rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+* Add tests for it. This is important so we don't unintentionally break it in a future version.
+* Commit, do not change Rakefile, gemspec, or CHANGES files.
+* Push to your forked repository.
+* Send a pull request.
 
 ## Copyright
 

data/lib/watir.rb

@@ -1,4 +1,5 @@
 require 'selenium-webdriver'
+require 'time'
 
 require 'watir/legacy_wait'
 require 'watir/wait'

data/lib/watir/adjacent.rb

@@ -111,11 +111,11 @@ module Watir
       plural = opt.delete(:plural)
       opt[:index] ||= 0 unless plural || opt.values.any? { |e| e.is_a? Regexp }
       klass = if !plural && opt[:tag_name]
-                Watir.tag_to_class[opt[:tag_name].to_sym]
+                Watir.element_class_for(opt[:tag_name])
               elsif !plural
                 HTMLElement
               elsif opt[:tag_name]
-                 Object.const_get("#{self.send(opt[:tag_name]).class}Collection")
+                 Object.const_get("#{Watir.element_class_for(opt[:tag_name])}Collection")
               else
                 HTMLElementCollection
               end

data/lib/watir/browser.rb

@@ -127,7 +127,7 @@ module Watir
     # @example
     #   browser.goto "watir.github.io"
     #   browser.title
-    #   #=> "Watir is... – Watir Project – Watir stands for Web Application Testing In Ruby. It facilitates the writing of automated tests by mimicking the behavior of a user interacting with a website."
+    #   #=> "Watir Project"
     #
     # @return [String]
     #

data/lib/watir/element_collection.rb

@@ -51,6 +51,8 @@ module Watir
         to_a[value]
       elsif @selector.key? :adjacent
         to_a[value] || element_class.new(@query_scope, {invalid_locator: true})
+      elsif @to_a && @to_a[value]
+        @to_a[value]
       else
         element_class.new(@query_scope, @selector.merge(index: value))
       end
@@ -88,7 +90,7 @@ module Watir
           elements.map.with_index do |e, idx|
             element = element_class.new(@query_scope, @selector.merge(element: e, index: idx))
             if [Watir::HTMLElement, Watir::Input].include? element.class
-              tag_name = element.tag_name.to_sym
+              tag_name = @selector[:tag_name] || element.tag_name.to_sym
               hash[tag_name] ||= 0
               hash[tag_name] += 1
               Watir.element_class_for(tag_name).new(@query_scope, @selector.merge(element: e,

data/lib/watir/elements/element.rb

@@ -513,16 +513,15 @@ module Watir
 
     def stale?
       raise Watir::Exception::Error, "Can not check staleness of unused element" unless @element
-      return false unless stale_in_context?
       @query_scope.ensure_context
-      stale_in_context?
+      @stale || stale_in_context?
     end
 
     def stale_in_context?
       @element.enabled? # any wire call will check for staleness
       false
     rescue Selenium::WebDriver::Error::ObsoleteElementError
-      true
+      @stale = true
     end
 
     def reset!
@@ -703,6 +702,10 @@ module Watir
       method = meth.to_s
       if method =~ Locators::Element::SelectorBuilder::WILDCARD_ATTRIBUTE
         attribute_value(method.tr('_', '-'), *args)
+      elsif UserEditable.instance_methods(false).include?(meth) && content_editable?
+        @content_editable = true
+        self.extend UserEditable
+        send(meth, *args, &blk)
       else
         super
       end

data/lib/watir/elements/select.rb

@@ -14,12 +14,13 @@ module Watir
 
     #
     # Gets all the options in the select list
+    # Use Element#options rather than Select element attribute "options"
     #
     # @return [Watir::OptionCollection]
     #
 
     def options(*)
-      element_call(:wait_for_present) { super }
+      super
     end
 
     #

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

@@ -16,7 +16,7 @@ module Watir
       end
 
       def ignored_attributes
-        %w(cells elements hash rows span text size selected? style width height tHead tFoot)
+        %w(cells elements hash rows span text size selected? style width height tHead tFoot link options)
       end
 
       def generator_implementation

data/lib/watir/js_snippets/setText.js

@@ -0,0 +1,3 @@
+function(){
+    arguments[0].textContent=arguments[1]
+}

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

@@ -115,10 +115,18 @@ module Watir
               idx = idx.abs - 1
             end
 
+            counter = 0
+
             # Lazy evaluation to avoid fetching values for elements that will be discarded
-            matches = elements.lazy.select { |el| matches_selector?(el, selector) }
-            matches.take(idx + 1).to_a[idx]
+            matches = elements.lazy.select do |el|
+              counter += 1
+              matches_selector?(el, selector)
+            end
+            val = matches.take(idx + 1).to_a[idx]
+            Watir.logger.debug "Filtered through #{counter} elements to locate #{@selector.inspect}"
+            val
           else
+            Watir.logger.debug "Iterated through #{elements.size} elements to locate all #{@selector.inspect}"
             elements.select { |el| matches_selector?(el, selector) }
           end
         end
@@ -216,19 +224,21 @@ module Watir
             end
           end
 
-          if selector[:text]
-            text_content = Watir::Element.new(@query_scope, element: element).send(:execute_js, :getTextContent, element).strip
-            text_content_matches = selector[:text] === text_content
-            unless matches == text_content_matches
-              key = @selector.key?(:text) ? "text" : "label"
-              Watir.logger.deprecate("Using :#{key} locator with RegExp #{selector[:text].inspect} to match an element that includes hidden text", ":visible_#{key}",
-                  ids: [:text_regexp])
-            end
-          end
+          text_regexp_deprecation(element, selector, matches) if selector[:text]
 
           matches
         end
 
+        def text_regexp_deprecation(element, selector, matches)
+          text_content = Watir::Element.new(@query_scope, element: element).send(:execute_js, :getTextContent, element).strip
+          text_content_matches = selector[:text] === text_content
+          unless matches == text_content_matches
+            key = @selector.key?(:text) ? "text" : "label"
+            Watir.logger.deprecate("Using :#{key} locator with RegExp #{selector[:text].inspect} to match an element that includes hidden text", ":visible_#{key}",
+                  ids: [:text_regexp])
+          end
+        end
+
         def can_convert_regexp_to_contains?
           true
         end

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

@@ -59,9 +59,10 @@ module Watir
         end
 
         def build(selector)
+          inspect = selector.inspect
           return given_xpath_or_css(selector) if selector.key?(:xpath) || selector.key?(:css)
           built = build_wd_selector(selector)
-          Watir.logger.debug "Converted #{selector.inspect} to #{built}"
+          Watir.logger.debug "Converted #{inspect} to #{built}"
           built
         end
 

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

@@ -6,11 +6,7 @@ module Watir
           return if selectors.values.any? { |e| e.kind_of? Regexp }
           selectors.delete(:tag_name) || raise("internal error: no tag_name?!")
 
-          tag_name = @query_scope.tag_name.downcase
-          expressions = %w[./tr]
-          unless %w[tbody tfoot thead].include?(tag_name)
-            expressions += %w[./tbody/tr ./thead/tr ./tfoot/tr]
-          end
+          expressions = generate_expressions(@query_scope.tag_name.downcase)
 
           attr_expr = xpath_builder.attribute_expression(nil, selectors)
 
@@ -24,6 +20,16 @@ module Watir
 
           [:xpath, xpath]
         end
+
+        protected
+
+        def generate_expressions(tag_name)
+          expressions = %w[./tr]
+          unless %w[tbody tfoot thead].include?(tag_name)
+            expressions += %w[./tbody/tr ./thead/tr ./tfoot/tr]
+          end
+          expressions
+        end
       end
     end
   end

data/lib/watir/user_editable.rb

@@ -26,9 +26,11 @@ module Watir
       raise ArgumentError, "#set! does not support special keys, use #set instead" if args.any? { |v| v.kind_of?(::Symbol) }
       input_value = args.join
       set input_value[0]
+      return set_content_editable!(*args) if @content_editable
       element_call { execute_js(:setValue, @element, input_value[0..-2]) }
       append(input_value[-1])
-      raise Watir::Exception::Error, "#set! value does not match expected input" unless value == input_value
+      return if value == input_value
+      raise Watir::Exception::Error, "#set! value: '#{value}' does not match expected input: '#{input_value}'"
     end
 
     #
@@ -38,6 +40,7 @@ module Watir
     #
 
     def append(*args)
+      raise NotImplementedError, "#append method is not supported with contenteditable element" if @content_editable
       send_keys(*args)
     end
     alias_method :<<, :append
@@ -52,5 +55,13 @@ module Watir
       end
     end
 
+    private
+
+    def set_content_editable!(*args)
+      input_text = args.join
+      element_call { execute_js(:setText, @element, input_text) }
+      return if text == input_text
+      raise Watir::Exception::Error, "#set! text: '#{text}' does not match expected input: '#{input_text}'"
+    end
   end # UserEditable
 end # Watir

data/lib/watir/wait.rb

@@ -111,19 +111,24 @@ module Watir
     #   browser.text_field(name: "new_user_first_name").wait_until(&:present?).click
     #   browser.text_field(name: "new_user_first_name").wait_until(message: 'foo') { |field| field.present? }
     #   browser.text_field(name: "new_user_first_name").wait_until(timeout: 60, &:present?)
+    #   browser.text_field(name: "new_user_first_name").wait_until(timeout: 60, name: 'new_user_first_name')
     #
     # @param [Integer] timeout seconds to wait before timing out
     # @param [String] message error message for when times out
     #
 
-    def wait_until(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, &blk)
+    def wait_until(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, **opt, &blk)
       if deprecated_message || deprecated_timeout
         Watir.logger.deprecate "Using arguments for #wait_until", "keywords", ids: [:timeout_arguments]
         timeout = deprecated_timeout
         message = deprecated_message
       end
       message ||= Proc.new { |obj| "waiting for true condition on #{obj.inspect}" }
-      Wait.until(timeout: timeout, message: message, interval: interval, object: self, &blk)
+
+      raise ArgumentError, "Unknown keyword(s): #{opt.keys} " if block_given? && !opt.empty?
+      proc = block_given? ? blk : create_proc(opt)
+
+      Wait.until(timeout: timeout, message: message, interval: interval, object: self, &proc)
 
       self
     end
@@ -135,6 +140,7 @@ module Watir
     #   browser.wait_while(timeout: 2) do |browser|
     #     !browser.exists?
     #   end
+    #   browser.wait_while(timeout: 2, title: 'No')
     #
     # @todo add element example
     #
@@ -142,14 +148,18 @@ module Watir
     # @param [String] message error message for when times out
     #
 
-    def wait_while(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, &blk)
+    def wait_while(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, **opt, &blk)
       if deprecated_message || deprecated_timeout
         Watir.logger.deprecate "Using arguments for #wait_while", "keywords", ids: [:timeout_arguments]
         timeout = deprecated_timeout
         message = deprecated_message
       end
       message ||= Proc.new { |obj| "waiting for false condition on #{obj.inspect}" }
-      Wait.while(timeout: timeout, message: message, interval: interval, object: self, &blk)
+
+      raise ArgumentError, "Unknown keyword(s): #{opt.keys} " if block_given? && !opt.empty?
+      proc = block_given? ? blk : create_proc(opt)
+
+      Wait.while(timeout: timeout, message: message, interval: interval, object: self, &proc)
 
       self
     end
@@ -216,5 +226,26 @@ module Watir
       end
     end
 
+    private
+
+    def create_proc(opt)
+      Proc.new do
+        opt.keys.all? do |key|
+          expected = opt[key]
+          actual = if self.is_a?(Watir::Element) && !self.respond_to?(key)
+                     self.attribute_value(key)
+                   else
+                     self.send(key)
+                   end
+          case expected
+          when Regexp
+            expected =~ actual
+          else
+            expected.to_s == actual
+          end
+        end
+      end
+    end
+
   end # Waitable
 end # Watir

data/spec/watirspec/adjacent_spec.rb

@@ -21,6 +21,11 @@ describe "Adjacent Elements" do
       expect(browser.div(id: "first_sibling").parent(tag_name: :div)).to be_a Watir::Div
     end
 
+    it "accepts custom tag_name argument" do
+      expect(browser.div(id: "regular_child").parent(tag_name: :grandelement).id).to eq 'custom_grandparent'
+      expect(browser.div(id: "regular_child").parent(tag_name: :grandelement)).to be_a Watir::HTMLElement
+    end
+
     it "accepts class_name argument" do
       expect(browser.div(id: "first_sibling").parent(class_name: 'parent').id).to eq 'parent_span'
     end
@@ -51,6 +56,12 @@ describe "Adjacent Elements" do
       expect(siblings.all? { |sib| sib.is_a? Watir::Div }).to eq true
     end
 
+    it "accepts custom tag name argument" do
+      siblings = browser.div(id: "regular_child").siblings(tag_name: :childelement)
+      expect(siblings.size).to eq 3
+      expect(siblings.all? { |sib| sib.is_a? Watir::HTMLElement }).to eq true
+    end
+
     it "accepts a class_name argument" do
       siblings = browser.div(id: "second_sibling").siblings(class_name: 'b')
       expect(siblings.first).to be_a Watir::Div
@@ -191,6 +202,11 @@ describe "Adjacent Elements" do
       expect(browser.div(id: "parent").child(tag_name: :span)).to be_a Watir::Span
     end
 
+    it "accepts custom tag_name argument" do
+      expect(browser.element(id: "custom_parent").child(tag_name: :childelement).id).to eq 'custom_child'
+      expect(browser.element(id: "custom_parent").child(tag_name: :childelement)).to be_a Watir::HTMLElement
+    end
+
     it "accepts class_name argument" do
       expect(browser.div(id: "parent").child(class_name: 'b').id).to eq 'second_sibling'
     end
@@ -221,6 +237,12 @@ describe "Adjacent Elements" do
       expect(children.all? { |child| child.is_a? Watir::Div }).to eq true
     end
 
+    it "accepts custom tag_name argument" do
+      children = browser.element(id: "custom_parent").children(tag_name: :childelement)
+      expect(children.size).to eq 3
+      expect(children.all? { |child| child.is_a? Watir::HTMLElement }).to eq true
+    end
+
     it "accepts a class_name argument" do
       children = browser.div(id: "parent").children(class_name: 'b')
       expect(children.size).to eq 2

data/spec/watirspec/browser_spec.rb

@@ -286,26 +286,28 @@ describe "Browser" do
       end
 
       compliant_on :chrome do
-        it "takes port and driver_opt as arguments" do
-          @original = WatirSpec.implementation.clone
-          browser.close
-          @opts = WatirSpec.implementation.browser_args.last
+        not_compliant_on :watigiri do
+          it "takes port and driver_opt as arguments" do
+            @original = WatirSpec.implementation.clone
+            browser.close
+            @opts = WatirSpec.implementation.browser_args.last
 
-          @opts.merge!(port: '2314',
-                       driver_opts: {args: ['foo']},
-                       listener: LocalConfig::SelectorListener.new)
+            @opts.merge!(port: '2314',
+                         driver_opts: {args: ['foo']},
+                         listener: LocalConfig::SelectorListener.new)
 
-          @new_browser = WatirSpec.new_browser
+            @new_browser = WatirSpec.new_browser
 
-          bridge = @new_browser.wd.instance_variable_get('@bridge')
-          expect(bridge).to be_a Selenium::WebDriver::Support::EventFiringBridge
-          service = @new_browser.wd.instance_variable_get("@service")
-          expect(service.instance_variable_get("@extra_args")).to eq ["foo"]
-          expect(service.instance_variable_get("@port")).to eq 2314
+            bridge = @new_browser.wd.instance_variable_get('@bridge')
+            expect(bridge).to be_a Selenium::WebDriver::Support::EventFiringBridge
+            service = @new_browser.wd.instance_variable_get("@service")
+            expect(service.instance_variable_get("@extra_args")).to eq ["foo"]
+            expect(service.instance_variable_get("@port")).to eq 2314
 
-          @new_browser.close
-          WatirSpec.implementation = @original.clone
-          $browser = WatirSpec.new_browser
+            @new_browser.close
+            WatirSpec.implementation = @original.clone
+            $browser = WatirSpec.new_browser
+          end
         end
       end
 

data/spec/watirspec/elements/collections_spec.rb

@@ -49,4 +49,28 @@ describe "Collections" do
     expect(spans).to receive(:elements).and_return([])
     expect(spans.locate).to be_a Watir::SpanCollection
   end
+
+  it "lazy loads collections referenced with #[]" do
+    browser.goto(WatirSpec.url_for("collections.html"))
+    expect(browser.wd).to_not receive(:find_elements)
+    browser.spans[3]
+  end
+
+  it "does not relocate collections when previously evaluated" do
+    browser.goto(WatirSpec.url_for("collections.html"))
+    elements = browser.spans.tap(&:to_a)
+
+    expect(browser.wd).to_not receive(:find_elements)
+    elements[1].id
+  end
+
+  it "relocates cached elements that go stale" do
+    browser.goto(WatirSpec.url_for("collections.html"))
+    elements = browser.spans.tap(&:to_a)
+
+    browser.refresh
+    expect(elements[1]).to be_stale
+    expect { elements[1] }.to_not raise_unknown_object_exception
+  end
+
 end

data/spec/watirspec/elements/div_spec.rb

@@ -151,12 +151,16 @@ describe "Div" do
         expect { browser.div(text: /some visible/).exists? }.not_to have_deprecated_text_regexp
       end
 
-      it "throws deprecation when no longer matched by text content" do
-        expect { browser.div(text: /some visible$/).exists? }.to have_deprecated_text_regexp
+      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
+        end
       end
 
-      it "throws deprecation when begins to be matched by text content" do
-        expect { browser.div(text: /some hidden/).exists? }.to have_deprecated_text_regexp
+      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
+        end
       end
 
       it "does not throw deprecation when still not matched by text content" do

data/spec/watirspec/elements/element_spec.rb

@@ -333,15 +333,31 @@ describe "Element" do
     end
 
     it "returns true if the element is enabled" do
-      expect(browser.element(name: 'new_user_submit')).to be_enabled
+      expect(browser.button(name: 'new_user_submit')).to be_enabled
     end
 
     it "returns false if the element is disabled" do
-      expect(browser.element(name: 'new_user_submit_disabled')).to_not be_enabled
+      expect(browser.button(name: 'new_user_submit_disabled')).to_not be_enabled
     end
 
     it "raises UnknownObjectException if the element doesn't exist" do
-      expect { browser.element(name: "no_such_name").enabled? }.to raise_unknown_object_exception
+      expect { browser.button(name: "no_such_name").enabled? }.to raise_unknown_object_exception
+    end
+  end
+
+  describe "#stale?" do
+    it "returns true if the element is stale" do
+      element = browser.button(name: 'new_user_submit_disabled').tap(&:exists?)
+
+      browser.refresh
+
+      expect(element).to be_stale
+    end
+
+    it "returns false if the element is not stale" do
+      element = browser.button(name: 'new_user_submit_disabled').tap(&:exists?)
+
+      expect(element).to_not be_stale
     end
   end
 

data/spec/watirspec/elements/text_field_spec.rb

@@ -207,165 +207,4 @@ describe "TextField" do
       expect { browser.text_field(id: 'new_user_code').set 'foo' }.to raise_object_read_only_exception
     end
   end
-
-  # Manipulation methods
-  not_compliant_on :safari do
-    describe "#append" do
-      it "appends the text to the text field" do
-        browser.text_field(name: "new_user_occupation").append(" Append This")
-        expect(browser.text_field(name: "new_user_occupation").value).to eq "Developer Append This"
-      end
-
-      it "appends multi-byte characters" do
-        browser.text_field(name: "new_user_occupation").append(" ijij")
-        expect(browser.text_field(name: "new_user_occupation").value).to eq "Developer ijij"
-      end
-
-      it "raises ObjectReadOnlyException if the object is read only" do
-        expect { browser.text_field(id: "new_user_code").append("Append This") }.to raise_object_read_only_exception
-      end
-
-      it "raises ObjectDisabledException if the object is disabled" do
-        expect { browser.text_field(name: "new_user_species").append("Append This") }.to raise_object_disabled_exception
-      end
-
-      it "raises UnknownObjectException if the object doesn't exist" do
-        expect { browser.text_field(name: "no_such_name").append("Append This") }.to raise_unknown_object_exception
-      end
-    end
-  end
-
-  describe "#clear" do
-    it "removes all text from the text field" do
-      browser.text_field(name: "new_user_occupation").clear
-      expect(browser.text_field(name: "new_user_occupation").value).to be_empty
-      browser.textarea(id: "delete_user_comment").clear
-      expect(browser.textarea(id: "delete_user_comment").value).to be_empty
-    end
-
-    it "raises UnknownObjectException if the text field doesn't exist" do
-      expect { browser.text_field(id: "no_such_id").clear }.to raise_unknown_object_exception
-    end
-
-    it "raises ObjectReadOnlyException if the object is read only" do
-      expect { browser.text_field(id: "new_user_code").clear }.to raise_object_read_only_exception
-    end
-  end
-
-  describe "#value=" do
-    it "sets the value of the element" do
-      browser.text_field(id: 'new_user_email').value = 'Hello Cruel World'
-      expect(browser.text_field(id: "new_user_email").value).to eq 'Hello Cruel World'
-    end
-
-    it "is able to set multi-byte characters" do
-      browser.text_field(name: "new_user_occupation").value = "ijij"
-      expect(browser.text_field(name: "new_user_occupation").value).to eq "ijij"
-    end
-
-    it "sets the value of a textarea element" do
-      browser.textarea(id: 'delete_user_comment').value = 'Hello Cruel World'
-      expect(browser.textarea(id: "delete_user_comment").value).to eq 'Hello Cruel World'
-    end
-
-    it "raises UnknownObjectException if the text field doesn't exist" do
-      expect { browser.text_field(name: "no_such_name").value = 'yo' }.to raise_unknown_object_exception
-    end
-  end
-
-  describe "#set" do
-    it "sets the value of the element" do
-      browser.text_field(id: 'new_user_email').set('Bye Cruel World')
-      expect(browser.text_field(id: "new_user_email").value).to eq 'Bye Cruel World'
-    end
-
-    it "sets the value of a textarea element" do
-      browser.textarea(id: 'delete_user_comment').set('Hello Cruel World')
-      expect(browser.textarea(id: "delete_user_comment").value).to eq 'Hello Cruel World'
-    end
-
-    it "fires events" do
-      browser.text_field(id: "new_user_username").set("Hello World")
-      expect(browser.span(id: "current_length").text).to eq "11"
-    end
-
-    it "sets the value of a password field" do
-      browser.text_field(name: 'new_user_password').set('secret')
-      expect(browser.text_field(name: 'new_user_password').value).to eq 'secret'
-    end
-
-    it "sets the value when accessed through the enclosing Form" do
-      browser.form(id: 'new_user').text_field(name: 'new_user_password').set('secret')
-      expect(browser.form(id: 'new_user').text_field(name: 'new_user_password').value).to eq 'secret'
-    end
-
-    it "is able to set multi-byte characters" do
-      browser.text_field(name: "new_user_occupation").set("ijij")
-      expect(browser.text_field(name: "new_user_occupation").value).to eq "ijij"
-    end
-
-    it "sets the value to a concatenation of multiple arguments" do
-      browser.text_field(id: 'new_user_email').set('Bye', 'Cruel', 'World')
-      expect(browser.text_field(id: "new_user_email").value).to eq 'ByeCruelWorld'
-    end
-
-    it "sets the value to blank when no arguments are provided" do
-      browser.text_field(id: 'new_user_email').set
-      expect(browser.text_field(id: "new_user_email").value).to eq ''
-    end
-
-    it "raises UnknownObjectException if the text field doesn't exist" do
-      expect { browser.text_field(id: "no_such_id").set('secret') }.to raise_unknown_object_exception
-    end
-  end
-
-  describe "#set!" do
-    it "sets the value of the element" do
-      browser.text_field(id: 'new_user_email').set!('Bye Cruel World')
-      expect(browser.text_field(id: "new_user_email").value).to eq 'Bye Cruel World'
-    end
-
-    it "sets the value of a textarea element" do
-      browser.textarea(id: 'delete_user_comment').set!('Hello Cruel World')
-      expect(browser.textarea(id: "delete_user_comment").value).to eq 'Hello Cruel World'
-    end
-
-    it "fires events" do
-      browser.text_field(id: "new_user_username").set!("Hello World")
-      expect(browser.span(id: "current_length").text).to eq "11"
-    end
-
-    it "sets the value of a password field" do
-      browser.text_field(name: 'new_user_password').set!('secret')
-      expect(browser.text_field(name: 'new_user_password').value).to eq 'secret'
-    end
-
-    it "sets the value when accessed through the enclosing Form" do
-      browser.form(id: 'new_user').text_field(name: 'new_user_password').set!('secret')
-      expect(browser.form(id: 'new_user').text_field(name: 'new_user_password').value).to eq 'secret'
-    end
-
-    it "is able to set multi-byte characters" do
-      browser.text_field(name: "new_user_occupation").set!("ijij")
-      expect(browser.text_field(name: "new_user_occupation").value).to eq "ijij"
-    end
-
-    it "sets the value to a concatenation of multiple arguments" do
-      browser.text_field(id: 'new_user_email').set!('Bye', 'Cruel', 'World')
-      expect(browser.text_field(id: "new_user_email").value).to eq 'ByeCruelWorld'
-    end
-
-    it "sets the value to blank when no arguments are provided" do
-      browser.text_field(id: 'new_user_email').set!
-      expect(browser.text_field(id: "new_user_email").value).to eq ''
-    end
-
-    it "raises ArgumentError for special keys" do
-      expect { browser.text_field(id: 'new_user_email').set!('a', :tab) }.to raise_error(ArgumentError)
-    end
-
-    it "raises UnknownObjectException if the text field doesn't exist" do
-      expect { browser.text_field(id: "no_such_id").set!('secret') }.to raise_unknown_object_exception
-    end
-  end
 end

data/spec/watirspec/html/forms_with_input_elements.html

@@ -161,6 +161,8 @@
   <div id="wants_newsletter" style="display: none;"></div>
   <div id="onfocus_test"></div>
 
+  <div id="contenteditable" contenteditable="true">Foo</div>
+
   <!-- option disappears onchange -->
   <select id="obsolete" onchange="this.innerHTML = '';">
     <option value="norway">norway</option>

data/spec/watirspec/html/nested_elements.html

@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<span id="grandparent_span">
+    <span id="grandparent_span">
         <div id="grandparent">
             <span class="parent" id="parent_span">
                 <div id="parent">
@@ -30,5 +30,15 @@
             </span>
         </div>
     </span>
+    <div>
+        <grandelement id="custom_grandparent">
+            <parentelement id="custom_parent">
+                <div id="regular_child"></div>
+                <childelement id="custom_child" class="custom_child a"></childelement>
+                <childelement class="custom_child b"></childelement>
+                <childelement class="custom_child c"></childelement>
+            </parentelement>
+        </grandelement>
+    </div>
 </body>
 </html>

data/spec/watirspec/html/wait.html

@@ -11,7 +11,9 @@
 
       function setTimeoutDisplay(id, display, timeout) {
           setTimeout(function() {
-              document.getElementById(id).style.display = display;
+              var el = document.getElementById(id)
+                  el.style.display = display;
+                  el.setAttribute("custom", id)
           }, timeout);
       }
 
@@ -54,7 +56,7 @@
   </head>
 
   <body>
-    <div id="foo" style="display:block;">foo</div>
+    <div id="foo" custom="" style="display:block;">foo</div>
     <div id="bar" style="display:none;" onclick='this.innerHTML = "changed"'>bar</div>
     <a id="show_bar" href="#" onclick="setTimeoutDisplay('bar', 'block', 500);">show bar</a>
     <a id="hide_foo" href="#" onclick="setTimeoutDisplay('foo', 'none', 500);">hide foo</a>

data/spec/watirspec/user_editable_spec.rb

@@ -0,0 +1,202 @@
+require "watirspec_helper"
+
+describe Watir::UserEditable do
+
+  before :each do
+    browser.goto(WatirSpec.url_for("forms_with_input_elements.html"))
+  end
+
+  not_compliant_on :safari do
+    describe "#append" do
+      it "appends the text to the text field" do
+        browser.text_field(name: "new_user_occupation").append(" Append This")
+        expect(browser.text_field(name: "new_user_occupation").value).to eq "Developer Append This"
+      end
+
+      it "appends multi-byte characters" do
+        browser.text_field(name: "new_user_occupation").append(" ijij")
+        expect(browser.text_field(name: "new_user_occupation").value).to eq "Developer ijij"
+      end
+
+      it "raises NotImplementedError if the object is content editable element" do
+        msg = "#append method is not supported with contenteditable element"
+        expect { browser.div(id: 'contenteditable').append("bar") }.to raise_exception(NotImplementedError, msg)
+      end
+
+      it "raises ObjectReadOnlyException if the object is read only" do
+        expect { browser.text_field(id: "new_user_code").append("Append This") }.to raise_object_read_only_exception
+      end
+
+      it "raises ObjectDisabledException if the object is disabled" do
+        expect { browser.text_field(name: "new_user_species").append("Append This") }.to raise_object_disabled_exception
+      end
+
+      it "raises UnknownObjectException if the object doesn't exist" do
+        expect { browser.text_field(name: "no_such_name").append("Append This") }.to raise_unknown_object_exception
+      end
+    end
+  end
+
+  describe "#clear" do
+    it "removes all text from the text field" do
+      browser.text_field(name: "new_user_occupation").clear
+      expect(browser.text_field(name: "new_user_occupation").value).to be_empty
+      browser.textarea(id: "delete_user_comment").clear
+      expect(browser.textarea(id: "delete_user_comment").value).to be_empty
+    end
+
+    it "removes all text from the content editable element" do
+      browser.div(id: 'contenteditable').clear
+      expect(browser.div(id: 'contenteditable').text).to eq ""
+    end
+
+    it "raises UnknownObjectException if the text field doesn't exist" do
+      expect { browser.text_field(id: "no_such_id").clear }.to raise_unknown_object_exception
+    end
+
+    it "raises ObjectReadOnlyException if the object is read only" do
+      expect { browser.text_field(id: "new_user_code").clear }.to raise_object_read_only_exception
+    end
+  end
+
+  describe "#value=" do
+    it "sets the value of the element" do
+      browser.text_field(id: 'new_user_email').value = 'Hello Cruel World'
+      expect(browser.text_field(id: "new_user_email").value).to eq 'Hello Cruel World'
+    end
+
+    it "is able to set multi-byte characters" do
+      browser.text_field(name: "new_user_occupation").value = "ijij"
+      expect(browser.text_field(name: "new_user_occupation").value).to eq "ijij"
+    end
+
+    it "sets the value of a textarea element" do
+      browser.textarea(id: 'delete_user_comment').value = 'Hello Cruel World'
+      expect(browser.textarea(id: "delete_user_comment").value).to eq 'Hello Cruel World'
+    end
+
+    it "raises UnknownObjectException if the text field doesn't exist" do
+      expect { browser.text_field(name: "no_such_name").value = 'yo' }.to raise_unknown_object_exception
+    end
+  end
+
+  describe "#set" do
+    it "sets the value of the element" do
+      browser.text_field(id: 'new_user_email').set('Bye Cruel World')
+      expect(browser.text_field(id: "new_user_email").value).to eq 'Bye Cruel World'
+    end
+
+    it "sets the value of a textarea element" do
+      browser.textarea(id: 'delete_user_comment').set('Hello Cruel World')
+      expect(browser.textarea(id: "delete_user_comment").value).to eq 'Hello Cruel World'
+    end
+
+    it "sets the value of a content editable element" do
+      browser.div(id: 'contenteditable').set("Bar")
+      expect(browser.div(id: 'contenteditable').text).to eq "Bar"
+    end
+
+    it "fires events" do
+      browser.text_field(id: "new_user_username").set("Hello World")
+      expect(browser.span(id: "current_length").text).to eq "11"
+    end
+
+    it "sets the value of a password field" do
+      browser.text_field(name: 'new_user_password').set('secret')
+      expect(browser.text_field(name: 'new_user_password').value).to eq 'secret'
+    end
+
+    it "sets the value when accessed through the enclosing Form" do
+      browser.form(id: 'new_user').text_field(name: 'new_user_password').set('secret')
+      expect(browser.form(id: 'new_user').text_field(name: 'new_user_password').value).to eq 'secret'
+    end
+
+    it "is able to set multi-byte characters" do
+      browser.text_field(name: "new_user_occupation").set("ijij")
+      expect(browser.text_field(name: "new_user_occupation").value).to eq "ijij"
+    end
+
+    it "sets the value to a concatenation of multiple arguments" do
+      browser.text_field(id: 'new_user_email').set('Bye', 'Cruel', 'World')
+      expect(browser.text_field(id: "new_user_email").value).to eq 'ByeCruelWorld'
+    end
+
+    it "sets the value to blank when no arguments are provided" do
+      browser.text_field(id: 'new_user_email').set
+      expect(browser.text_field(id: "new_user_email").value).to eq ''
+    end
+
+    it "raises UnknownObjectException if the text field doesn't exist" do
+      expect { browser.text_field(id: "no_such_id").set('secret') }.to raise_unknown_object_exception
+    end
+  end
+
+  describe "#set!" do
+    it "sets the value of the element" do
+      browser.text_field(id: 'new_user_email').set!('Bye Cruel World')
+      expect(browser.text_field(id: "new_user_email").value).to eq 'Bye Cruel World'
+    end
+
+    it "sets the value of a textarea element" do
+      browser.textarea(id: 'delete_user_comment').set!('Hello Cruel World')
+      expect(browser.textarea(id: "delete_user_comment").value).to eq 'Hello Cruel World'
+    end
+
+    it "sets the value of a content editable element" do
+      browser.div(id: 'contenteditable').set!("foo")
+      expect(browser.div(id: 'contenteditable').text).to eq "foo"
+    end
+
+    it "fires events" do
+      browser.text_field(id: "new_user_username").set!("Hello World")
+      expect(browser.span(id: "current_length").text).to eq "11"
+    end
+
+    it "sets the value of a password field" do
+      browser.text_field(name: 'new_user_password').set!('secret')
+      expect(browser.text_field(name: 'new_user_password').value).to eq 'secret'
+    end
+
+    it "sets the value when accessed through the enclosing Form" do
+      browser.form(id: 'new_user').text_field(name: 'new_user_password').set!('secret')
+      expect(browser.form(id: 'new_user').text_field(name: 'new_user_password').value).to eq 'secret'
+    end
+
+    it "is able to set multi-byte characters" do
+      browser.text_field(name: "new_user_occupation").set!("ijij")
+      expect(browser.text_field(name: "new_user_occupation").value).to eq "ijij"
+    end
+
+    it "sets the value to a concatenation of multiple arguments" do
+      browser.text_field(id: 'new_user_email').set!('Bye', 'Cruel', 'World')
+      expect(browser.text_field(id: "new_user_email").value).to eq 'ByeCruelWorld'
+    end
+
+    it "sets the value to blank when no arguments are provided" do
+      browser.text_field(id: 'new_user_email').set!
+      expect(browser.text_field(id: "new_user_email").value).to eq ''
+    end
+
+    it "raises ArgumentError for special keys" do
+      expect { browser.text_field(id: 'new_user_email').set!('a', :tab) }.to raise_error(ArgumentError)
+    end
+
+    it "raises UnknownObjectException if the text field doesn't exist" do
+      expect { browser.text_field(id: "no_such_id").set!('secret') }.to raise_unknown_object_exception
+    end
+
+    it "raises Exception if the value of text field doesn't match" do
+      element = browser.text_field(id: "new_user_password")
+      allow(element).to receive(:value).and_return("wrong")
+      msg = "#set! value: 'wrong' does not match expected input: 'secret'"
+      expect { element.set!('secret') }.to raise_exception(Watir::Exception::Error, msg)
+    end
+
+    it "raises Exception if the text of content editable element doesn't match" do
+      element = browser.div(id: "contenteditable")
+      allow(element).to receive(:text).and_return("wrong")
+      msg = "#set! text: 'wrong' does not match expected input: 'secret'"
+      expect { element.set!('secret') }.to raise_exception(Watir::Exception::Error, msg)
+    end
+  end
+end

data/spec/watirspec/wait_spec.rb

@@ -204,6 +204,49 @@ describe Watir::Element do
       element = browser.div(id: 'bar')
       expect { element.wait_until(interval: 0.1) { true } }.to_not raise_exception
     end
+
+    context "accepts keywords instead of block" do
+      before { browser.refresh }
+
+      it "accepts text keyword" do
+        element = browser.div(id: 'bar')
+        browser.a(id: 'show_bar').click
+        expect { element.wait_until(text: 'bar') }.to_not raise_exception
+      end
+
+      it "accepts regular expression value" do
+        element = browser.div(id: 'bar')
+        browser.a(id: 'show_bar').click
+        expect { element.wait_until(style: /block/) }.to_not raise_exception
+      end
+
+      it "accepts multiple keywords" do
+        element = browser.div(id: 'bar')
+        browser.a(id: 'show_bar').click
+        expect { element.wait_until(text: 'bar', style: /block/) }.to_not raise_exception
+      end
+
+      it "accepts custom keyword" do
+        element = browser.div(id: 'bar')
+        browser.a(id: 'show_bar').click
+        expect { element.wait_until(custom: 'bar') }.to_not raise_exception
+      end
+
+      it "times out when single keyword not met" do
+        element = browser.div(id: 'bar')
+        expect { element.wait_until(id: 'foo') }.to raise_timeout_exception
+      end
+
+      it "times out when one of multiple keywords not met" do
+        element = browser.div(id: 'bar')
+        expect { element.wait_until(id: 'bar', text: 'foo') }.to raise_timeout_exception
+      end
+
+      it "times out when a custom keywords not met" do
+        element = browser.div(id: 'bar')
+        expect { element.wait_until(custom: 'foo') }.to raise_timeout_exception
+      end
+    end
   end
 
   describe "#wait_while" do
@@ -240,6 +283,48 @@ describe Watir::Element do
       element = browser.div(id: 'foo')
       expect { element.wait_while(interval: 0.1) { false } }.to_not raise_exception
     end
+
+    context "accepts keywords instead of block" do
+      it "accepts text keyword" do
+        element = browser.div(id: 'foo')
+        browser.a(id: 'hide_foo').click
+        expect { element.wait_while(text: 'foo') }.to_not raise_exception
+      end
+
+      it "accepts regular expression value" do
+        element = browser.div(id: 'foo')
+        browser.a(id: 'hide_foo').click
+        expect { element.wait_while(style: /block/) }.to_not raise_exception
+      end
+
+      it "accepts multiple keywords" do
+        element = browser.div(id: 'foo')
+        browser.a(id: 'hide_foo').click
+        expect { element.wait_while(text: 'foo', style: /block/) }.to_not raise_exception
+      end
+
+      it "accepts custom attributes" do
+        element = browser.div(id: 'foo')
+        browser.a(id: 'hide_foo').click
+        expect { element.wait_while(custom: '') }.to_not raise_exception
+      end
+
+      it "times out when single keyword not met" do
+        element = browser.div(id: 'foo')
+        expect { element.wait_while(id: 'foo') }.to raise_timeout_exception
+      end
+
+      it "times out when one of multiple keywords not met" do
+        element = browser.div(id: 'foo')
+        browser.a(id: 'hide_foo').click
+        expect { element.wait_while(id: 'foo', style: /block/) }.to raise_timeout_exception
+      end
+
+      it "times out when one of custom keywords not met" do
+        element = browser.div(id: 'foo')
+        expect { element.wait_while(custom: '') }.to raise_timeout_exception
+      end
+    end
   end
 end
 

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.12.0'
+  s.version     = '6.13.0'
   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.12.0
+  version: 6.13.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -292,6 +292,7 @@ files:
 - lib/watir/js_snippets/selectOptionsValue.js
 - lib/watir/js_snippets/selectText.js
 - lib/watir/js_snippets/selectedOptions.js
+- lib/watir/js_snippets/setText.js
 - lib/watir/js_snippets/setValue.js
 - lib/watir/legacy_wait.rb
 - lib/watir/locators.rb
@@ -497,6 +498,7 @@ files:
 - spec/watirspec/screenshot_spec.rb
 - spec/watirspec/special_chars_spec.rb
 - spec/watirspec/support/rspec_matchers.rb
+- spec/watirspec/user_editable_spec.rb
 - spec/watirspec/wait_spec.rb
 - spec/watirspec/window_switching_spec.rb
 - spec/watirspec_helper.rb
@@ -697,6 +699,7 @@ test_files:
 - spec/watirspec/screenshot_spec.rb
 - spec/watirspec/special_chars_spec.rb
 - spec/watirspec/support/rspec_matchers.rb
+- spec/watirspec/user_editable_spec.rb
 - spec/watirspec/wait_spec.rb
 - spec/watirspec/window_switching_spec.rb
 - spec/watirspec_helper.rb