watir 7.0.0.beta3 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebf40b52023085fd593f26f448268e0f00c51dbaf80fc3af9801d9d8c9d7703b
-  data.tar.gz: f42ee61445dc9ab61a6d236597bd67c84a2fdd837a5af0cc2236ae1eb6e19467
+  metadata.gz: e8a3f59dcd9f56e63cf532cc2ba8c9605e8ffad78bd59d3f104e6677c9f5e20c
+  data.tar.gz: 1f1cb55a4270ebdce957f4a8dc33e76403eef391ed59e3179f4f6772595d3f59
 SHA512:
-  metadata.gz: 61cd3f3f3cf9f3d3739ed006de8b41ad4cf60336953b518e9c993e0fafb09c7dd0d7903bbf2099d562987b91ff1aa4b351108b78767ea98b65e6eb53de78f451
-  data.tar.gz: '09017e544063c107aa91865759b4f61366476178b9c55f6b64f6bc81958eb6236d44621baff328ab4587d752a3e99be169ce9cf4be11443354d48dc019d6b04a'
+  metadata.gz: 488c6b2f0a93a20390350da8b95025f9e33d2be9bb7bd84b130808906bca067860b3db6908c59961ef3914ccbb682d2d15d2418656749f8916a1416fa8c6cbb5
+  data.tar.gz: 64bc4a7b36c294a75ceb86c3fea21809dbefc158cbca08ba72dc6bf7b3b64d76f04b5c02130a8cce15e78d5156659cb317ee397e27d93d06e537e804695e425b

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,29 @@
+### 7.1.0 (2021-11-15)
+
+* Add automatic scroll to `Element#click` with method parameters to ensure element is in viewport
+* Provide `:scroll_to` parameter for element methods implemented with `Actions` class (thanks osadasami #948, #949)
+* Allow `:scroll_to` parameter to accept `nil` argument to avoid automatic scrolling
+* Implement `Element#in_viewport?`
+* Fix but where `Scroll#to` for `Browser` with `:center` argument did not scroll to center of page
+* Change `Element#obscured?` to only scroll when element out of viewport and then scroll to bottom instead of top
+
+### 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)
+* Trigger change event when setting values on date and date-time fields (#938)
+* Allow user to obtain Capabilities instance from Browser instance
+
+### 7.0.0.beta4 (2021-05-29)
+
+* Fix Bug in using negative class names within a collection (#934)
+
 ### 7.0.0.beta3 (2021-05-05)
 
 * Fix Bug preventing proper use of vendor extension capabilities

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/browser.rb

@@ -12,7 +12,7 @@ module Watir
     include Scrolling
 
     attr_writer :default_context, :original_window, :locator_namespace, :timer
-    attr_reader :driver, :after_hooks
+    attr_reader :driver, :after_hooks, :capabilities
     alias wd driver # ensures duck typing with Watir::Element
 
     class << self
@@ -42,8 +42,8 @@ module Watir
     def initialize(browser = :chrome, *args)
       case browser
       when ::Symbol, String
-        selenium_args = Capabilities.new(browser, *args).to_args
-        @driver = Selenium::WebDriver.for(*selenium_args)
+        @capabilities = Capabilities.new(browser, *args)
+        @driver = Selenium::WebDriver.for(*@capabilities.to_args)
       when Selenium::WebDriver::Driver
         @driver = browser
       else

data/lib/watir/capabilities.rb

@@ -74,12 +74,26 @@ module Watir
                 end
 
       options.unhandled_prompt_behavior ||= :ignore
+      process_proxy_options(options)
       browser_specific_options(options)
       raise ArgumentError, "#{@options} are unrecognized arguments for Browser constructor" unless @options.empty?
 
       vendor_caps << options
     end
 
+    def process_proxy_options(options)
+      proxy = @options.delete(:proxy)
+      return if proxy.nil?
+
+      proxy &&= Selenium::WebDriver::Proxy.new(proxy) if proxy.is_a?(Hash)
+
+      unless proxy.is_a?(Selenium::WebDriver::Proxy)
+        raise TypeError, "#{proxy} needs to be Selenium Proxy or Hash instance"
+      end
+
+      options.proxy = proxy
+    end
+
     def process_vendor_capabilities(opts)
       return [] unless opts.is_a? Hash
 

data/lib/watir/elements/date_field.rb

@@ -11,7 +11,10 @@ module Watir
       raise ArgumentError, message unless [Date, ::Time].include?(date.class)
 
       date_string = date.strftime('%Y-%m-%d')
-      element_call(:wait_for_writable) { execute_js(:setValue, @element, date_string) }
+      element_call(:wait_for_writable) do
+        execute_js(:setValue, @element, date_string)
+        execute_js(:fireEvent, @element, :change)
+      end
     end
     alias set set!
     alias value= set

data/lib/watir/elements/date_time_field.rb

@@ -11,7 +11,10 @@ module Watir
       raise ArgumentError, message unless [DateTime, ::Time].include?(date.class)
 
       date_time_string = date.strftime('%Y-%m-%dT%H:%M')
-      element_call(:wait_for_writable) { execute_js(:setValue, @element, date_time_string) }
+      element_call(:wait_for_writable) do
+        execute_js(:setValue, @element, date_time_string)
+        execute_js(:fireEvent, @element, :change)
+      end
     end
     alias set set!
     alias value= set

data/lib/watir/elements/element.rb

@@ -146,9 +146,10 @@ module Watir
     # @param [:shift, :alt, :control, :command, :meta] modifiers to press while clicking.
     #
 
-    def click(*modifiers)
+    def click(*modifiers, scroll_to: :center)
       element_call(:wait_for_enabled) do
         if modifiers.any?
+          scroll.to(scroll_to) if scroll_to
           action = driver.action
           modifiers.each { |mod| action.key_down mod }
           action.click @element
@@ -202,10 +203,13 @@ module Watir
     # @example
     #   browser.element(name: "new_user_button").double_click
     #
+    # @example
+    #   browser.element(name: "new_user_button").double_click(scroll_to: :center)
+    #
 
-    def double_click
+    def double_click(scroll_to: :center)
       element_call(:wait_for_present) do
-        scroll.to
+        scroll.to(scroll_to) if scroll_to
         driver.action.double_click(@element).perform
       end
       browser.after_hooks.run
@@ -237,12 +241,16 @@ module Watir
     # @example Click an element with several modifier keys pressed
     #   browser.element(name: "new_user_button").right_click(:shift, :alt)
     #
-    # @param [:shift, :alt, :control, :command, :meta] modifiers to press while right clicking.
+    # @example Click an element with several modifier keys pressed and scroll position
+    #   browser.element(name: "new_user_button").right_click(:shift, :alt, scroll_to: :center)
+    #
+    # @param [:shift, :alt, :control, :command, :meta, scroll_to: :center]
+    # modifiers to press while right clicking and scroll position.
     #
 
-    def right_click(*modifiers)
+    def right_click(*modifiers, scroll_to: :center)
       element_call(:wait_for_present) do
-        scroll.to
+        scroll.to(scroll_to) if scroll_to
         action = driver.action
         if modifiers.any?
           modifiers.each { |mod| action.key_down mod }
@@ -264,10 +272,13 @@ module Watir
     # @example
     #   browser.element(name: "new_user_button").hover
     #
+    # @example
+    #   browser.element(name: "new_user_button").hover(scroll_to: :center)
+    #
 
-    def hover
+    def hover(scroll_to: :center)
       element_call(:wait_for_present) do
-        scroll.to
+        scroll.to(scroll_to) if scroll_to
         driver.action.move_to(@element).perform
       end
     end
@@ -280,13 +291,14 @@ module Watir
     #   a = browser.div(id: "draggable")
     #   b = browser.div(id: "droppable")
     #   a.drag_and_drop_on b
+    #   a.drag_and_drop_on b, scroll_to: :center
     #
 
-    def drag_and_drop_on(other)
+    def drag_and_drop_on(other, scroll_to: :center)
       assert_is_element other
 
       value = element_call(:wait_for_present) do
-        scroll.to
+        scroll.to(scroll_to) if scroll_to
         driver.action
               .drag_and_drop(@element, other.wd)
               .perform
@@ -302,13 +314,17 @@ module Watir
     # @example
     #   browser.div(id: "draggable").drag_and_drop_by 100, 25
     #
+    # @example
+    #   browser.div(id: "draggable").drag_and_drop_by 100, 25, scroll_to: :center
+    #
     # @param [Integer] right_by
     # @param [Integer] down_by
+    # @param [Symbol] scroll_to
     #
 
-    def drag_and_drop_by(right_by, down_by)
+    def drag_and_drop_by(right_by, down_by, scroll_to: :center)
       element_call(:wait_for_present) do
-        scroll.to
+        scroll.to(scroll_to) if scroll_to
         driver.action
               .drag_and_drop_by(@element, right_by, down_by)
               .perform
@@ -530,11 +546,21 @@ module Watir
       element_call do
         return true unless present?
 
-        scroll.to
+        scroll.to :bottom unless in_viewport?
         execute_js(:elementObscured, self)
       end
     end
 
+    #
+    # Returns true if the top of the element is visible in the viewport.
+    #
+    # @return [Boolean]
+    #
+
+    def in_viewport?
+      element_call { execute_js(:isElementInViewport, @element) }
+    end
+
     #
     # Returns given style property of this element.
     #

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/js_snippets/isElementInViewport.js

@@ -0,0 +1,20 @@
+function(){
+    var el = arguments[0];
+    var top = el.offsetTop;
+    var left = el.offsetLeft;
+    var width = el.offsetWidth;
+    var height = el.offsetHeight;
+
+    while (el.offsetParent) {
+        el = el.offsetParent;
+        top += el.offsetTop;
+        left += el.offsetLeft;
+    }
+
+    return (
+        top < (window.pageYOffset + window.innerHeight) &&
+        left < (window.pageXOffset + window.innerWidth) &&
+        (top + height) > window.pageYOffset &&
+        (left + width) > window.pageXOffset
+    );
+}

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)
@@ -218,7 +218,8 @@ module Watir
 
           def equal_pair(key, value)
             if key == :class
-              negate_xpath = value =~ /^!/ && value.slice!(0)
+              negate_xpath = value =~ /^!/
+              value = value[1..] if negate_xpath
               expression = "contains(concat(' ', @class, ' '), #{XpathSupport.escape " #{value} "})"
 
               negate_xpath ? "not(#{expression})" : expression

data/lib/watir/scroll.rb

@@ -58,7 +58,8 @@ module Watir
       when :top, :start
         'window.scrollTo(0, 0);'
       when :center
-        'window.scrollTo(window.outerWidth / 2, window.outerHeight / 2);'
+        y = '(document.body.scrollHeight - window.innerHeight) / 2 + document.body.getBoundingClientRect().top'
+        "window.scrollTo(window.outerWidth / 2, #{y});"
       when :bottom, :end
         'window.scrollTo(0, document.body.scrollHeight);'
       when Array

data/lib/watir/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '7.0.0.beta3'.freeze
+  VERSION = '7.1.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/lib/watirspec/remote_server.rb

@@ -20,14 +20,10 @@ module WatirSpec
     private
 
     def jar
-      if ENV['LOCAL_SELENIUM']
-        local = File.expand_path('../selenium/buck-out/gen/java/server/src/org/openqa/grid/selenium/selenium.jar')
-      end
-
       if File.exist?(ENV['REMOTE_SERVER_BINARY'] || '')
         ENV['REMOTE_SERVER_BINARY']
-      elsif ENV['LOCAL_SELENIUM'] && File.exist?(local)
-        local
+      elsif ENV['LOCAL_SELENIUM']
+        File.expand_path('../selenium/bazel-bin/java/server/src/org/openqa/selenium/grid/selenium_server_deploy.jar')
       elsif !Dir.glob('*selenium*.jar').empty?
         Dir.glob('*selenium*.jar').first
       else