watir 6.16.2 → 6.18.0

data/spec/watirspec_helper.rb

@@ -1,5 +1,6 @@
 require 'watirspec'
 require 'spec_helper'
+require 'webdrivers'
 
 Watir.default_timeout = 8
 
@@ -27,16 +28,14 @@ class LocalConfig
   private
 
   def load_webdrivers
-    case browser
-    when :chrome
-      Webdrivers::Chromedriver.version = 2.44 if ENV['APPVEYOR']
-      Webdrivers::Chromedriver.update
-      Watir.logger.info "chromedriver version: #{Webdrivers::Chromedriver.current_version.version}"
-    when :firefox
-      Webdrivers::Geckodriver.version = '0.20.1' if ENV['APPVEYOR']
-      Webdrivers::Geckodriver.update
-      Watir.logger.info "geckodriver version: #{Webdrivers::Geckodriver.current_version.version}"
-    end
+    @imp.driver_info = case browser
+                       when :chrome
+                         Webdrivers::Chromedriver.update
+                         "chromedriver version: #{Webdrivers::Chromedriver.current_version.version}"
+                       when :firefox
+                         Webdrivers::Geckodriver.update
+                         "geckodriver version: #{Webdrivers::Geckodriver.current_version.version}"
+                       end
   end
 
   def set_webdriver
@@ -86,11 +85,7 @@ class LocalConfig
     matching_guards << [browser, Selenium::WebDriver::Platform.os]
     matching_guards << :relaxed_locate if Watir.relaxed_locate?
     matching_guards << :headless if @imp.browser_args.last[:headless]
-    # TODO: Replace this with Selenium::WebDriver::Platform.ci after next Selenium Release
-    if ENV['APPVEYOR']
-      matching_guards << :appveyor
-      matching_guards << [browser, :appveyor]
-    end
+    matching_guards << :w3c if ENV['W3C']
 
     if !Selenium::WebDriver::Platform.linux? || ENV['DESKTOP_SESSION']
       # some specs (i.e. Window#maximize) needs a window manager on linux
@@ -103,19 +98,21 @@ class LocalConfig
     ENV['FIREFOX_BINARY'] ? {options: {binary: ENV['FIREFOX_BINARY']}} : {}
   end
 
-  def safari_args
+  def safari_preview_args
     {technology_preview: true}
   end
 
   def chrome_args
     opts = {args: ['--disable-translate']}
     opts[:headless] = true if ENV['HEADLESS'] == 'true'
-    opts[:options] = {binary: ENV['CHROME_BINARY']} if ENV['CHROME_BINARY']
+    opts[:options] = {binary: ENV['CHROME_BINARY']} if ENV['CHROME_BINARY'] == 'true'
+    opts[:options] = {options: {w3c: true}} if ENV['W3C'] == 'true'
     opts
   end
 
   class SelectorListener < Selenium::WebDriver::Support::AbstractEventListener
     def initialize
+      super
       @counts = Hash.new(0)
     end
 
@@ -141,8 +138,8 @@ class RemoteConfig < LocalConfig
       require 'watirspec/remote_server'
 
       remote_server = WatirSpec::RemoteServer.new
-      args = ["-Dwebdriver.chrome.driver=#{Webdrivers::Chromedriver.binary}",
-              "-Dwebdriver.gecko.driver=#{Webdrivers::Geckodriver.binary}"]
+      args = ["-Dwebdriver.chrome.driver=#{Webdrivers::Chromedriver.driver_path}",
+              "-Dwebdriver.gecko.driver=#{Webdrivers::Geckodriver.driver_path}"]
       remote_server.start(4444, args: args)
       remote_server.server.webdriver_url
     end

data/support/doctest_helper.rb

@@ -97,5 +97,3 @@ YARD::Doctest.configure do |doctest|
     end
   end
 end
-
-ENV['DISPLAY'] = ':99.0' if ENV['TRAVIS']

