watir 7.0.0.beta5 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4906be1ae9d2713b91037006f964eddcac08ccb7a3cc341752132dea109b0f
-  data.tar.gz: 52ece209164c1ff75eeaec71efe8c70f03dd27f4fb1c791761e77c9ac600b333
+  metadata.gz: aaa0e3a2614b0cdae93ebbae36c1f1c4ae58f55fd7d79a1b333144969354346f
+  data.tar.gz: 349abd59394dcd77d9f4aaf2050ab75dd613872c7aff3de96f8acc13cd797213
 SHA512:
-  metadata.gz: 5623e2ac22fd67b0c7f147333ed0c0e8ce3b87cf66ecb8d40a3f85672ce647d480bfe0114986a83d1a0bdc59510ad2d164c046769eea5c44a12252b3578a4d23
-  data.tar.gz: 9e95f5db40c379040dabb329c64dc4032c9c290193c3804e401cbfaabecec9550fa524c50e6483a9b597240a99f542549c1b823d91c99128dbab16b44f1c4d39
+  metadata.gz: 2abac0e5c8e81acf27b5edefd507c9056bca728f2ccab2aa858176287cf7e544a6961ab7bcc0edf7a01d78735038fedf77cbb70798aacdd490be4fc987f88602
+  data.tar.gz: a32076a9af54abfbcc470bb96095aa1441f812640029fa492233f7d7cbc5f9fb327de0397417103519cf674e7c03a91de85b749bf87e6cc8483cbf16bcefa3e7

data/.github/workflows/chrome.yml

@@ -0,0 +1,34 @@
+name: Chrome Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  local-tests:
+    name: Local Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        ruby: [ 2.6, 3.0 ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/setup-linux
+        if:  matrix.os == 'ubuntu-latest'
+      - uses: ./.github/actions/install-chrome
+        if:  matrix.os == 'ubuntu-latest'
+      - run: |
+          echo "COVERAGE=true" >> $GITHUB_ENV
+        if: |
+          matrix.os == 'ubuntu-latest' ||
+          matrix.os == 'macos-latest'
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:chrome
+        env:
+          DISPLAY: :99

data/.github/workflows/edge.yml

@@ -0,0 +1,28 @@
+name: Edge Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  local-tests:
+    name: Local Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest]
+        ruby: [ 2.6, 3.0 ]
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          echo "COVERAGE=true" >> $GITHUB_ENV
+        if: matrix.os == 'macos-latest'
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:edge
+        env:
+          DISPLAY: :99

data/.github/workflows/firefox.yml

