watir 6.7.3 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b930f2cf34bcc0aad97aa3ea3e8fc13b17e3ecc
-  data.tar.gz: c499625ec63a5040ee9ad3d1fd37e2f4db5603c5
+  metadata.gz: a66dabc56ffe4185432094583faf989c4d63d178
+  data.tar.gz: bb71b8ee9d9d0ee4aa1ea1d8108cff79dd150615
 SHA512:
-  metadata.gz: b1c18ce7ac92e2230145cd918590f659c0dd9d6b548962ba6345127bf7ab8a2784754145a0d39a6de9d9b67bcbcf869c27fbaad31a4444a3ab046f71d9f3e5e2
-  data.tar.gz: c263afc6af431c74738b73b290b8613a99417d7243cee861ca3f41b09e7f58d6c08532c7cf0ebef492845b1d51dfc64333a736c322e2835a3cc9b282439dbd32
+  metadata.gz: 0e92e54f8c58808687de13dc63c7a8e2bbd2931e9bbc35492d0192a7d79f4385e16e1f1013b0105483dd0f88117c3b73dc0a59a3722717f7af5d7d252f46e6dc
+  data.tar.gz: 1d86e168b0b18eb97b3502311197ca045c902813f7596eeb13a6b0dcdb0696737f9fe557ed4285d2bf8df7a62f17ca56a69da25e643cc194e11419e4304a678c

data/.travis.yml

@@ -9,6 +9,8 @@ notifications:
     secure: BLsBCm33R32VNRccrLx9F0P24X6BVpVHj1OWaN4Kyn6g9qXteIwC2VKVMnKNbifpojfMkrn0OeFQFK1O1DSOsC3mgzn/udoB+DnUGcSemFUn04xhbYF5SI+3zGPKPo0JLvjjdEKSSma84YwKdrj88pGUK34p01gL8hiaqjFzWdk=
 before_script:
   - support/travis.sh
+  - export PATH=~/.webdrivers:$PATH
+
 script: bundle exec rake $RAKE_TASK
 
 _version:

data/CHANGES.md

@@ -1,3 +1,14 @@
+### 6.8.0 (2017-08-28)
+
+* Add AfterHook executions to additional methods that can change DOM
+* Deprecate `Select#select_value` in favor of `Select#select`
+* Implement `Element` `#click!`, `#double_click!` & `#set!` with JavaScript
+* Implement `Select#select!` and `Select#select_all!` with JavaScript
+* Implement `Element#inner_text` and `Element#text_content`
+* Implement `RadioSet`
+* Implement `Input#label`
+* Fix bug preventing Capabilities from handling :listener
+
 ### 6.7.3 (2017-08-20)
 
 * Fix bug preventing Capabilities from handling :driver_opts (#629)

data/lib/watir.rb

@@ -7,8 +7,9 @@ require 'watir/xpath_support'
 require 'watir/window'
 require 'watir/has_window'
 require 'watir/adjacent'
+require 'watir/js_execution'
 require 'watir/alert'
-require 'watir/atoms'
+require 'watir/js_snippets'
 require 'watir/container'
 require 'watir/cookies'
 require 'watir/capabilities'
@@ -148,6 +149,8 @@ require 'watir/elements/table_row'
 require 'watir/elements/table_section'
 require 'watir/elements/text_area'
 require 'watir/elements/text_field'
+require 'watir/elements/input'
+require 'watir/radio_set'
 
 require 'watir/locators'
 require 'watir/aliases'

data/lib/watir/adjacent.rb

@@ -111,7 +111,7 @@ 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]
-                self.send(opt[:tag_name]).class
+                Watir.tag_to_class[opt[:tag_name].to_sym]
               elsif !plural
                 HTMLElement
               elsif opt[:tag_name]

data/lib/watir/browser.rb

@@ -91,6 +91,7 @@ module Watir
 
     def back
       @driver.navigate.back
+      @after_hooks.run
     end
 
     #
@@ -99,6 +100,7 @@ module Watir
 
     def forward
       @driver.navigate.forward
+      @after_hooks.run
     end
 
     #
@@ -255,12 +257,12 @@ module Watir
     #   #=> true
     #
     # @param [String] script JavaScript snippet to execute
-    # @param *args Arguments will be available in the given script in the 'arguments' pseudo-array
+    # @param args Arguments will be available in the given script in the 'arguments' pseudo-array
     #
 
     def execute_script(script, *args)
       args.map! { |e| e.kind_of?(Watir::Element) ? e.wd : e }
