watir 6.5.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e19bc6a7d28d78bba208d88dd97a58bce85fc9d
-  data.tar.gz: 0031cc40646d67219270b7914369df5a7e084144
+  metadata.gz: da90c92ae28c4fd2e22b1bb60bdcbe18b060dee0
+  data.tar.gz: 9ff7214a544eda7ac4a60cd923c504f35ba92fec
 SHA512:
-  metadata.gz: f71791589c4bc26c594d25ffb755fec75a8cbf41c2d93e0bf8c9671573a66e2fac01a21618159c169fa79a25387963a5a79c6940a329b177939b305ede9c3dbd
-  data.tar.gz: 7ca2f02eb0a3c950f2e8b8e16ce8e1acb9c3dd8766637d8bc5c3594b49634c0dce2af3d7ec216add6d36f81968df69eb3b35215bd5a43c216b2c04883d350c98
+  metadata.gz: b6fbd488d5d064acaeb9b4dca1f9a3d8d6246c51b3b29d36089916e4cd3c048ccf5c343c88c8e962d1b533c8402c2a21ce3bd36db3b9dd96c2ddda89b51da2af
+  data.tar.gz: a42a2727efabda8ac3210efce1707636d61eab62f311ec8f3efe3542c065c02e8944e00ce41b785f260b94ad42b9abca5585868f49e89b0a2d824e5719c435f9

data/.travis.yml

@@ -3,31 +3,68 @@
 # use host's /dev/shm.
 sudo: required
 dist: trusty
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-addons:
-  firefox: latest
-  apt:
-    packages:
-      - unzip
-      - libxss1
-      - google-chrome-stable
 cache: bundler
 notifications:
-  recipients:
-    - p0deje@gmail.com
-    - jarmo.p@gmail.com
-    - titusfortner@gmail.com
   slack:
     secure: BLsBCm33R32VNRccrLx9F0P24X6BVpVHj1OWaN4Kyn6g9qXteIwC2VKVMnKNbifpojfMkrn0OeFQFK1O1DSOsC3mgzn/udoB+DnUGcSemFUn04xhbYF5SI+3zGPKPo0JLvjjdEKSSma84YwKdrj88pGUK34p01gL8hiaqjFzWdk=
 before_script:
   - support/travis.sh
 script: bundle exec rake $RAKE_TASK
-env:
-  - RAKE_TASK=spec:firefox
-  - RAKE_TASK=spec:firefox RELAXED_LOCATE=false
-  - RAKE_TASK=spec:chrome
-  - RAKE_TASK=spec:chrome RELAXED_LOCATE=false
-  - RAKE_TASK=yard:doctest
+
+_version:
+  two: &two
+    language: ruby
+    rvm: 2.2.7
+  three: &three
+    language: ruby
+    rvm: 2.3.4
+  four: &four
+    language: ruby
+    rvm: 2.4.1
+
+_browsers:
+  firefox: &firefox-latest
+    addons:
+      firefox: latest
+  chrome: &chrome
+     addons:
+       chrome: stable
+
+matrix:
+  include:
+      - env: RAKE_TASK=spec:remote_firefox
+        <<: *four
+        <<: *firefox-latest
+      - env: RAKE_TASK=spec:remote_chrome
+        <<: *four
+        <<: *chrome
+      - env: RAKE_TASK=spec:firefox RELAXED_LOCATE=false
+        <<: *four
+        <<: *firefox-latest
+      - env: RAKE_TASK=spec:firefox
+        <<: *four
+        <<: *firefox-latest
+      - env: RAKE_TASK=spec:firefox
+        <<: *three
+        <<: *firefox-latest
+      - env: RAKE_TASK=spec:firefox
+        <<: *two
+        <<: *firefox-latest
+      - env: RAKE_TASK=spec:chrome
+        <<: *four
+        <<: *chrome
+      - env: RAKE_TASK=spec:chrome
+        <<: *three
+        <<: *chrome
+      - env: RAKE_TASK=spec:chrome
+        <<: *two
+        <<: *chrome
+      - env: RAKE_TASK=spec:chrome RELAXED_LOCATE=false
+        <<: *four
+        <<: *chrome
+      - env: RAKE_TASK=spec:chrome HEADLESS=true
+        <<: *four
+        <<: *chrome
+      - env: RAKE_TASK=yard:doctest
+        <<: *four
+        <<: *chrome