data/watir.gemspec

@@ -6,7 +6,7 @@ require 'watir/version'
 Gem::Specification.new do |s|
   s.name = 'watir'
   s.version = Watir::VERSION
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.platform = Gem::Platform::RUBY
   s.authors = ['Alex Rodionov', 'Titus Fortner', 'Justin Ko']
@@ -19,30 +19,29 @@ Gem::Specification.new do |s|
   DESCRIPTION_MESSAGE
 
   s.license = 'MIT'
-  s.rubyforge_project = 'watir'
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'selenium-webdriver', '~> 3.6'
-  s.add_runtime_dependency 'regexp_parser', '~>1.2'
+  s.add_dependency 'selenium-webdriver', '>= 3.8'
+  s.add_runtime_dependency 'regexp_parser', '>= 1.2', '< 3'
 
   s.add_development_dependency 'activesupport', '~> 4.0', '>= 4.1.11' # for pluralization during code generation
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'fuubar'
   s.add_development_dependency 'nokogiri'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rake', '~> 0.9.2'
+  s.add_development_dependency 'rake', '>= 12.3.3'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-retry'
   s.add_development_dependency 'rubocop', '~> 0.59'
   s.add_development_dependency 'selenium_statistics'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simplecov-console'
-  s.add_development_dependency 'webdrivers', '~> 3.5.2'
+  s.add_development_dependency 'webdrivers', '~> 4.1'
   s.add_development_dependency 'webidl', '>= 0.2.2'
   s.add_development_dependency 'yard', '> 0.8.2.1'
-  s.add_development_dependency 'yard-doctest', '>= 0.1.8'
+  s.add_development_dependency 'yard-doctest', '~> 0.1.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.16.2
+  version: 6.18.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,36 +10,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-24 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -120,16 +126,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -220,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: webidl
   requirement: !ruby/object:Gem::Requirement
@@ -260,16 +266,16 @@ dependencies:
   name: yard-doctest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.14
 description: |
   Watir stands for Web Application Testing In Ruby
   It facilitates the writing of automated tests by mimicing the behavior of a user interacting with a website.
@@ -283,15 +289,20 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/actions/enable-safari/action.yml"
+- ".github/actions/install-chrome/action.yml"
+- ".github/workflows/linux.yml"
+- ".github/workflows/mac.yml"
+- ".github/workflows/unit.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".rubocop_todo.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- appveyor.yml
 - lib/watir-webdriver.rb
 - lib/watir.rb
 - lib/watir/adjacent.rb
@@ -305,7 +316,6 @@ files:
 - lib/watir/container.rb
 - lib/watir/cookies.rb
 - lib/watir/element_collection.rb
-- lib/watir/elements/area.rb
 - lib/watir/elements/button.rb
 - lib/watir/elements/cell.rb
 - lib/watir/elements/checkbox.rb
@@ -405,6 +415,7 @@ files:
 - lib/watir/wait.rb
 - lib/watir/wait/timer.rb
 - lib/watir/window.rb
+- lib/watir/window_collection.rb
 - lib/watirspec.rb
 - lib/watirspec/guards.rb
 - lib/watirspec/implementation.rb
@@ -587,8 +598,8 @@ files:
 - spec/watirspec/html/wait.html
 - spec/watirspec/html/watirspec.css
 - spec/watirspec/html/window_switching.html
+- spec/watirspec/legacy_wait_spec.rb
 - spec/watirspec/radio_set_spec.rb
-- spec/watirspec/relaxed_locate_spec.rb
 - spec/watirspec/screenshot_spec.rb
 - spec/watirspec/scroll_spec.rb
 - spec/watirspec/special_chars_spec.rb
@@ -613,15 +624,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: watir
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Watir powered by Selenium
@@ -800,8 +810,8 @@ test_files:
 - spec/watirspec/html/wait.html
 - spec/watirspec/html/watirspec.css
 - spec/watirspec/html/window_switching.html
