watir 6.17.0 → 7.0.0.beta2

data/spec/watirspec_helper.rb

@@ -1,7 +1,9 @@
 require 'watirspec'
 require 'spec_helper'
+require 'webdrivers'
+require 'selenium/webdriver/support/guards'
 
-Watir.default_timeout = 8
+Watir.default_timeout = 5
 
 if ENV['SELENIUM_STATS'] == 'true'
   require 'selenium_statistics'
@@ -20,21 +22,26 @@ class LocalConfig
   def configure
     set_webdriver
     set_browser_args
-    set_guard_proc
     load_webdrivers
   end
 
   private
 
   def load_webdrivers
-    case browser
-    when :chrome
-      Webdrivers::Chromedriver.update
-      Watir.logger.info "chromedriver version: #{Webdrivers::Chromedriver.current_version.version}"
-    when :firefox
-      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 :edge
+                         Webdrivers::Edgedriver.update
+                         "edgedriver version: #{Webdrivers::Edgedriver.current_version.version}"
+                       when :firefox
+                         Webdrivers::Geckodriver.update
+                         "geckodriver version: #{Webdrivers::Geckodriver.current_version.version}"
+                       when :ie
+                         Webdrivers::IEdriver.update
+                         "iedriver version: #{Webdrivers::IEdriver.current_version.version}"
+                       end
   end
 
   def set_webdriver
@@ -64,54 +71,18 @@ class LocalConfig
     args
   end
 
-  def set_guard_proc
-    matching_guards = add_guards
-
-    @imp.guard_proc = lambda { |args|
-      args.any? { |arg| matching_guards.include?(arg) }
-    }
-  end
-
-  def add_guards
-    matching_guards = common_guards
-    matching_guards << :local
-    matching_guards << [:local, browser]
-    matching_guards
-  end
-
-  def common_guards
-    matching_guards = [browser]
-    matching_guards << [browser, Selenium::WebDriver::Platform.os]
-    matching_guards << :relaxed_locate if Watir.relaxed_locate?
-    matching_guards << :headless if @imp.browser_args.last[:headless]
-    matching_guards << :w3c if ENV['W3C']
-
-    # TODO: Replace this with Selenium::WebDriver::Platform.ci after next Selenium Release
-    if ENV['APPVEYOR']
-      matching_guards << :appveyor
-      matching_guards << [browser, :appveyor]
-    end
-
-    if !Selenium::WebDriver::Platform.linux? || ENV['DESKTOP_SESSION']
-      # some specs (i.e. Window#maximize) needs a window manager on linux
-      matching_guards << :window_manager
-    end
-    matching_guards
-  end
-
   def firefox_args
     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 = {options: {args: ['--disable-translate']}}
     opts[:headless] = true if ENV['HEADLESS'] == 'true'
-    opts[:options] = {binary: ENV['CHROME_BINARY']} if ENV['CHROME_BINARY'] == 'true'
-    opts[:options] = {options: {w3c: true}} if ENV['W3C'] == 'true'
+    opts[:options][:binary] = ENV['CHROME_BINARY'] if ENV['CHROME_BINARY']
     opts
   end
 
@@ -172,3 +143,35 @@ else
 end
 
 WatirSpec.run!
+
+RSpec.configure do |config|
+  config.before do |example|
+    guards = Selenium::WebDriver::Support::Guards.new(example,
+                                                      bug_tracker: 'https://github.com/watir/watir/issues')
+
+    guards.add_condition(:browser, WatirSpec.implementation.browser_args.first)
+    guards.add_condition(:platform, Selenium::WebDriver::Platform.os)
+
+    headless = WatirSpec.implementation.browser_args.last[:headless]
+    guards.add_condition(:headless, headless)
+
+    window_manager = !Selenium::WebDriver::Platform.linux? || !ENV['DESKTOP_SESSION'].nil?
+    guards.add_condition(:window_manager, window_manager)
+
+    remote = ENV['USE_REMOTE'] == 'true'
+    guards.add_condition(:remote, remote)
+
+    results = guards.disposition
+    send(*results) if results
+
+    $browser = WatirSpec.new_browser if $browser.nil? || $browser.closed?
+  end
+
+  if ENV['AUTOMATIC_RETRY']
+    require 'rspec/retry'
+    config.verbose_retry = true
+    config.display_try_failure_messages = true
+    config.default_retry_count = 3
+    config.exceptions_to_retry = [IOError, Net::ReadTimeout]
+  end
+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

@@ -25,11 +25,11 @@ Gem::Specification.new do |s|
   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', '>= 4.0.0.beta2'
+  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 'coveralls_reborn'
   s.add_development_dependency 'fuubar'
   s.add_development_dependency 'nokogiri'
   s.add_development_dependency 'pry'
@@ -38,9 +38,8 @@ Gem::Specification.new do |s|
   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', '~> 4.1'
+  s.add_development_dependency 'webdrivers', '~> 4.6'
   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.14'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.17.0