data/CHANGES.md

@@ -1,3 +1,14 @@
+### 6.6.0 (2017-08-02)
+
+* Implement `Select#select_all` for selecting multiple options in select list
+* Deprecate `Select#select` for selecting multiple options in a list
+* Implement `ElementCollection#empty?` and `ElementCollection#locate?`
+* Implement `Watir::Logger` class
+* Implement `Watir::Capabilities` class
+* Add support for relocating elements created with `Element#to_subtype`
+* Add support for locating adjacent elements with any Watir locator 
+* Allow locating buttons by type attribute (thanks Justin Ko )
+
 ### 6.5.0 (2017-07-25)
 
 * Add support for locating multiple classes using :class parameter 

data/Rakefile

@@ -125,7 +125,6 @@ namespace :spec do
   desc 'Run specs locally for all browsers'
   task browsers: [:chrome,
                   :firefox,
-                  :ff_legacy,
                   (:safari if Selenium::WebDriver::Platform.mac?),
                   (:ie if Selenium::WebDriver::Platform.windows?),
                   (:edge if Selenium::WebDriver::Platform.windows?)].compact
@@ -133,12 +132,11 @@ namespace :spec do
   desc 'Run specs remotely for all browsers'
   task remote_browsers: [:remote_chrome,
                          :remote_firefox,
-                         :remote_ff_legacy,
                          (:remote_safari if Selenium::WebDriver::Platform.mac?),
                          (:remote_ie if Selenium::WebDriver::Platform.windows?),
                          (:remote_edge if Selenium::WebDriver::Platform.windows?)].compact
 
-  %w(firefox ff_legacy chrome safari ie edge).each do |browser|
+  %w(firefox chrome safari ie edge).each do |browser|
     desc "Run specs in #{browser}"
     task browser do
       ENV['WATIR_BROWSER'] = browser
@@ -147,8 +145,8 @@ namespace :spec do
 
     desc "Run specs in Remote #{browser}"
     task "remote_#{browser}" do
-      ENV['WATIR_BROWSER'] = 'remote'
-      ENV['REMOTE_BROWSER'] = browser
+      ENV['WATIR_BROWSER'] = browser
+      ENV["USE_REMOTE"] = 'true'
       Rake::Task[:spec].execute
     end
   end

data/lib/watir.rb

@@ -11,9 +11,11 @@ require 'watir/alert'
 require 'watir/atoms'
 require 'watir/container'
 require 'watir/cookies'
+require 'watir/capabilities'
 require 'watir/browser'
 require 'watir/screenshot'
 require 'watir/after_hooks'
+require 'watir/logger'
 
 module Watir
 
@@ -43,7 +45,7 @@ module Watir
     end
 
     def always_locate_message
-      warn <<-EOS
+      Watir.logger.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.
@@ -60,7 +62,7 @@ Use Element#stale? or Element#wait_until(&:stale?) if needed for flow control.
     end
 
     def prefer_css_message
-      warn <<-EOS
+      Watir.logger.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
@@ -101,6 +103,16 @@ require the watir_css gem - https://github.com/watir/watir_css
     end
   end
 
+  #
+  # Returns logger instance that can be used across the whole Selenium.
+  #
+  # @return [Logger]
+  #
+
+  def self.logger
+    @logger ||= Watir::Logger.new
+  end
+
 end
 
 require 'watir/attribute_helper'

data/lib/watir/adjacent.rb

@@ -10,8 +10,7 @@ module Watir
     #
 
     def parent(opt = {})
-      opt[:index] ||= 0
-      xpath_adjacent("ancestor::", opt)
+      xpath_adjacent(opt.merge(adjacent: :ancestor, plural: false))
     end
 
     #
@@ -23,8 +22,7 @@ module Watir
     #
 
     def preceding_sibling(opt = {})
-      opt[:index] ||= 0
-      xpath_adjacent("preceding-sibling::", opt)
+      xpath_adjacent(opt.merge(adjacent: :preceding, plural: false))
     end
     alias_method :previous_sibling, :preceding_sibling
 