+- spec/watirspec/legacy_wait_spec.rb
 - spec/watirspec/radio_set_spec.rb
-- spec/watirspec/relaxed_locate_spec.rb
 - spec/watirspec/screenshot_spec.rb
 - spec/watirspec/scroll_spec.rb
 - spec/watirspec/special_chars_spec.rb

data/.travis.yml

@@ -1,84 +0,0 @@
-# Please note that we should not be using container-based infrastructure
-# because Chrome requires a lot of shared memory and Travis does not allow
-# use host's /dev/shm.
-sudo: required
-dist: trusty
-cache: bundler
-notifications:
-  slack:
-    secure: BLsBCm33R32VNRccrLx9F0P24X6BVpVHj1OWaN4Kyn6g9qXteIwC2VKVMnKNbifpojfMkrn0OeFQFK1O1DSOsC3mgzn/udoB+DnUGcSemFUn04xhbYF5SI+3zGPKPo0JLvjjdEKSSma84YwKdrj88pGUK34p01gL8hiaqjFzWdk=
-before_install:
-  - gem update --system
-  - gem install bundler
-
-before_script:
-  - support/travis.sh
-  - export PATH=~/.webdrivers:$PATH
-
-script: bundle exec rake $RAKE_TASK
-
-_version:
-  three: &three
-    language: ruby
-    rvm: 2.3.8
-  four: &four
-    language: ruby
-    rvm: 2.4.5
-  five: &five
-    language: ruby
-    rvm: 2.5.3
-
-_browsers:
-  firefox: &firefox-latest
-    addons:
-      firefox: latest
-  chrome: &chrome
-     addons:
-       chrome: stable
-
-matrix:
-  include:
-      - env: RAKE_TASK=spec:remote_firefox
-        <<: *five
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:remote_chrome
-        <<: *five
-        <<: *chrome
-      - env: RAKE_TASK=spec:firefox RELAXED_LOCATE=false
-        <<: *five
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:firefox
-        <<: *five
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:firefox
-        <<: *four
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:firefox
-        <<: *three
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:chrome
-        <<: *five
-        <<: *chrome
-      - env: RAKE_TASK=spec:chrome
-        <<: *four
-        <<: *chrome
-      - env: RAKE_TASK=spec:chrome
-        <<: *three
-        <<: *chrome
-      - env: RAKE_TASK=spec:chrome RELAXED_LOCATE=false
-        <<: *five
-        <<: *chrome
-      - env: RAKE_TASK=spec:chrome HEADLESS=true
-        <<: *five
-        <<: *chrome
-      - env: RAKE_TASK=spec:unit
-        <<: *five
-      - env: RAKE_TASK=spec:stats
-        <<: *five
-        <<: *chrome
-      - env: RAKE_TASK=yard:doctest
-        <<: *five
-        <<: *chrome
-      - env: RAKE_TASK=rubocop
-        <<: *three
-        <<: *chrome

data/appveyor.yml

@@ -1,12 +0,0 @@
-version: "#{build}"
-build: off
-clone_depth: 100
-install:
-  - set PATH=C:\Ruby23\bin;%PATH%
-  - bundle install
-test_script:
-  - bundle exec rake %RAKE_TASK%
-environment:
-  matrix:
-    - RAKE_TASK: spec:chrome
-    - RAKE_TASK: spec:firefox

data/lib/watir/elements/area.rb

@@ -1,10 +0,0 @@
-module Watir
-  class Area < HTMLElement
-    #
-    # @todo temporarily add href attribute
-    #
-    # @see https://www.w3.org/Bugs/Public/show_bug.cgi?id=23192
-    #
-    attribute String, :href, :href
-  end # Area
-end # Watir

data/spec/watirspec/relaxed_locate_spec.rb