-      returned = @driver.execute_script(script, *args)
+      returned = @driver.execute_script(script, *args).tap { @after_hooks.run }
 
       wrap_elements_in(self, returned)
     end
@@ -272,7 +274,7 @@ module Watir
     #   browser.goto "www.google.com"
     #   browser.send_keys "Watir", :return
     #
-    # @param [String, Symbol] *args
+    # @param [String, Symbol] args
     #
 
     def send_keys(*args)

data/lib/watir/capabilities.rb

@@ -32,6 +32,7 @@ module Watir
 
       @selenium_opts[:port] = @options.delete(:port) if @options.key?(:port)
       @selenium_opts[:driver_opts] = @options.delete(:driver_opts) if @options.key?(:driver_opts)
+      @selenium_opts[:listener] = @options.delete(:listener) if @options.key?(:listener)
 
       process_browser_options
       process_capabilities

data/lib/watir/container.rb

@@ -1,7 +1,7 @@
 module Watir
   module Container
     include XpathSupport
-    include Atoms
+    include JSSnippets
 
     #
     # Returns element.

data/lib/watir/elements/element.rb

@@ -12,6 +12,7 @@ module Watir
     include EventuallyPresent
     include Waitable
     include Adjacent
+    include JSExecution
 
     attr_accessor :keyword
     attr_reader :selector
@@ -116,7 +117,7 @@ module Watir
     # @example Click an element with several modifier keys pressed
     #   browser.element(name: "new_user_button").click(:shift, :control)
     #
-    # @param [:shift, :alt, :control, :command, :meta] Modifier key(s) to press while clicking.
+    # @param [:shift, :alt, :control, :command, :meta] modifiers to press while clicking.
     #
 
     def click(*modifiers)
@@ -136,6 +137,18 @@ module Watir
       browser.after_hooks.run
     end
 
+    #
+    # Simulates JavaScript click event on element.
+    #
+    # @example Click an element
+    #   browser.element(name: "new_user_button").click!
+    #
+
+    def click!
+      fire_event :click
+      browser.after_hooks.run
+    end
+
     #
     # Double clicks the element.
     # Note that browser support may vary.
@@ -149,6 +162,19 @@ module Watir
       browser.after_hooks.run
     end
 
+    #
+    # Simulates JavaScript double click event on element.
+    #
+    # @example
+    #   browser.element(name: "new_user_button").double_click!
+    #
+
+    def double_click!
+      fire_event :dblclick
+      browser.after_hooks.run
+    end
+
+
     #
     # Right clicks the element.
     # Note that browser support may vary.
@@ -187,11 +213,13 @@ module Watir
     def drag_and_drop_on(other)
       assert_is_element other
 
-      element_call(:wait_for_present) do
+      value = element_call(:wait_for_present) do
         driver.action.
                drag_and_drop(@element, other.wd).
                perform
       end
+      browser.after_hooks.run
+      value
     end
 
     #
@@ -213,36 +241,6 @@ module Watir
       end
     end
 
-    #
-    # Flashes (change background color to a new color and back a few times) element.
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").flash
-    #   browser.text_field(name: "new_user_first_name").flash(color: "green", flashes: 3, delay: 0.05)
-    #   browser.text_field(name: "new_user_first_name").flash(color: "yellow")
-    #   browser.text_field(name: "new_user_first_name").flash(flashes: 4)
-    #   browser.text_field(name: "new_user_first_name").flash(delay: 0.1)
-    #
-    # @param [String] color what color to flash with
-    # @param [Integer] flashes number of times element should be flashed
-    # @param [Integer, Float] delay how long to wait between flashes
-    #
-
-    def flash(color: 'red', flashes: 10, delay: 0)
-      background_color = style("backgroundColor")
-      element_color = driver.execute_script("arguments[0].style.backgroundColor", @element)
-
-      flashes.times do |n|
-        nextcolor = n.even? ? color : background_color
-        driver.execute_script("arguments[0].style.backgroundColor = '#{nextcolor}'", @element)
-        sleep(delay)
-      end
-
-      driver.execute_script("arguments[0].style.backgroundColor = arguments[1]", @element, element_color)
-
-      self
-    end
-
     #
     # Returns value of the element.
     #
@@ -271,59 +269,19 @@ module Watir
     end
     alias_method :attribute, :attribute_value
 