+  version: 7.0.0.beta2
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,36 +10,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2021-03-28 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: 4.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 4.0.0.beta2
 - !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
@@ -61,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.11
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -186,20 +192,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
@@ -220,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: webidl
   requirement: !ruby/object:Gem::Requirement
@@ -283,15 +275,18 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/actions/enable-safari/action.yml"
+- ".github/actions/install-chrome/action.yml"
+- ".github/actions/setup-linux/action.yml"
+- ".github/workflows/tests.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
@@ -351,6 +346,7 @@ files:
 - lib/watir/generator/svg/spec_extractor.rb
 - lib/watir/generator/svg/visitor.rb
 - lib/watir/has_window.rb
+- lib/watir/http_client.rb
 - lib/watir/js_execution.rb
 - lib/watir/js_snippets.rb
 - lib/watir/js_snippets/attributeValues.js
@@ -372,7 +368,6 @@ files:
 - lib/watir/js_snippets/selectedText.js
 - lib/watir/js_snippets/setText.js
 - lib/watir/js_snippets/setValue.js
-- lib/watir/legacy_wait.rb
 - lib/watir/locators.rb
 - lib/watir/locators/anchor/selector_builder.rb
 - lib/watir/locators/button/matcher.rb
@@ -386,6 +381,9 @@ files:
 - lib/watir/locators/element/selector_builder/regexp_disassembler.rb
 - lib/watir/locators/element/selector_builder/xpath.rb
 - lib/watir/locators/element/selector_builder/xpath_support.rb
+- lib/watir/locators/option/matcher.rb
+- lib/watir/locators/option/selector_builder.rb
+- lib/watir/locators/option/selector_builder/xpath.rb
 - lib/watir/locators/row/selector_builder.rb
 - lib/watir/locators/row/selector_builder/xpath.rb
 - lib/watir/locators/text_area/selector_builder.rb
@@ -404,6 +402,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
@@ -412,13 +411,10 @@ files:
 - lib/watirspec/runner.rb
 - lib/watirspec/server.rb
 - lib/watirspec/server/app.rb
-- spec/implementation_spec.rb
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/unit/capabilities_spec.rb
-- spec/unit/container_spec.rb
 - spec/unit/element_locator_spec.rb
-- spec/unit/logger_spec.rb
 - spec/unit/match_elements/button_spec.rb
 - spec/unit/match_elements/element_spec.rb
 - spec/unit/match_elements/text_field_spec.rb
@@ -587,7 +583,6 @@ files:
 - spec/watirspec/html/watirspec.css
 - spec/watirspec/html/window_switching.html
 - 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
@@ -615,22 +610,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Watir powered by Selenium
 test_files:
-- spec/implementation_spec.rb
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/unit/capabilities_spec.rb
-- spec/unit/container_spec.rb
 - spec/unit/element_locator_spec.rb
-- spec/unit/logger_spec.rb
 - spec/unit/match_elements/button_spec.rb
 - spec/unit/match_elements/element_spec.rb
 - spec/unit/match_elements/text_field_spec.rb
@@ -799,7 +791,6 @@ test_files:
 - spec/watirspec/html/watirspec.css
 - spec/watirspec/html/window_switching.html
 - 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,87 +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:
-  five: &five
-    language: ruby
-    rvm: 2.5.8
-  six: &six
-    language: ruby
-    rvm: 2.6.6
-  seven: &seven
-    language: ruby
-    rvm: 2.7.1
-
-_browsers:
-  firefox: &firefox-latest
-    addons:
-      firefox: latest
-  chrome: &chrome
-     addons:
-       chrome: stable
-
-matrix:
-  include:
-      - env: RAKE_TASK=spec:remote_firefox
-        <<: *seven
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:remote_chrome
-        <<: *seven
-        <<: *chrome
-      - env: RAKE_TASK=spec:firefox RELAXED_LOCATE=false
-        <<: *seven
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:firefox
-        <<: *seven
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:firefox
-        <<: *six
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:firefox
-        <<: *five
-        <<: *firefox-latest
-      - env: RAKE_TASK=spec:chrome
-        <<: *seven
-        <<: *chrome
-      - env: RAKE_TASK=spec:chrome
-        <<: *six
-        <<: *chrome
-      - env: RAKE_TASK=spec:chrome
-        <<: *five
-        <<: *chrome
-      - env: RAKE_TASK=spec:chrome RELAXED_LOCATE=false
-        <<: *seven
-        <<: *chrome
-      - env: RAKE_TASK=spec:chrome W3C=true
-        <<: *seven
-        <<: *chrome
-      - env: RAKE_TASK=spec:chrome HEADLESS=true
-        <<: *seven
-        <<: *chrome
-      - env: RAKE_TASK=spec:unit
-        <<: *seven
-      - env: RAKE_TASK=spec:stats
-        <<: *seven
-        <<: *chrome
-      - env: RAKE_TASK=yard:doctest
-        <<: *seven
-        <<: *chrome
-      - env: RAKE_TASK=rubocop
-        <<: *five
-        <<: *chrome