@@ -1,113 +0,0 @@
-require 'watirspec_helper'
-
-describe 'Watir#relaxed_locate?' do
-  compliant_on :relaxed_locate do
-    context 'when true' do
-      before :each do
-        browser.goto(WatirSpec.url_for('wait.html'))
-      end
-
-      context 'when acting on an element that is never present' do
-        it 'raises exception after timing out' do
-          element = browser.link(id: 'not_there')
-          expect { element.click }.to wait_and_raise_unknown_object_exception
-        end
-      end
-
-      context 'when acting on an element whose parent is never present' do
-        it 'raises exception after timing out' do
-          element = browser.link(id: 'not_there')
-          expect { element.element.click }.to wait_and_raise_unknown_object_exception
-        end
-      end
-
-      context 'when acting on an element from a collection whose parent is never present' do
-        it 'raises exception after timing out' do
-          element = browser.link(id: 'not_there')
-          expect { element.elements[2].click }.to wait_and_raise_unknown_object_exception
-        end
-      end
-
-      context 'when acting on an element that is already present' do
-        it 'does not wait' do
-          expect { browser.link.click }.to execute_immediately
-        end
-      end
-
-      context 'when acting on an element that eventually becomes present' do
-        bug 'https://github.com/SeleniumHQ/selenium/issues/4380', %i[remote firefox] do
-          it 'waits until present and then takes action' do
-            start_time = ::Time.now
-            browser.a(id: 'show_bar').click
-            expect { browser.div(id: 'bar').click }.to_not raise_exception
-            expect(::Time.now - start_time).to be < Watir.default_timeout
-          end
-
-          it 'waits until text field is displayed and then takes action' do
-            start_time = ::Time.now
-            browser.a(id: 'show_textfield').click
-            expect { browser.text_field(id: 'textfield').set 'Foo' }.to_not raise_exception
-            expect(::Time.now - start_time).to be < Watir.default_timeout
-          end
-        end
-      end
-
-      context 'when acting on a text field that eventually becomes writable' do
-        it 'waits to not be readonly' do
-          expect(browser.text_field(id: 'writable')).to be_readonly
-          start_time = ::Time.now
-          browser.a(id: 'make-writable').click
-          expect { browser.text_field(id: 'writable').set 'foo' }.not_to raise_exception
-          expect(::Time.now - start_time).to be > 2
-        end
-      end
-
-      it 'ensures all checks happen once even if time has expired' do
-        begin
-          Watir.default_timeout = -1
-          expect { browser.link.click }.to_not raise_exception
-        ensure
-          Watir.default_timeout = 30
-        end
-      end
-
-      it 'does not wait for parent element to be present when querying child element' do
-        el = browser.element(id: 'not_there').element(id: 'doesnt_matter')
-        expect { el.present? }.to execute_immediately
-      end
-
-      it 'waits for parent element to be present before locating a collection' do
-        els = browser.element(id: /not|there/).elements(id: 'doesnt_matter')
-        expect { els.to_a }.to wait_and_raise_unknown_object_exception
-      end
-    end
-  end
-
-  not_compliant_on :relaxed_locate do
-    context 'when false' do
-      before :each do
-        browser.goto(WatirSpec.url_for('wait.html'))
-      end
-
-      context 'when acting on an element that is never present' do
-        it 'raises exception immediately' do
-          element = browser.link(id: 'not_there')
-          start_time = ::Time.now
-          expect { element.click }.to raise_exception(Watir::Exception::UnknownObjectException)
-          expect(::Time.now - start_time).to be < 1
-        end
-      end
-
-      context 'when acting on an element that eventually becomes present' do
-        it 'raises exception immediately' do
-          start_time = ::Time.now
-          browser.a(id: 'show_bar').click
-
-          expect { browser.div(id: 'bar').click }.to raise_unknown_object_exception
-
-          expect(::Time.now - start_time).to be < 1
-        end
-      end
-    end
-  end
-end