-    #
-    # Returns outer (inner + element itself) HTML code of element.
-    #
-    # @example
-    #   browser.div(id: 'foo').outer_html
-    #   #=> "<div id=\"foo\"><a href=\"#\">hello</a></div>"
-    #
-    # @return [String]
-    #
-
-    def outer_html
-      element_call { execute_atom(:getOuterHtml, @element) }.strip
-    end
-    alias_method :html, :outer_html
-
-    #
-    # Returns inner HTML code of element.
-    #
-    # @example
-    #   browser.div(id: 'foo').inner_html
-    #   #=> "<a href=\"#\">hello</a>"
-    #
-    # @return [String]
-    #
-
-    def inner_html
-      element_call { execute_atom(:getInnerHtml, @element) }.strip
-    end
-
     #
     # Sends sequence of keystrokes to element.
     #
     # @example
     #   browser.text_field(name: "new_user_first_name").send_keys "Watir", :return
     #
-    # @param [String, Symbol] *args
+    # @param [String, Symbol] args
     #
 
     def send_keys(*args)
       element_call(:wait_for_writable) { @element.send_keys(*args) }
     end
 
-    #
-    # Focuses element.
-    # Note that Firefox queues focus events until the window actually has focus.
-    #
-    # @see http://code.google.com/p/selenium/issues/detail?id=157
-    #
-
-    def focus
-      element_call { driver.execute_script "return arguments[0].focus()", @element }
-    end
-
     #
     # Returns true if this element is focused.
     #
@@ -334,24 +292,6 @@ module Watir
       element_call { @element == driver.switch_to.active_element }
     end
 
-    #
-    # Simulates JavaScript events on element.
-    # Note that you may omit "on" from event name.
-    #
-    # @example
-    #   browser.button(name: "new_user_button").fire_event :click
-    #   browser.button(name: "new_user_button").fire_event "mousemove"
-    #   browser.button(name: "new_user_button").fire_event "onmouseover"
-    #
-    # @param [String, Symbol] event_name
-    #
-
-    def fire_event(event_name)
-      event_name = event_name.to_s.sub(/^on/, '').downcase
-
-      element_call { execute_atom :fireEvent, @element, event_name }
-    end
-
     #
     # Scroll until the element is in the view screen
     #
@@ -546,13 +486,6 @@ module Watir
       @query_scope.browser
     end
 
-    #
-    # Delegates script execution to Browser or IFrame.
-    #
-    def execute_script(script, *args)
-      @query_scope.execute_script(script, *args)
-    end
-
     #
     # Returns true if a previously located element is no longer attached to DOM.
     #

data/lib/watir/elements/file_field.rb

@@ -4,7 +4,7 @@ module Watir
     #
     # Set the file field to the given path
     #
-    # @param [String] a path
+    # @param [String] path
     # @raise [Errno::ENOENT] if the file doesn't exist
     #
 

data/lib/watir/elements/iframe.rb

@@ -64,7 +64,7 @@ module Watir
       args.map! { |e| e.kind_of?(Watir::Element) ? e.wd : e }
       returned = driver.execute_script(script, *args)
 
-      browser.send :wrap_elements_in, self, returned
+      browser.send(:wrap_elements_in, self, returned).tap { browser.after_hooks.run }
     end
 
     def ensure_context

data/lib/watir/elements/image.rb

@@ -9,11 +9,7 @@ module Watir
 
     def loaded?
       return false unless complete?
-
-      driver.execute_script(
-        'return typeof arguments[0].naturalWidth != "undefined" && arguments[0].naturalWidth > 0',
-        @element
-      )
+      element_call { execute_js(:isImageLoaded, @element) }
     end
 
   end # Image

data/lib/watir/elements/input.rb

@@ -0,0 +1,15 @@
+module Watir
+  class Input < HTMLElement
+
+    #
+    # Returns label element associated with Input element.
+    #
+    # @return [Watir::Label]
+    #
+
+    def label
+      parent(tag_name: 'form').label(for: id)
+    end
+
+  end # Input
+end # Watir

data/lib/watir/elements/radio.rb

@@ -1,6 +1,11 @@
 module Watir
   class Radio < Input
 
+    def initialize(query_scope, selector)
+      super
+      @selector[:label] = @selector.delete(:text) if @selector.key?(:text)
+    end
+
     #
     # Selects this radio button.
     #
