watir 6.19.1 → 7.0.0.beta1

data/spec/watirspec/support/rspec_matchers.rb

@@ -1,36 +1,5 @@
 if defined?(RSpec)
-  DEPRECATION_WARNINGS = %i[selector_parameters
-                            options_capabilities
-                            firefox_profile
-                            remote_keyword
-                            desired_capabilities
-                            port_keyword
-                            switches_keyword
-                            args_keyword
-                            url_service
-                            driver_opts_keyword
-                            http_open_timeout
-                            http_read_timeout
-                            http_client_timeout
-                            unknown_keyword
-                            element_cache
-                            ready_state
-                            caption
-                            class_array
-                            use_capabilities
-                            visible_text
-                            link_text
-                            text_regexp
-                            scroll_into_view
-                            stale_exists
-                            stale_visible
-                            stale_present
-                            select_all
-                            select_by
-                            value_button
-                            wait_until_present
-                            wait_while_present
-                            window_index].freeze
+  DEPRECATION_WARNINGS = %i[use_capabilities].freeze
 
   DEPRECATION_WARNINGS.each do |deprecation|
     RSpec::Matchers.define "have_deprecated_#{deprecation}" do

data/spec/watirspec/window_switching_spec.rb

@@ -43,12 +43,6 @@ describe Watir::Browser do
       expect(browser.window(title: 'closeable window').use).to be_a(Watir::Window)
     end
 
-    it 'finds window by :index' do
-      expect {
-        expect(browser.window(index: 1).use).to be_a(Watir::Window)
-      }.to have_deprecated_window_index
-    end
-
     it 'finds window by :element' do
       expect(browser.window(element: browser.a(id: 'close')).use).to be_a(Watir::Window)
     end
@@ -91,12 +85,6 @@ describe Watir::Browser do
       expect { browser.window(title: 'noop').use }.to raise_no_matching_window_exception
     end
 
-    it "raises a NoMatchingWindowFoundException error if there's no window at the given index" do
-      expect {
-        expect { browser.window(index: 100).use }.to raise_no_matching_window_exception
-      }.to have_deprecated_window_index
-    end
-
     it 'raises NoMatchingWindowFoundException error when attempting to use a window with an incorrect handle' do
       expect { browser.window(handle: 'bar').use }.to raise_no_matching_window_exception
     end
@@ -256,12 +244,6 @@ describe Watir::Window do
         expect(browser.window(title: 'closeable window').handle).to_not be_nil
       end
 
-      it 'finds window by :index' do
-        expect {
-          expect(browser.window(index: 1).handle).to_not be_nil
-        }.to have_deprecated_window_index
-      end
-
       it 'finds window by :element' do
         expect(browser.window(element: browser.a(id: 'close')).handle).to_not be_nil
       end
@@ -390,12 +372,6 @@ describe Watir::Window do
       end
 
       describe '#present?' do
-        it 'should find window by index' do
-          expect {
-            expect(browser.window(index: 0)).to be_present
-          }.to have_deprecated_window_index
-        end
-
         it 'should find window by url' do
           expect(browser.window(url: /window_switching\.html/)).to be_present
         end
@@ -411,11 +387,6 @@ describe Watir::Window do
 
       describe '#use' do
         context 'switching windows without blocks' do
-          it 'by index' do
-            expect { browser.window(index: 0).use }.to have_deprecated_window_index
-            expect(browser.title).to be == 'window switching'
-          end
-
           it 'by url' do
             browser.window(url: /window_switching\.html/).use
             expect(browser.title).to be == 'window switching'
@@ -433,12 +404,6 @@ describe Watir::Window do
         end
 
         context 'Switching windows with blocks' do
-          it 'by index' do
-            expect {
-              browser.window(index: 0).use { expect(browser.title).to be == 'window switching' }
-            }.to have_deprecated_window_index
-          end
-
           it 'by url' do
             browser.window(url: /window_switching\.html/).use { expect(browser.title).to be == 'window switching' }
           end
@@ -536,10 +501,10 @@ describe Watir::WindowCollection do
     browser.windows.reject(&:current?).each(&:close)
   end
 
-  it '#to_a' do
+  it '#to_a raises exception' do
     expect {
       Watir::WindowCollection.new(browser).to_a
-    }.to have_deprecated_window_index
+    }.to raise_exception(NoMethodError, 'indexing not reliable on WindowCollection')
   end
 
   describe '#new' do
@@ -580,24 +545,12 @@ describe Watir::WindowCollection do
     end
   end
 
-  describe '#[]' do
-    it 'returns window instance at provided index' do
-      windows = Watir::WindowCollection.new(browser)
-
-      expect {
-        expect(windows).to all(be_an(Watir::Window))
-        expect(windows.first).to_not eq windows.last
-      }.to have_deprecated_window_index
-    end
-  end
-
   describe '#eq?' do
     it 'compares the equivalence of window handles' do
       windows1 = Watir::WindowCollection.new(browser, title: //)
       windows2 = Watir::WindowCollection.new(browser, url: //)
 
       expect(windows1).to eq windows2
-      expect(windows1.to_a.map(&:handle)).to eq windows2.to_a.map(&:handle)
     end
   end
 end

data/spec/watirspec_helper.rb

@@ -32,9 +32,15 @@ class LocalConfig
                        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
 
@@ -83,7 +89,6 @@ class LocalConfig
   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 << "v#{Watir::VERSION.tr('.', '_')[/.*(?=_)/]}".to_sym
     matching_guards << :w3c if ENV['W3C']

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.142.7'
+  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.19.1
+  version: 7.0.0.beta1
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.142.7
+        version: 4.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.142.7
+        version: 4.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
@@ -67,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:
     - - ">="
@@ -192,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
@@ -226,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
@@ -291,10 +277,8 @@ files:
 - ".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"
+- ".github/actions/setup-linux/action.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -384,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
@@ -429,7 +412,6 @@ files:
 - 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
@@ -599,7 +581,6 @@ 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/screenshot_spec.rb
 - spec/watirspec/scroll_spec.rb
@@ -628,9 +609,9 @@ 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.4
 signing_key: 
@@ -641,7 +622,6 @@ test_files:
 - 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
@@ -811,7 +791,6 @@ 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/screenshot_spec.rb
 - spec/watirspec/scroll_spec.rb

data/.github/workflows/linux.yml

@@ -1,61 +0,0 @@
-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

@@ -1,55 +0,0 @@
-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 }}