@@ -38,7 +36,7 @@ module Watir
 
     def preceding_siblings(opt = {})
       raise ArgumentError, "#previous_siblings can not take an index value" if opt[:index]
-      xpath_adjacent("preceding-sibling::", opt)
+      xpath_adjacent(opt.merge(adjacent: :preceding, plural: true))
     end
     alias_method :previous_siblings, :preceding_siblings
 
@@ -51,8 +49,7 @@ module Watir
     #
 
     def following_sibling(opt = {})
-      opt[:index] ||= 0
-      xpath_adjacent("following-sibling::", opt)
+      xpath_adjacent(opt.merge(adjacent: :following, plural: false))
     end
     alias_method :next_sibling, :following_sibling
 
@@ -66,7 +63,7 @@ module Watir
 
     def following_siblings(opt = {})
       raise ArgumentError, "#next_siblings can not take an index value" if opt[:index]
-      xpath_adjacent("following-sibling::", opt)
+      xpath_adjacent(opt.merge(adjacent: :following, plural: true))
     end
     alias_method :next_siblings, :following_siblings
 
@@ -79,8 +76,7 @@ module Watir
     #
 
     def child(opt = {})
-      opt[:index] ||= 0
-      xpath_adjacent('', opt)
+      xpath_adjacent(opt.merge(adjacent: :child, plural: false))
     end
 
     #
@@ -93,27 +89,24 @@ module Watir
 
     def children(opt = {})
       raise ArgumentError, "#children can not take an index value" if opt[:index]
-      xpath_adjacent('', opt)
+      xpath_adjacent(opt.merge(adjacent: :child, plural: true))
     end
 
     private
 
-    def xpath_adjacent(direction = '', opt = {})
-      opt = opt.dup
-      index = opt.delete :index
-      tag_name = opt.delete :tag_name
-      unless opt.empty?
-        caller = caller_locations(1, 1)[0].label
-        raise ArgumentError, "unsupported locators: #{opt.inspect} for ##{caller} method"
-      end
-
-      if index
-        klass = tag_name ? self.send(tag_name).class : HTMLElement
-        klass.new(self, xpath: "./#{direction}#{tag_name || '*'}[#{index + 1}]")
-      else
-        klass = tag_name ? Object.const_get("#{self.send(tag_name).class}Collection") : HTMLElementCollection
-        klass.new(self, xpath: "./#{direction}#{tag_name || '*'}")
-      end
+    def xpath_adjacent(opt = {})
+      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
+              elsif !plural
+                HTMLElement
+              elsif opt[:tag_name]
+                 Object.const_get("#{self.send(opt[:tag_name]).class}Collection")
+              else
+                HTMLElementCollection
+              end
+      klass.new(self, opt)
     end
 
   end # Adjacent

data/lib/watir/alert.rb

@@ -110,7 +110,7 @@ module Watir
           message = "This code has slept for the duration of the default timeout "
           message << "waiting for an Alert to exist. If the test is still passing, "
           message << "consider using Alert#exists? instead of rescuing UnknownObjectException"
-          warn message
+          Watir.logger.warn message
         end
         raise Exception::UnknownObjectException, 'unable to locate alert'
       end

data/lib/watir/attribute_helper.rb

@@ -62,7 +62,7 @@ module Watir
       when 'Float'
         define_float_attribute(name, attr)
       else
-        # $stderr.puts "treating #{type.inspect} as string for now"
+        Watir.logger.debug "treating #{type.inspect} as string for now"
       end
     end
 

data/lib/watir/browser.rb

@@ -44,7 +44,8 @@ module Watir
     def initialize(browser = :chrome, *args)
       case browser
       when ::Symbol, String
-        @driver = Selenium::WebDriver.for browser.to_sym, *args
+        selenium_args = Watir::Capabilities.new(browser, *args).to_args
+        @driver = Selenium::WebDriver.for *selenium_args
       when Selenium::WebDriver::Driver
         @driver = browser
       else
@@ -58,8 +59,10 @@ module Watir
 
     def inspect
       '#<%s:0x%x url=%s title=%s>' % [self.class, hash*2, url.inspect, title.inspect]
