watir 6.17.0 → 6.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c587621e41c1ab878d2e9ff3cfd6c5166c5df9dc66cd02c0719d492aaba48d1e
-  data.tar.gz: 509ba43afa0272d7b154eb5885e403578e2bc3956ab93803123b519093e7b430
+  metadata.gz: 29eeb6548d5f5f91ee744107d1e3c79f0d2baf8b688c9588752e25b75fa696ef
+  data.tar.gz: 27502c2b89585471b25751b5564c08784578585d3c196f132f56b52243645735
 SHA512:
-  metadata.gz: 5215ff9fc1cfce6fa050532583167e6ed16be6f74b0d305b8d186b83361162c711ae9b63689a00882bf60d559783508ea2369ed9e8d5e25b504688eb2914db01
-  data.tar.gz: 1b0ba276ea5c83f217151c125b0f645aab7011d86d9049ea7850ea83af4fbeeb9bdfa14ca60d7205c55bee3c0d6f817143bd9f979c7dc5adc368af446367ab8a
+  metadata.gz: d2a90695c68c0db0493d1fdeac5ab90ab51604a0916b4b6cbf0abeae595c6680f62269da98b9920c7ee7db4448e70c6afe31caa280ae76234bae2fc0b51c2912
+  data.tar.gz: 645305ed2b0ae8b5777995c6620055e37850dcefdb3b5a5b609d98b4ce30f8d0cd14155a79fb2032a46862d8c10ad92e9c0112fc7fe68e31dac01b6da44cbbd9

data/.github/actions/enable-safari/action.yml

@@ -0,0 +1,11 @@
+name: 'Enable Safari Driver'
+description: 'Set safaridriver to run in automation mode'
+runs:
+  using: composite
+  steps:
+    - run: |
+        defaults write com.apple.Safari IncludeDevelopMenu YES
+        defaults write com.apple.Safari AllowRemoteAutomation 1
+        sudo safaridriver --enable
+        safaridriver -p 0 &
+      shell: bash

data/.github/actions/install-chrome/action.yml

@@ -0,0 +1,11 @@
+name: 'Install Chrome'
+runs:
+  using: "composite"
+  steps:
+    - run: |
+        wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+        echo "deb http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee -a /etc/apt/sources.list.d/google-chrome.list
+        sudo apt-get update -qqy
+        sudo apt-get -qqy install google-chrome-stable
+        sudo rm /etc/apt/sources.list.d/google-chrome.list
+      shell: bash

data/.github/workflows/linux.yml

@@ -0,0 +1,61 @@
+name: Linux Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  chrome-test:
+    name: Chrome Test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'chrome' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - uses: ./.github/actions/install-chrome
+      - run: Xvfb :99 &
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+        env:
+          DISPLAY: :99
+
+  firefox-test:
+    name: Firefox Test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'firefox' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: Xvfb :99 &
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+        env:
+          DISPLAY: :99
+
+  documentation-test:
+    name: Yard Doc Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - uses: ./.github/actions/install-chrome
+      - run: Xvfb :99 &
+      - run: |
+          bundle exec rake yard:doctest
+        env:
+          DISPLAY: :99

data/.github/workflows/mac.yml

@@ -0,0 +1,55 @@
+name: Mac Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  chrome-test:
+    name: Chrome Test
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'chrome' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+
+  firefox-test:
+    name: Firefox Test
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'firefox' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+
+  safari-test:
+    name: Safari Test
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'safari' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - uses: ./.github/actions/enable-safari
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}

data/.github/workflows/unit.yml

@@ -0,0 +1,31 @@
+name: Unit Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  unit-test:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.5', '2.6', '2.7', '3.0']
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: bundle exec rake spec:unit
+  linter-test:
+    name: Rubocop Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: bundle exec rubocop

data/.github/workflows/windows.yml