@@ -21,6 +26,18 @@ module Watir
     end
     alias_method :selected?, :set?
 
+    #
+    # Returns the text of the associated label.
+    # Returns empty string if no label is found.
+    #
+    # @return [String]
+    #
+
+    def text
+      l = label()
+      l.exist? ? l.text : ''
+    end
+
   end # Radio
 
   module Container

data/lib/watir/elements/select.rb

@@ -42,7 +42,7 @@ module Watir
     #
 
     def select(str_or_rx)
-      select_by :text, str_or_rx
+      select_by str_or_rx
     end
 
     #
@@ -54,7 +54,29 @@ module Watir
     #
 
     def select_all(str_or_rx)
-      select_all_by :text, str_or_rx
+      select_all_by str_or_rx
+    end
+
+    #
+    # Uses JavaScript to select the option whose text matches the given string.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
+    #
+
+    def select!(str_or_rx)
+      select_by!(str_or_rx, :single)
+    end
+
+    #
+    # Uses JavaScript to select all options whose text matches the given string.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
+    #
+
+    def select_all!(str_or_rx)
+      select_by!(str_or_rx, :multiple)
     end
 
     #
@@ -68,7 +90,8 @@ module Watir
     #
 
     def select_value(str_or_rx)
-      select_by :value, str_or_rx
+      Watir.logger.deprecate '#select_value', "#select"
+      select_by str_or_rx
     end
 
     #
@@ -121,24 +144,13 @@ module Watir
     #
 
     def selected_options
-      element_call do
-        script = <<-SCRIPT
-          var result = [];
-          var options = arguments[0].options;
-          for (var i = 0; i < options.length; i++) {
-            var option = options[i];
-            if (option.selected) { result.push(option) }
-          }
-          return result;
-        SCRIPT
-        @query_scope.execute_script(script, self)
-      end
+      element_call { execute_js :selectedOptions, self }
     end
 
     private
 
-    def select_by(how, str_or_rx)
-      found = find_options(how, str_or_rx)
+    def select_by(str_or_rx)
+      found = find_options(:value, str_or_rx)
 
       if found && found.size > 1
         Watir.logger.deprecate "Selecting Multiple Options with #select", "#select_all"
@@ -147,9 +159,43 @@ module Watir
       raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
     end
 
-    def select_all_by(how, str_or_rx)
+    def select_by!(str_or_rx, number)
+      js_rx = case str_or_rx
+              when String
+                str_or_rx
+              when Regexp
+                str_or_rx.inspect.sub('\\A', '^').sub('\\Z', '$').sub('\\z', '$').sub(/^\//, '').sub(/\/[a-z]*$/, '')
+                    .gsub(/\(\?#.+\)/, '').gsub(/\(\?-\w+:/, '(')
+              else
+                raise TypeError, "expected String or Regexp, got #{str_or_rx.inspect}:#{str_or_rx.class}"
+              end
+
+      element_call { execute_js(:selectOptionsText, self, js_rx, number.to_s) }
+      return selected_options.first.text if matching_option?(:text, str_or_rx)
+
+      element_call { execute_js(:selectOptionsLabel, self, js_rx, number.to_s) }
+      return selected_options.first.text if matching_option?(:label, str_or_rx)
+
+      element_call { execute_js(:selectOptionsValue, self, js_rx, number.to_s) }
+      return selected_options.first.text if matching_option?(:value, str_or_rx)
+
+      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
+    end
+
+    def matching_option?(how, what)
+      selected_options.each do |opt|
+        value = opt.send(how)
+        if what.is_a?(String) ? value == what : value =~ what
+          return true if opt.enabled?
+          raise Watir::Exception::ObjectDisabledException, "option matching #{what} by #{how} on #{inspect} is disabled"
+        end
+      end
+      false
+    end
+
+    def select_all_by(str_or_rx)
       raise Error, "you can only use #select_all on multi-selects" unless multiple?
-      found = find_options(how, str_or_rx)
+      found = find_options :text, str_or_rx
 
       return select_matching(found) if found
       raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
@@ -159,7 +205,8 @@ module Watir
       browser.wait_while do
         case str_or_rx
         when String, Numeric, Regexp
-          @found = options(how => str_or_rx)
+          @found = how == :value ? options(value: str_or_rx) : []
+          @found = options(text: str_or_rx) if @found.empty?
           @found = options(label: str_or_rx) if @found.empty?
           @found.empty? && Watir.relaxed_locate?
         else