watir 6.14.0 → 6.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6cd2d994ac6819dcc74e5b15639de4061bf1fe
-  data.tar.gz: f713658a590057181b64c8cfb26e2c278c02fdda
+  metadata.gz: d985e9510a911174b9ba60c5d3174eb67fc612b5
+  data.tar.gz: f7a5ba01ad7bea4f7fe8222c55f571e5340d8725
 SHA512:
-  metadata.gz: c55e3c6cb644323b2e1e4dfe0b1488a9c0a53733d88022f4986e55cfb6ee0ad5b4b64c5604f096df2d702d86f4d2393012f6ad507468e88fad4be89c10fbbee1
-  data.tar.gz: 07f6e39aa359c8c89b2dc012a7ce6ef4a4c17b68645ef827aed01bb03cf130217e94c69eb0fadc5d41826708fe672c443b73c80e54613f7e08ca81c2f1bbad04
+  metadata.gz: 4ba1c06f7bfeaa9c8ac573ca2b023a23dc5222741d925db41d77e72bfaeb46d5a7f217560337d1afbf8e8d9204b050dcded5ff50218ba5129ba48ceff3adf3db
+  data.tar.gz: 98e3d14ab62868105c6e7af9108fbfd341fbc6f181baae28235b2aca8bafdad9c0c9e9b5c664c809a69bb84b80320e08adfd217751df0f4a87f2c30b794b5a04

data/.rubocop.yml

@@ -53,28 +53,42 @@ Metrics/ModuleLength:
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 18
+  Exclude:
+  - 'lib/watir/locators/element/selector_builder.rb'
+  - 'lib/watir/locators/element/selector_builder/xpath.rb'
+  - 'lib/watir/locators/element/selector_builder/regexp_disassembler.rb'
 
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 116
+  Max: 95
   Exclude:
+    - 'lib/watir/capabilities.rb'
     - 'lib/watir/locators/element/locator.rb'
+    - 'lib/watir/locators/element/selector_builder.rb'
+    - 'lib/watir/locators/element/selector_builder/xpath.rb'
     - 'lib/watir/browser.rb'
+    - 'lib/watir/window.rb'
     - 'lib/watir/elements/element.rb'
     - 'lib/watir/elements/select.rb'
+    - 'lib/watir/generator/base/spec_extractor.rb'
 
 Metrics/PerceivedComplexity:
-  Max: 9
+  Max: 10
 
 Metrics/CyclomaticComplexity:
-  Max: 9
+  Max: 8
+  Exclude:
+  - 'lib/watir/locators/element/selector_builder.rb'
 
-# Offense count: 28
 Metrics/AbcSize:
-  Max: 22
+  Max: 20
   Exclude:
     - 'lib/watir/locators/element/selector_builder.rb'
+    - 'lib/watir/locators/element/selector_builder/regexp_disassembler.rb'
+    - 'lib/watir/locators/element/selector_builder/xpath.rb'
+    - 'lib/watir/locators/element/locator.rb'
     - 'lib/watir/generator/base/generator.rb'
+    - 'lib/watir/generator/base/visitor.rb'
 
 # TODO: fix with Watir 7
 # Configuration parameters: CountKeywordArgs.
@@ -107,6 +121,10 @@ Style/GlobalVars:
   AllowedVariables:
     - $browser
 
+Style/RegexpLiteral:
+  Exclude:
+    - 'spec/watirspec/selector_builder/element_spec.rb'
+
 ### Cop supports --auto-correct.
 ### Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 ## SupportedStyles: single_quotes, double_quotes
@@ -124,7 +142,7 @@ Style/MethodCallWithoutArgsParentheses:
 Style/FormatStringToken:
   Exclude:
     - 'lib/watir/browser.rb'
-    - 'lib/watir/locators/text_field/selector_builder.rb'
+    - 'lib/watir/locators/text_field/selector_builder/xpath.rb'
     - 'lib/watir/window.rb'
 
 Style/Documentation:

data/CHANGES.md