@@ -0,0 +1,39 @@
+name: Windows Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  chrome-test:
+    name: Chrome Test
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'chrome' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+  firefox-test:
+    name: Firefox Test
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [ 'firefox' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+
+

data/.rubocop_todo.yml

@@ -0,0 +1,36 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-08-27 01:55:04 UTC using RuboCop version 0.89.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 116
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 11
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  Exclude:
+    - 'lib/watir/browser.rb'
+    - 'lib/watir/window.rb'
+
+# Offense count: 229
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Remove for Watir 7
+Naming/FileName:
+  Exclude:
+    - 'lib/watir-webdriver.rb'
+
+# Fix in Watir 7
+Metrics/ParameterLists:
+  Exclude:
+    - 'lib/watir/wait.rb'

data/CHANGES.md

@@ -1,3 +1,17 @@
+### 6.18.0 (2021-02-26)
+
+* Implement `WindowCollection` to manage multiple `Window` objects
+* Add support for locating `Window` by `:element`
+* Deprecate locating `Window` by `:index`
+* Deprecate `Select#select_all` in favor of `#select` and an `Array`
+* Implement `Browser#switch_window` (#849)
+* Add support for `Numeric` attribute values to `Waitable`
+* Allow users to specify Selenium 4 in their projects
+* Update stale element handling behavior to match webdriver spec (#905 #909)
+* Implement `Waitable` for `ElementCollection` (#853 #857)
+* Improve performance for nested elements (#843)
+* Less strict version check for `regexp_parser` gem (thanks Pavel Lobashov)
+
 ### 6.17.0 (2020-08-27)
 * Require Ruby > 2.5
 * Implement Logger#selenium= to set selenium level from Watir

data/LICENSE

@@ -1,8 +1,8 @@
 (the MIT License)
 
 Copyright (c) 2009-2015 Jari Bakken
-Copyright (c) 2015-2018 Alex Rodionov, Titus Fortner
-Copyright (c) 2018 Justin Ko
+Copyright (c) 2015-2021 Alex Rodionov, Titus Fortner
+Copyright (c) 2018-2021 Justin Ko
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,10 +3,12 @@
 Watir Powered By Selenium!
 
 [![Gem Version](https://badge.fury.io/rb/watir.svg)](http://badge.fury.io/rb/watir)
-[![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)
+[![Unit Tests](https://github.com/titusfortner/watir/workflows/Unit%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Unit+Tests%22)
+[![Mac Tests](https://github.com/titusfortner/watir/workflows/Mac%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Mac+Tests%22)
+[![Windows Tests](https://github.com/titusfortner/watir/workflows/Windows%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Windows+Tests%22)
+[![Linux Tests](https://github.com/titusfortner/watir/workflows/Linux%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Linux+Tests%22)
 [![Code Climate](https://codeclimate.com/github/watir/watir.svg)](https://codeclimate.com/github/watir/watir)
-[![Coverage Status](https://coveralls.io/repos/github/watir/watir/badge.svg?branch=master)](https://coveralls.io/github/watir/watir?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/watir/watir/badge.svg?branch=main)](https://coveralls.io/github/watir/watir?branch=master)
 
 ## Using Watir
 
@@ -69,11 +71,11 @@ $ bundle exec rake svg:update
 
 ## Specs
 
-#### Travis CI
+#### Github Actions
 
-Watir specs are run on [Travis CI](https://travis-ci.org/watir/watir).
+Watir specs are run with [Github Actions](https://github.com/watir/watir/workflows).
 
-Watir code is tested with 2.3, 2.4 and 2.5 versions in multiple browsers and with multiple configurations.
+Watir code is tested on Linux with latest versions of supported browsers and all active Ruby versions.
 
 #### Doctests
 
@@ -95,7 +97,7 @@ to ensure all paths in their code have tests associated with them.
 
 Watir is using [Rubocop](https://github.com/rubocop-hq/rubocop) to ensure a consistent style across the
 code base. It is run with our minimum supported Ruby version (2.3) 
-We have some [established exceptions](https://github.com/watir/watir/blob/master/.rubocop.yml) 
+We have some [established exceptions](https://github.com/watir/watir/blob/main/.rubocop.yml) 
 that might need to be tweaked for new code submissions. This can be addressed in the PR as necessary.
 
 #### Statistics
@@ -107,7 +109,4 @@ on wire calls.
 
 ## Copyright
 
-Copyright (c) 2009-2015 Jari Bakken
-Copyright (c) 2015-2018 Alex Rodionov, Titus Fortner
-Copyright (c) 2018 Justin Ko
 See LICENSE for details

data/Rakefile

@@ -5,7 +5,7 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = %w[--color --require fuubar --format Fuubar]
+  spec.rspec_opts = %w[--color --format doc]
   spec.pattern = 'spec/**/*_spec.rb'
   spec.exclude_pattern = 'spec/unit/**/*_spec.rb'
 end

data/lib/watir.rb

@@ -6,6 +6,7 @@ require 'watir/legacy_wait'
 require 'watir/wait'
 require 'watir/exception'
 require 'watir/window'
+require 'watir/window_collection'
 require 'watir/has_window'
 require 'watir/adjacent'
 require 'watir/js_execution'

data/lib/watir/adjacent.rb

@@ -117,7 +117,7 @@ module Watir
         el = Watir.element_class_for(opt[:tag_name] || '').new(self, opt)
         el.is_a?(Input) ? el.to_subtype : el
       elsif opt[:tag_name]
-        Object.const_get("#{Watir.element_class_for(opt[:tag_name])}Collection").new(self, opt)
+        Watir.const_get("#{Watir.element_class_for(opt[:tag_name])}Collection").new(self, opt)
       else
         HTMLElementCollection.new(self, opt)
       end

data/lib/watir/alert.rb

@@ -84,6 +84,7 @@ module Watir
       false
     end
     alias present? exists?
+    alias exist? exists?
 
     #
     # @api private

data/lib/watir/attribute_helper.rb

@@ -46,6 +46,8 @@ module Watir
     #  @return [$1] value of $3 property
     #
     def attribute(type, method, attr)
+      return if method_defined?(method)
+
       typed_attributes[type] << [method, attr]
       define_attribute(type, method, attr)
     end

data/lib/watir/browser.rb

@@ -213,11 +213,11 @@ module Watir
     # @param args Arguments will be available in the given script in the 'arguments' pseudo-array
     #
 
-    def execute_script(script, *args)
+    def execute_script(script, *args, function_name: nil)
       args.map! do |e|
         e.is_a?(Element) ? e.wait_until(&:exists?).wd : e
       end
-
+      Watir.logger.info "Executing Script on Browser: #{function_name}" if function_name
       wrap_elements_in(self, @driver.execute_script(script, *args))
     end
 

data/lib/watir/cookies.rb

@@ -105,6 +105,8 @@ module Watir
       IO.write(file, to_a.to_yaml)
     end
 
+    #
+    # TODO: Use :permitted_classes keyword when minimum supported Ruby is 2.6
     #
     # Load cookies from file
     #

data/lib/watir/element_collection.rb

@@ -7,17 +7,19 @@ module Watir
     include Enumerable
     include Exception
     include JSSnippets
+    include Waitable
     include Locators::ClassHelpers
 
     def initialize(query_scope, selector)
       @query_scope = query_scope
       @selector = selector
+      @to_a = nil
 
       build unless @selector.key?(:element)
     end
 
     #
-    # Yields each element in collection.
+    # Relocates elements then yields each element in resulting collection.
     #
     # @example
     #   divs = browser.divs(class: 'kls')
@@ -29,6 +31,7 @@ module Watir
     #
 
     def each(&blk)
+      reset!
       to_a.each(&blk)
     end
 
@@ -37,6 +40,9 @@ module Watir
 
     alias empty? none?
 
+    alias exist? any?
+    alias exists? any?
+
     def build
       selector_builder.build(@selector.dup)
     end
@@ -145,14 +151,19 @@ module Watir
     alias eql? ==
 
     #
-    # Creates a Collection containing elements of two collections.
+    # Removes cache of previously located elements in the collection.
     #
     # @example
     #   options = browser.select_list(name: "new_user_languages").options
-    #   (options + browser.select_list(id: "new_user_role").options).size
-    #   #=> 8
+    #   options.reset!
+    #   options[0]
+    #   #=> nil
     #
 
+    def reset!
+      @to_a = nil
+    end
+
     private
 
     def elements
@@ -182,7 +193,11 @@ module Watir
     end
 
     def ensure_context
-      @query_scope.locate if @query_scope.is_a?(Browser) || @query_scope.located? && @query_scope.stale?
+      if @query_scope.is_a?(Browser) || !@query_scope.located? && @query_scope.is_a?(IFrame)
+        @query_scope.browser.locate
+      elsif @query_scope.located? && @query_scope.stale?
+        @query_scope.locate
+      end
       @query_scope.switch_to! if @query_scope.is_a?(IFrame)
     end
 
@@ -191,7 +206,7 @@ module Watir
     end
 
     def element_class
-      Kernel.const_get(self.class.name.sub(/Collection$/, ''))
+      Watir.const_get(self.class.name.sub(/Collection$/, ''))
     end
 
     def construct_subtype(element, hash, tag_name)