@@ -0,0 +1,35 @@
+name: Firefox Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  local-tests:
+    name: Local Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        ruby: [ 2.6, 3.0 ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/setup-linux
+        if:  matrix.os == 'ubuntu-latest'
+      - uses: browser-actions/setup-firefox@latest
+        with:
+          firefox-version: '93.0'
+      - run: |
+          echo "COVERAGE=true" >> $GITHUB_ENV
+        if: |
+          matrix.os == 'ubuntu-latest' ||
+          matrix.os == 'macos-latest'
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:firefox
+        env:
+          DISPLAY: :99

data/.github/workflows/ie.yml

@@ -0,0 +1,24 @@
+name: IE Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  local-tests:
+    name: Local Tests
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ 2.6, 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:ie
+        env:
+          DISPLAY: :99

data/.github/workflows/safari.yml

@@ -0,0 +1,27 @@
+name: Safari Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  local-tests:
+    name: Local Tests
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ 2.6, 3.0 ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/enable-safari
+      - run: |
+          echo "COVERAGE=true" >> $GITHUB_ENV
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:safari
+        env:
+          DISPLAY: :99

data/.github/workflows/unit.yml

@@ -0,0 +1,52 @@
+name: Unit Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  documentation-test:
+    name: Yard Doctest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - run: bundle install
+      - uses: ./.github/actions/install-chrome
+      - uses: ./.github/actions/setup-linux
+      - run: |
+          bundle exec rake yard:doctest
+
+
+  unit-test:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.6', '2.7', '3.0']
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - uses: ./.github/actions/install-chrome
+      - uses: ./.github/actions/setup-linux
+      - run: |
+          bundle exec rake spec:unit
+        env:
+          DISPLAY: :99
+
+  linter-test:
+    name: Rubocop Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - run: bundle install
+      - run: bundle exec rubocop

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.5.8
+  TargetRubyVersion: 2.6.8
   NewCops: enable
   Exclude:
     - 'lib/watir/elements/html_elements.rb'

data/CHANGES.md

@@ -1,3 +1,10 @@
+### 7.0.0 (2021-10-18)
+
+* Requires Selenium 4.0.0+
+* Requires Ruby 2.6+
+* Implement `Window#minimize`
+* Implement `Window#full_screen`
+
 ### 7.0.0.beta5 (2021-08-02)
 
 * Add support for passing in Proxy and proxy Hash to Capabilities (#933)

data/lib/watir/attribute_helper.rb

@@ -29,7 +29,7 @@ module Watir
 
     def attribute_list
       @attribute_list ||= (typed_attributes.values.flatten +
-                           ancestors[1..-1].map { |e|
+                           ancestors[1..].map { |e|
                              e.attribute_list if e.respond_to?(:attribute_list)
                            }.compact.flatten
                           ).uniq

data/lib/watir/elements/table.rb

@@ -29,7 +29,7 @@ module Watir
       all_rows = rows.locate
       header_row = all_rows.first || raise(Error, 'no rows in table')
 
-      all_rows.entries[1..-1].map do |row|
+      all_rows.entries[1..].map do |row|
         cell_size_check(header_row, row)
         Hash[headers(header_row).map(&:text).zip(row.cells.map(&:text))]
       end

data/lib/watir/locators/element/selector_builder/xpath.rb

@@ -172,7 +172,7 @@ module Watir
           end
 
           def starts_with?(results, regexp)
-            regexp.source[0] == '^' && results.first == regexp.source[1..-1]
+            regexp.source[0] == '^' && results.first == regexp.source[1..]
           end
 
           def add_to_matching(key, regexp, results = nil)
@@ -219,7 +219,7 @@ module Watir
           def equal_pair(key, value)
             if key == :class
               negate_xpath = value =~ /^!/
-              value = value[1..-1] if negate_xpath
+              value = value[1..] if negate_xpath
               expression = "contains(concat(' ', @class, ' '), #{XpathSupport.escape " #{value} "})"
 
               negate_xpath ? "not(#{expression})" : expression

data/lib/watir/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '7.0.0.beta5'.freeze
+  VERSION = '7.0.0'.freeze
 end

data/lib/watir/window.rb

@@ -92,6 +92,28 @@ module Watir
       use { @driver.manage.window.maximize }
     end
 
+    #
+    # Minimize window.
+    #
+    # @example
+    #   browser.window.minimize
+    #
+
+    def minimize
+      use { @driver.manage.window.minimize }
+    end
+
+    #
+    # Make window full screen.
+    #
+    # @example
+    #   browser.window.full_screen
+    #
+
+    def full_screen
+      use { @driver.manage.window.full_screen }
+    end
+
     #
     # Returns true if window exists.
     #

data/spec/watirspec/elements/date_time_field_spec.rb

@@ -20,8 +20,7 @@ describe 'DateTimeField' do
     end
 
     it 'returns true if the datetime-local element exists',
-       except: [{browser: :firefox, reason: 'https://github.com/mozilla/geckodriver/issues/1469'},
-                {browser: :ie, reason: 'Date type not recognized'}] do
+       except: {browser: :ie, reason: 'Date type not recognized'} do
       expect(browser.date_time_field(xpath: "//input[@id='html5_datetime-local']")).to exist
     end
 
@@ -30,8 +29,7 @@ describe 'DateTimeField' do
     end
 
     it 'respects date-time fields types',
-       except: [{browser: :firefox, reason: 'https://github.com/mozilla/geckodriver/issues/1469'},
-                {browser: :ie, reason: 'Date type not recognized'}] do
+       except: {browser: :ie, reason: 'Date type not recognized'} do
       expect(browser.date_time_field.type).to eq('datetime-local')
     end
 
@@ -80,8 +78,7 @@ describe 'DateTimeField' do
 
   describe '#type' do
     it 'returns the type attribute if the date-time field exists',
-       except: [{browser: :firefox, reason: 'https://github.com/mozilla/geckodriver/issues/1469'},
-                {browser: :ie, reason: 'Date type not recognized'}] do
+       except: {browser: :ie, reason: 'Date type not recognized'} do
       expect(browser.date_time_field(id: 'html5_datetime-local').type).to eq 'datetime-local'
     end
 

data/spec/watirspec/window_switching_spec.rb

@@ -402,13 +402,16 @@ describe Watir::Window do
   context 'manipulating size and position', except: {headless: true} do
     before do
       browser.goto WatirSpec.url_for('window_switching.html')
+      @initial_size = browser.window.size
     end
 
-    it 'should get the size of the current window' do
-      size = browser.window.size
+    after do
+      browser.window.resize_to @initial_size.width, @initial_size.height
+    end
 
-      expect(size.width).to eq browser.execute_script('return window.outerWidth;')
-      expect(size.height).to eq browser.execute_script('return window.outerHeight;')
+    it 'should get the size of the current window' do
+      expect(@initial_size.width).to eq browser.execute_script('return window.outerWidth;')
+      expect(@initial_size.height).to eq browser.execute_script('return window.outerHeight;')
     end
 
     it 'should get the position of the current window' do
@@ -419,16 +422,15 @@ describe Watir::Window do
     end
 
     it 'should resize the window' do
-      initial_size = browser.window.size
       browser.window.resize_to(
-        initial_size.width - 20,
-        initial_size.height - 20
+        @initial_size.width - 20,
+        @initial_size.height - 20
       )
 
       new_size = browser.window.size
 
-      expect(new_size.width).to eq initial_size.width - 20
-      expect(new_size.height).to eq initial_size.height - 20
+      expect(new_size.width).to eq @initial_size.width - 20
+      expect(new_size.height).to eq @initial_size.height - 20
     end
 
     it 'should move the window' do
@@ -445,12 +447,11 @@ describe Watir::Window do
     end
 
     it 'should maximize the window', except: {browser: :firefox, window_manager: false} do
-      initial_size = browser.window.size
       browser.window.resize_to(
-        initial_size.width - 40,
-        initial_size.height - 40
+        @initial_size.width - 40,
+        @initial_size.height - 40
       )
-      browser.wait_until { |b| b.window.size != initial_size }
+      browser.wait_until { |b| b.window.size != @initial_size }
       new_size = browser.window.size
 
       browser.window.maximize
@@ -458,7 +459,32 @@ describe Watir::Window do
 
       final_size = browser.window.size
       expect(final_size.width).to be >= new_size.width
-      expect(final_size.height).to be > (new_size.height)
+      expect(final_size.height).to be > new_size.height
+    end
+
+    it 'should make the window full screen', except: {browser: :firefox, window_manager: false} do
+      browser.window.resize_to(
+        @initial_size.width - 40,
+        @initial_size.height - 40
+      )
+      new_size = browser.window.size
+
+      browser.window.full_screen
+      browser.wait_until { |b| b.window.size != new_size }
+
+      final_size = browser.window.size
+      expect(final_size.width).to be >= new_size.width
+      expect(final_size.height).to be > new_size.height
+    end
+
+    it 'should minimize the window', except: {window_manager: false} do
+      expect(browser.execute_script('return document.visibilityState;')).to eq 'visible'
+
+      browser.window.minimize
+
+      browser.wait_until { |b| b.execute_script('return document.visibilityState;') != 'visible' }
+
+      expect(browser.execute_script('return document.visibilityState;')).to eq 'hidden'
     end
   end
 end

data/spec/watirspec_helper.rb

@@ -39,6 +39,7 @@ class LocalConfig
                          Webdrivers::Geckodriver.update
                          "geckodriver version: #{Webdrivers::Geckodriver.current_version.version}"
                        when :ie
+                         Webdrivers::IEdriver.required_version = '3.150.1'
                          Webdrivers::IEdriver.update
                          "iedriver version: #{Webdrivers::IEdriver.current_version.version}"
                        end
@@ -155,6 +156,8 @@ RSpec.configure do |config|
     headless = WatirSpec.implementation.browser_args.last[:headless]
     guards.add_condition(:headless, headless)
 
+    guards.add_condition(:ci, ENV['DESKTOP_SESSION'].nil?)
+
     window_manager = !Selenium::WebDriver::Platform.linux? || !ENV['DESKTOP_SESSION'].nil?
     guards.add_condition(:window_manager, window_manager)
 

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.5.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.platform = Gem::Platform::RUBY
   s.authors = ['Alex Rodionov', 'Titus Fortner', 'Justin Ko']
@@ -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.beta4'
+  s.add_dependency 'selenium-webdriver', '~> 4.0'
   s.add_runtime_dependency 'regexp_parser', '>= 1.2', '< 3'
 
   s.add_development_dependency 'activesupport', '~> 4.0', '>= 4.1.11' # for pluralization during code generation
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop', '~> 0.59'
   s.add_development_dependency 'selenium_statistics'
   s.add_development_dependency 'simplecov-console'
-  s.add_development_dependency 'webdrivers', '~> 4.6'
+  s.add_development_dependency 'webdrivers', '~> 4.7'
   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,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta5
+  version: 7.0.0
 platform: ruby
 authors:
 - Alex Rodionov
 - Titus Fortner
 - Justin Ko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta4
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta4
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: webidl
   requirement: !ruby/object:Gem::Requirement
@@ -278,7 +278,12 @@ files:
 - ".github/actions/enable-safari/action.yml"
 - ".github/actions/install-chrome/action.yml"
 - ".github/actions/setup-linux/action.yml"
-- ".github/workflows/tests.yml"
+- ".github/workflows/chrome.yml"
+- ".github/workflows/edge.yml"
+- ".github/workflows/firefox.yml"
+- ".github/workflows/ie.yml"
+- ".github/workflows/safari.yml"
+- ".github/workflows/unit.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -599,7 +604,7 @@ homepage: http://github.com/watir/watir
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -607,15 +612,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Watir powered by Selenium
 test_files:

data/.github/workflows/tests.yml

@@ -1,104 +0,0 @@
-name: All Tests
-
-on:
-  - push
-  - pull_request
-
-jobs:
-  documentation-test:
-    name: Yard Doctest
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-      - run: bundle install
-      - uses: ./.github/actions/install-chrome
-      - uses: ./.github/actions/setup-linux
-      - run: |
-          bundle exec rake yard:doctest
-
-  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
-      - uses: ./.github/actions/install-chrome
-      - uses: ./.github/actions/setup-linux
-      - run: |
-          bundle exec rake spec:unit
-        env:
-          DISPLAY: :99
-
-  linter-test:
-    name: Rubocop Tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-      - run: bundle install
-      - run: bundle exec rubocop
-
-  local-tests:
-    name: Local Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        ruby: [ 2.6, 3.0 ]
-        task: [ chrome, firefox, edge ]
-        include:
-          - os: 'macos-latest'
-            ruby: 2.6
-            task: 'safari'
-          - os: 'macos-latest'
-            ruby: 3.0
-            task: 'safari'
-          - os: 'windows-latest'
-            ruby: 2.6
-            task: 'ie'
-          - os: 'windows-latest'
-            ruby: 3.0
-            task: 'ie'
-        exclude:
-          - os: 'ubuntu-latest'
-            task: 'edge'
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ./.github/actions/install-chrome
-        if: |
-          matrix.task == 'chrome' &&
-          matrix.os == 'ubuntu-latest'
-      - uses: ./.github/actions/setup-linux
-        if:  matrix.os == 'ubuntu-latest'
-      - uses: browser-actions/setup-firefox@latest
-        with:
-          firefox-version: '86.0'
-        if: matrix.task == 'firefox'
-      - uses: ./.github/actions/enable-safari
-        if: matrix.task == 'safari'
-      - run: |
-          echo "COVERAGE=true" >> $GITHUB_ENV
-        if: |
-          matrix.os == 'ubuntu-latest' ||
-          matrix.os == 'macos-latest'
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - run: bundle install
-      - run: |
-          bundle exec rake spec:${{ matrix.task }}
-        env:
-          DISPLAY: :99