@@ -1,3 +1,13 @@
+### 6.15.0 (2018-11-07)
+
+* Add `Element#selected_text`
+* Add `Element#classes`
+* Add `Element#obscured?`
+* Deprecate `#wait_until_present` and `#wait_while_present`
+* Improved Locator classes to reduce wire calls when using multiple/complex locators
+* Fix bug with IE options
+* Allow time values in yaml files for cookies (thanks Ryan Baumann)
+
 ### 6.14.0 (2018-09-13)
 
 * HTML Element attribute support updated to HTML 5.2

data/Gemfile

@@ -1,7 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'simplecov', '>= 0.3.5', platform: :ruby_19 unless ENV['TRAVIS']
-
 gem 'webidl', path: File.expand_path('../webidl') if ENV['LOCAL_WEBIDL']
 
 gem 'selenium-webdriver', path: File.expand_path('../selenium/build/rb') if ENV['LOCAL_SELENIUM']

data/README.md

@@ -6,7 +6,7 @@ Watir Powered By Selenium!
 [![Travis Status](https://travis-ci.org/watir/watir.svg?branch=master)](https://travis-ci.org/watir/watir)
 [![AppVeyor status](https://ci.appveyor.com/api/projects/status/9vbb7pp5p4uyoott/branch/master?svg=true)](https://ci.appveyor.com/project/p0deje/watir)
 [![Code Climate](https://codeclimate.com/github/watir/watir.svg)](https://codeclimate.com/github/watir/watir)
-[![Coverage Status](https://coveralls.io/repos/watir/watir/badge.svg?branch=master)](https://coveralls.io/r/watir/watir)
+[![Coverage Status](https://coveralls.io/repos/github/watir/watir/badge.svg?branch=master)](https://coveralls.io/github/watir/watir?branch=master)
 
 ## Using Watir
 

data/Rakefile

@@ -41,7 +41,7 @@ end
 
       File.open(spec_path, 'w') do |io|
         io << "<!--  downloaded from #{spec_uri} on #{Time.now} -->\n"
-        io << data = URI.open(spec_uri).read
+        io << data = URI.parse(spec_uri).read
         downloaded_bytes = data.bytesize
       end
 
@@ -73,7 +73,7 @@ end
         generator.generate(spec_path, file)
       end
 
-      system "diff -Naut #{old_file} #{old_file}.new | less" if File.exist?(old_file)
+      system "diff -Naut #{old_file} #{old_file}.new" if File.exist?(old_file)
     end
 
     desc "Move #{type}.rb.new to #{type}.rb"

data/lib/watir.rb

@@ -4,7 +4,6 @@ require 'time'
 require 'watir/legacy_wait'
 require 'watir/wait'
 require 'watir/exception'
-require 'watir/xpath_support'
 require 'watir/window'
 require 'watir/has_window'
 require 'watir/adjacent'
@@ -55,7 +54,7 @@ module Watir
     end
 
     #
-    # Whether or not Watir should prefer CSS when translating the Watir selectors to Selenium.
+    # Whether or not Watir should prefer CSS when translating the Watir selector to Selenium.
     #
 
     def prefer_css?
@@ -104,7 +103,7 @@ module Watir
   #
 
   def self.logger
-    @logger ||= Watir::Logger.new
+    @logger ||= Logger.new
   end
 end
 require 'watir/locators'

data/lib/watir/adjacent.rb

@@ -59,7 +59,7 @@ module Watir
     #
     # @example
     #   browser.text_field(name: "new_user_first_name").following_siblings.size
-    #   #=> 53
+    #   #=> 55
     #
 
     def following_siblings(opt = {})
@@ -74,7 +74,7 @@ module Watir
     #
     # @example
     #   browser.text_field(name: "new_user_first_name").siblings.size
-    #   #=> 57
+    #   #=> 59
     #
 
     def siblings(opt = {})

data/lib/watir/alert.rb

@@ -2,6 +2,7 @@ module Watir
   class Alert
     include EventuallyPresent
     include Waitable
+    include Exception
 
     def initialize(browser)
       @browser = browser
@@ -79,13 +80,14 @@ module Watir
     def exists?
       assert_exists
       true
-    rescue Exception::UnknownObjectException
+    rescue UnknownObjectException
       false
     end
     alias present? exists?
 
     #
     # @api private
+    # @see Watir::Wait
     #
 
     def selector_string
@@ -97,7 +99,7 @@ module Watir
     def assert_exists
       @alert = @browser.driver.switch_to.alert
     rescue Selenium::WebDriver::Error::NoSuchAlertError
-      raise Exception::UnknownObjectException, 'unable to locate alert'
+      raise UnknownObjectException, 'unable to locate alert'
     end
 
     def wait_for_exists
@@ -106,13 +108,7 @@ module Watir
       begin
         wait_until(message: 'waiting for alert', &:exists?)
       rescue Wait::TimeoutError
-        unless Watir.default_timeout.zero?
-          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'
-          Watir.logger.warn message, ids: [:wait_for_alert]
-        end
-        raise Exception::UnknownObjectException, 'unable to locate alert'
+        raise UnknownObjectException, 'unable to locate alert'
       end
     end
   end # Alert

data/lib/watir/attribute_helper.rb

@@ -52,8 +52,6 @@ module Watir
 
     def define_attribute(type, name, attr)
       case type.to_s
-      when 'String'
-        define_string_attribute(name, attr)
       when 'Boolean'
         define_boolean_attribute(name, attr)
       when 'Integer'
@@ -61,7 +59,7 @@ module Watir
       when 'Float'
         define_float_attribute(name, attr)
       else
-        Watir.logger.debug "treating #{type.inspect} as string for now"
+        define_string_attribute(name, attr)
       end
     end
 
@@ -87,6 +85,7 @@ module Watir
     def define_float_attribute(mname, aname)
       define_method mname do
         value = attribute_value(aname)
+        value = nil if value == 'NaN'
         value && Float(value)
       end
     end

data/lib/watir/browser.rb

@@ -8,6 +8,7 @@ module Watir
     include HasWindow
     include Waitable
     include Navigation
+    include Exception
 
     attr_writer :default_context, :original_window, :locator_namespace
     attr_reader :driver, :after_hooks
@@ -40,7 +41,7 @@ module Watir
     def initialize(browser = :chrome, *args)
       case browser
       when ::Symbol, String
-        selenium_args = Watir::Capabilities.new(browser, *args).to_args
+        selenium_args = Capabilities.new(browser, *args).to_args
         @driver = Selenium::WebDriver.for(*selenium_args)
       when Selenium::WebDriver::Driver
         @driver = browser
@@ -212,7 +213,7 @@ module Watir
     #
 
     def execute_script(script, *args)
-      args.map! { |e| e.is_a?(Watir::Element) ? e.wd : e }
+      args.map! { |e| e.is_a?(Element) ? e.wd : e }
 
       wrap_elements_in(self, @driver.execute_script(script, *args))
     end
@@ -252,21 +253,8 @@ module Watir
     end
     alias exists? exist?
 
-    #
-    # Protocol shared with Watir::Element
-    #
-    # @api private
-    #
-
-    def assert_exists
-      locate
-      return if window.present?
-
-      raise Exception::NoMatchingWindowFoundException, 'browser window was closed'
-    end
-
     def locate
-      raise Exception::Error, 'browser was closed' if @closed
+      raise Error, 'browser was closed' if @closed
 
       ensure_context
     end
@@ -298,7 +286,7 @@ module Watir
     #
 
     def locator_namespace
-      @locator_namespace ||= Watir::Locators
+      @locator_namespace ||= Locators
     end
 
     #

data/lib/watir/capabilities.rb

@@ -113,6 +113,17 @@ module Watir
         if @browser == :safari && @options.delete(:technology_preview)
           @options['safari.options'] = {'technologyPreview' => true}
         end
+      when :ie
+        if @options.key?(:args)
+          browser_options ||= {}
+          browser_options[:args] = @options.delete(:args).dup
+        end
+        unless browser_options.is_a? Selenium::WebDriver::IE::Options
+          ie_caps = browser_options.select { |k| Selenium::WebDriver::IE::Options::CAPABILITIES.include?(k) }
+          browser_options = Selenium::WebDriver::IE::Options.new(browser_options)
+          ie_caps.each { |k, v| browser_options.add_option(k, v) }
+        end
+        @selenium_opts[:options] = browser_options
       end
     end
     # rubocop:enable Metrics/AbcSize

data/lib/watir/cell_container.rb

@@ -7,7 +7,7 @@ module Watir
     #
 
     def cell(*args)
-      Cell.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
+      Cell.new(self, extract_selector(args))
     end
 
     #
@@ -17,7 +17,7 @@ module Watir
     #
 
     def cells(*args)
-      CellCollection.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
+      CellCollection.new(self, extract_selector(args))
     end
   end # CellContainer
 end # Watir

data/lib/watir/container.rb

@@ -1,6 +1,5 @@
 module Watir
   module Container
-    include XpathSupport
     include JSSnippets
 
     #
@@ -33,22 +32,22 @@ module Watir
     # @api private
     #
 
-    def extract_selector(selectors)
-      case selectors.size
+    def extract_selector(selector)
+      case selector.size
       when 2
-        msg = "Using ordered parameters to locate elements (:#{selectors.first}, #{selectors.last.inspect})"
+        msg = "Using ordered parameters to locate elements (:#{selector.first}, #{selector.last.inspect})"
         Watir.logger.deprecate msg,
-                               "{#{selectors.first}: #{selectors.last.inspect}}",
+                               "{#{selector.first}: #{selector.last.inspect}}",
                                ids: [:selector_parameters]
-        return {selectors[0] => selectors[1]}
+        return {selector[0] => selector[1]}
       when 1
-        obj = selectors.first
+        obj = selector.first
         return obj if obj.is_a? Hash
       when 0
         return {}
       end
 
-      raise ArgumentError, "expected Hash, got #{selectors.inspect}"
+      raise ArgumentError, "expected Hash, got #{selector.inspect}"
     end
   end # Container
 end # Watir

data/lib/watir/cookies.rb

@@ -18,7 +18,7 @@ module Watir
 
     def to_a
       @control.all_cookies.map do |e|
-        e.merge(expires: e[:expires] ? to_time(e[:expires]) : nil)
+        e.merge(expires: e[:expires] ? e[:expires].to_time : nil)
       end
     end
 
@@ -115,19 +115,9 @@ module Watir
     #
 
     def load(file = '.cookies')
-      YAML.safe_load(IO.read(file), [::Symbol]).each do |c|
+      YAML.safe_load(IO.read(file), [::Symbol, ::Time]).each do |c|
         add(c.delete(:name), c.delete(:value), c)
       end
     end
-
-    private
-
-    def to_time(time)
-      if time.respond_to?(:to_time)
-        time.to_time
-      else
-        ::Time.local time.year, time.month, time.day, time.hour, time.min, time.sec
-      end
-    end
   end # Cookies
 end # Watir

data/lib/watir/element_collection.rb

@@ -90,8 +90,8 @@ module Watir
           selector = @selector.merge(element: e)
           selector[:index] = idx
           element = element_class.new(@query_scope, selector)
-          if [Watir::HTMLElement, Watir::Input].include? element.class
-            tag_name = @selector[:tag_name] || element.tag_name.to_sym
+          if [HTMLElement, Input].include? element.class
+            tag_name = @selector[:tag_name] || element.tag_name
             hash[tag_name] ||= 0
             hash[tag_name] += 1
             selector[:index] = hash[tag_name] - 1

data/lib/watir/elements/button.rb

@@ -6,7 +6,7 @@ module Watir
   #
 
   class Button < HTMLElement
-    inherit_attributes_from Watir::Input
+    inherit_attributes_from Input
 
     VALID_TYPES = %w[button reset submit image].freeze
 
@@ -20,16 +20,7 @@ module Watir
     #
 
     def text
-      tn = tag_name
-
-      case tn
-      when 'input'
-        value
-      when 'button'
-        super
-      else
-        raise Exception::Error, "unknown tag name for button: #{tn}"
-      end
+      tag_name == 'input' ? value : super
     end
   end # Button
 end # Watir