watir 7.0.0.beta1 → 7.0.0.beta5

data/spec/watirspec_helper.rb

@@ -1,8 +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'
@@ -21,7 +22,6 @@ class LocalConfig
   def configure
     set_webdriver
     set_browser_args
-    set_guard_proc
     load_webdrivers
   end
 
@@ -71,35 +71,6 @@ 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 << :headless if @imp.browser_args.last[:headless]
-    matching_guards << "v#{Watir::VERSION.tr('.', '_')[/.*(?=_)/]}".to_sym
-    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
-      matching_guards << :window_manager
-    end
-    matching_guards
-  end
-
   def firefox_args
     ENV['FIREFOX_BINARY'] ? {options: {binary: ENV['FIREFOX_BINARY']}} : {}
   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/watir.gemspec

@@ -25,7 +25,7 @@ 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', '>= 4.0.0.beta2'
+  s.add_dependency 'selenium-webdriver', '>= 4.0.0.beta4'
   s.add_runtime_dependency 'regexp_parser', '>= 1.2', '< 3'
 
   s.add_development_dependency 'activesupport', '~> 4.0', '>= 4.1.11' # for pluralization during code generation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta1
+  version: 7.0.0.beta5
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: 4.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: 4.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
@@ -381,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
@@ -408,12 +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/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
@@ -618,12 +619,10 @@ 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/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

data/spec/implementation_spec.rb

@@ -1,24 +0,0 @@
-require 'watirspec_helper'
-
-describe WatirSpec::Implementation do
-  before { @impl = WatirSpec::Implementation.new }
-
-  it 'finds matching guards' do
-    guards = {
-      [:firefox] => [
-        {name: :not_compliant, data: {file: './spec/watirspec/div_spec.rb:108'}},
-        {name: :deviates,      data: {file: './spec/watirspec/div_spec.rb:114'}},
-        {name: :not_compliant, data: {file: './spec/watirspec/div_spec.rb:200'}},
-        {name: :bug,           data: {file: './spec/watirspec/div_spec.rb:228', key: 'WTR-350'}}
-      ],
-      [:chrome] => [
-        {name: :not_compliant, data: {file: './spec/watirspec/div_spec.rb:109'}},
-        {name: :deviates,      data: {file: './spec/watirspec/div_spec.rb:115'}},
-        {name: :not_compliant, data: {file: './spec/watirspec/div_spec.rb:201'}},
-        {name: :bug,           data: {file: './spec/watirspec/div_spec.rb:229', key: 'WTR-349'}}
-      ]
-    }
-    @impl.name = :firefox
-    expect(@impl.matching_guards_in(guards)).to eq(guards.first[1])
-  end
-end

data/spec/unit/logger_spec.rb

@@ -1,81 +0,0 @@
-require_relative 'unit_helper'
-
-module Watir
-  describe Logger do
-    around do |example|
-      debug = $DEBUG
-      $DEBUG = false
-      example.call
-      $DEBUG = debug
-      Watir.instance_variable_set(:@logger, nil) # reset cache
-    end
-
-    it 'logs warnings by default' do
-      expect(Watir.logger.level).to eq(2)
-    end
-
-    it 'logs everything if $DEBUG is set to true' do
-      $DEBUG = true
-      expect(Watir.logger.level).to eq(0)
-    end
-
-    it 'allows to change level during execution' do
-      Watir.logger.level = :info
-      expect(Watir.logger.level).to eq(1)
-    end
-
-    it 'allows to change level with integer' do
-      Watir.logger.level = 3
-      expect(Watir.logger.level).to eq(3)
-    end
-
-    it 'outputs to stdout by default' do
-      expect { Watir.logger.warn('message') }.to output(/WARN Watir message/).to_stdout_from_any_process
-    end
-
-    it 'allows to output to file' do
-      Watir.logger.output = 'test.log'
-      Watir.logger.warn('message')
-      expect(File.read('test.log')).to include('WARN Watir message')
-    ensure
-      File.delete('test.log')
-    end
-
-    it 'allows to deprecate functionality' do
-      message = /WARN Watir \[DEPRECATION\] #old is deprecated\. Use #new instead\./
-      expect { Watir.logger.deprecate('#old', '#new') }.to output(message).to_stdout_from_any_process
-    end
-
-    it 'allows to selectively ignore deprecations with Strings' do
-      Watir.logger.ignore('old deprecated')
-      expect { Watir.logger.deprecate('#old', '#new', ids: ['old deprecated']) }
-        .to_not output.to_stdout_from_any_process
-    end
-
-    it 'allows to selectively ignore deprecations with Symbols' do
-      Watir.logger.ignore(:foo)
-      expect { Watir.logger.deprecate('#old', '#new', ids: [:foo]) }.to_not output.to_stdout_from_any_process
-    end
-
-    it 'allows to selectively ignore warnings with Strings' do
-      Watir.logger.ignore(:foo)
-      expect { Watir.logger.warn('warning', ids: ['foo']) }.to_not output.to_stdout_from_any_process
-    end
-
-    it 'allows to selectively ignore warnings with Symbols' do
-      Watir.logger.ignore(:foo)
-      expect { Watir.logger.warn('warning', ids: [:foo]) }.to_not output.to_stdout_from_any_process
-    end
-
-    it 'allows to ignore all deprecation notices' do
-      Watir.logger.ignore(:deprecations)
-      expect { Watir.logger.deprecate('#old', '#new') }.to_not output.to_stdout_from_any_process
-    end
-
-    it 'allows to ignore multiple ids' do
-      Watir.logger.ignore(%i[foo bar])
-      expect { Watir.logger.warn('warning', ids: [:foo]) }.to_not output.to_stdout_from_any_process
-      expect { Watir.logger.warn('warning', ids: [:bar]) }.to_not output.to_stdout_from_any_process
-    end
-  end
-end