-    rescue
-      '#<%s:0x%x closed=%s>' % [self.class, hash*2, @closed.to_s]
+    rescue Errno::ECONNREFUSED
+      '#<%s:0x%x closed=true>' % [self.class, hash*2]
+    rescue Selenium::WebDriver::Error::UnhandledAlertError
+      '#<%s:0x%x alert=true>' % [self.class, hash*2]
     end
     alias selector_string inspect
 

data/lib/watir/capabilities.rb

@@ -0,0 +1,95 @@
+module Watir
+  class Capabilities
+
+    attr_reader :options
+
+    def initialize(browser, options = {})
+      @browser = browser == :remote ? @options.delete(:browser).to_sym : browser.to_sym
+      @selenium_browser = browser == :remote || options[:url] ? :remote : browser
+
+      @options = options
+      @selenium_opts = {}
+    end
+
+    def to_args
+      [@selenium_browser, process_capabilities]
+    end
+
+    private
+
+    def process_capabilities
+      url = @options.delete(:url)
+      @selenium_opts[:url] = url if url
+
+      create_http_client
+
+      @selenium_opts[:port] = @options.delete(:port) if @options.key?(:port)
+
+      process_browser_options
+      process_caps
+
+      @selenium_opts
+    end
+
+    def create_http_client
+      client_timeout = @options.delete(:client_timeout)
+      open_timeout = @options.delete(:open_timeout)
+      read_timeout = @options.delete(:read_timeout)
+
+      http_client = @options.delete(:http_client)
+
+      %i(open_timeout read_timeout client_timeout).each do |t|
+        next if http_client.nil? || !respond_to?(t)
+        warn "You can now pass #{t} value directly into Watir::Browser opt without needing to use :http_client"
+      end
+
+      http_client ||= Selenium::WebDriver::Remote::Http::Default.new
+
+      http_client.timeout = client_timeout if client_timeout
+      http_client.open_timeout = open_timeout if open_timeout
+      http_client.read_timeout = read_timeout if read_timeout
+      @selenium_opts[:http_client] = http_client
+    end
+
+    def process_browser_options
+      browser_options = @options.delete(:options)
+
+      case @selenium_browser
+      when :chrome
+        if @options.key?(:args)
+          browser_options ||= {}
+          browser_options[:args] = @options.delete(:args)
+        end
+        if @options.delete(:headless)
+          browser_options ||= {}
+          browser_options[:args] << '--headless'
+          browser_options[:args] << '--disable-gpu'
+        end
+        @selenium_opts[:options] = Selenium::WebDriver::Chrome::Options.new(browser_options) if browser_options
+      when :firefox
+        @selenium_opts[:options] = Selenium::WebDriver::Firefox::Options.new(options) if browser_options
+      when :safari
+        @selenium_opts["safari.options"] = {'technologyPreview' => true} if @options[:technology_preview]
+      when :remote
+        if @browser == :chrome && @options.delete(:headless)
+          @options.delete(:args)
+          @options['chromeOptions'] = {'args' => ['--headless', '--disable-gpu']}
+        end
+      end
+    end
+
+    def process_caps
+      caps = @options.delete(:desired_capabilities)
+
+      if caps
+        warn 'You can now pass values directly into Watir::Browser opt without needing to use :desired_capabilities'
+        @selenium_opts.merge!(@options)
+      else
+        caps = Selenium::WebDriver::Remote::Capabilities.send @browser, @options
+      end
+
+      @selenium_opts[:desired_capabilities] = caps
+    end
+
+  end
+end

data/lib/watir/cookies.rb

@@ -56,12 +56,11 @@ module Watir
     def add(name, value, opts = {})
       cookie = {
         name: name,
-        value: value,
-        secure: opts[:secure],
-        path: opts[:path],
-        expires: opts[:expires],
-        domain: opts[:domain]
-      }
+        value: value}
+      cookie[:secure] = opts[:secure] if opts.key?(:secure)
+      cookie[:path] = opts[:path] if opts.key?(:path)
+      cookie[:expires] = opts[:expires] if opts.key?(:expires)
+      cookie[:domain] = opts[:domain] if opts.key?(:domain)
 
       @control.add_cookie cookie
     end