capybara 3.24.0 → 3.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ea1da81bd27199aadc0d73d61e33b7ff0ea9911114acc375ea2e6f798a49eb4
-  data.tar.gz: 30279a8a5ab221ae029bc95625c7c82ad11cdf68d91ef6be33e7a0b022268537
+  metadata.gz: 439a641ea3d9a06bcc674c159c3ef16612fb29874e71f11ef7bb2d0e73382892
+  data.tar.gz: a5e57dfb62e3682a87f05650a13945545a61183a84a15498390d07aa3ec6e4ed
 SHA512:
-  metadata.gz: 0b8d7f760540297a204ae5eb0dac8b9450e8961652de87d543ae114edb9af6a48219db7c55a40e004d49847431ef545cc5628a6bbde858e58921209f984852d2
-  data.tar.gz: 56d10157a97fd98f7e2e23c98fc21f0dc0f70f53338a271c9fa22b639648d919134fe1c7c803be43f435a9618d49e2517ccce5d207139635c49d9f6f18a66bd6
+  metadata.gz: d50ab813eecabef7465c9a42904174f65eefe6dc8e0f92fea59d523753582c1797a1a87880a1d9805edb8f74e33585314841d6fac7abcf2781a627ac9703191e
+  data.tar.gz: 0d4f2b360e528a3fae6357072592ac5295cb500d68251d23bc66a014fc62528473e960b4049d4e24a5339a8a41f02f15c70b7ae59b5f51ebfb1a7369afa47f27

data/History.md

@@ -1,5 +1,20 @@
+# Version 3.25.0
+Release date: 2019-06-27
+
+### Added
+
+* Animation disabler also disables before and after pseudoelements - Issue #2221 [Daniel Heath]
+* `w3c_click_offset` configuration option to determine whether click offsets are calculated from element
+  center or top left corner
+
+### Fixed
+
+* Woraround issue with chromedriver 76/77 in W3C mode losing mouse state during legacy drag. Only fixed if
+  both source and target are simultaenously inside the viewport - Issue #2223
+* Negative ancestor expectations/predicates were incorrectly checking siblings rather than ancestors
+
 # Version 3.24.0
-Release date: 2079-06-13
+Release date: 2019-06-13
 
 ### Added
 

data/README.md

@@ -7,7 +7,7 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jnicklas/capybara?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=capybara&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=capybara&package-manager=bundler&version-scheme=semver)
 
-**Note** You are viewing the README for the 3.24.x version of Capybara.
+**Note** You are viewing the README for the 3.25.x version of Capybara
 
 Capybara helps you test web applications by simulating how a real user would
 interact with your app. It is agnostic about the driver running your tests and

data/lib/capybara.rb

@@ -97,6 +97,7 @@ module Capybara
     #   and {configure raise_server_errors} is `true`.
     # - **test_id** (Symbol, String, `nil` = `nil`) - Optional attribute to match locator against with built-in selectors along with id.
     # - **threadsafe** (Boolean = `false`) - Whether sessions can be configured individually.
+    # - **w3c_click_offset** (Boolean = 'false') - Whether click offsets should be from element center (true) or top left (false)
     #
     # #### DSL Options
     #
@@ -506,4 +507,5 @@ Capybara.configure do |config|
   config.predicates_wait = true
   config.default_normalize_ws = false
   config.allow_gumbo = false
+  config.w3c_click_offset = false
 end

data/lib/capybara/node/actions.rb

@@ -307,12 +307,12 @@ module Capybara
         synchronize(Capybara::Queries::BaseQuery.wait(options, session_options.default_max_wait_time)) do
           begin
             find(:select, from, options)
-          rescue Capybara::ElementNotFound => select_error
+          rescue Capybara::ElementNotFound => select_error # rubocop:disable Naming/RescuedExceptionsVariableName
             raise if %i[selected with_selected multiple].any? { |option| options.key?(option) }
 
             begin
               find(:datalist_input, from, options)
-            rescue Capybara::ElementNotFound => dlinput_error
+            rescue Capybara::ElementNotFound => dlinput_error # rubocop:disable Naming/RescuedExceptionsVariableName
               raise Capybara::ElementNotFound, "#{select_error.message} and #{dlinput_error.message}"
             end
           end

data/lib/capybara/node/element.rb

@@ -157,13 +157,16 @@ module Capybara
       #   Both x: and y: must be specified if an offset is wanted, if not specified the click will occur at the middle of the element.
       #   @overload $0(*modifier_keys, wait: nil, **offset)
       #     @param *modifier_keys [:alt, :control, :meta, :shift] ([]) Keys to be held down when clicking
-      #     @option offset [Integer] x  X coordinate to offset the click location from the top left corner of the element
-      #     @option offset [Integer] y  Y coordinate to offset the click location from the top left corner of the element
+      #     @option options [Integer] x  X coordinate to offset the click location. If {Capybara.configure w3c_click_offset} is `true` the
+      #       offset will be from the element center, otherwise it will be from the top left corner of the element
+      #     @option options [Integer] y  Y coordinate to offset the click location. If {Capybara.configure w3c_click_offset} is `true` the
+      #       offset will be from the element center, otherwise it will be from the top left corner of the element
       # @return [Capybara::Node::Element]  The element
-      def click(*keys, wait: nil, **offset)
-        raise ArgumentError, 'You must specify both x: and y: for a click offset' if nil ^ offset[:x] ^ offset[:y]
+      def click(*keys, wait: nil, **options)
+        raise ArgumentError, 'You must specify both x: and y: for a click offset' if nil ^ options[:x] ^ options[:y]
 
-        synchronize(wait) { base.click(Array(keys), offset) }
+        options[:offset] = :center if session_options.w3c_click_offset
+        synchronize(wait) { base.click(Array(keys), options) }
         self
       end
 

data/lib/capybara/node/matchers.rb

@@ -743,7 +743,7 @@ module Capybara
       end
 
       def assert_no_ancestor(*args, &optional_filter_block)
-        _verify_selector_result(args, optional_filter_block, Capybara::Queries::SiblingQuery) do |result, query|
+        _verify_selector_result(args, optional_filter_block, Capybara::Queries::AncestorQuery) do |result, query|
           if result.matches_count? && (!result.empty? || query.expects_none?)
             raise Capybara::ExpectationNotMet, result.negative_failure_message
           end

data/lib/capybara/rack_test/node.rb

@@ -63,8 +63,9 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     native.remove_attribute('selected')
   end
 
-  def click(keys = [], **offset)
-    raise ArgumentError, 'The RackTest driver does not support click options' unless keys.empty? && offset.empty?
+  def click(keys = [], **options)
+    options.delete(:offset)
+    raise ArgumentError, 'The RackTest driver does not support click options' unless keys.empty? && options.empty?
 
     if link?
       follow_link

data/lib/capybara/rspec/matchers/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'capybara/rspec/matchers/compound'
+require 'capybara/rspec/matchers/count_sugar'
 
 module Capybara
   module RSpecMatchers
@@ -65,6 +66,10 @@ module Capybara
         end
       end
 
+      class CountableWrappedElementMatcher < WrappedElementMatcher
+        include ::Capybara::RSpecMatchers::CountSugar
+      end
+
       class NegatedMatcher
         include ::Capybara::RSpecMatchers::Matchers::Compound if defined?(::Capybara::RSpecMatchers::Matchers::Compound)
 

data/lib/capybara/rspec/matchers/have_ancestor.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
 require 'capybara/rspec/matchers/base'
-require 'capybara/rspec/matchers/count_sugar'
 
 module Capybara
   module RSpecMatchers
     module Matchers
-      class HaveAncestor < WrappedElementMatcher
-        include CountSugar
-
+      class HaveAncestor < CountableWrappedElementMatcher
         def element_matches?(el)
           el.assert_ancestor(*@args, &@filter_block)
         end

data/lib/capybara/rspec/matchers/have_selector.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
 require 'capybara/rspec/matchers/base'
-require 'capybara/rspec/matchers/count_sugar'
 
 module Capybara
   module RSpecMatchers
     module Matchers
-      class HaveSelector < WrappedElementMatcher
-        include CountSugar
-
+      class HaveSelector < CountableWrappedElementMatcher
         def element_matches?(el)
           el.assert_selector(*@args, &@filter_block)
         end

data/lib/capybara/rspec/matchers/have_sibling.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
 require 'capybara/rspec/matchers/base'
-require 'capybara/rspec/matchers/count_sugar'
 
 module Capybara
   module RSpecMatchers
     module Matchers
-      class HaveSibling < WrappedElementMatcher
-        include CountSugar
-
+      class HaveSibling < CountableWrappedElementMatcher
         def element_matches?(el)
           el.assert_sibling(*@args, &@filter_block)
         end

data/lib/capybara/rspec/matchers/have_text.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
 require 'capybara/rspec/matchers/base'
-require 'capybara/rspec/matchers/count_sugar'
 
 module Capybara
   module RSpecMatchers
     module Matchers
-      class HaveText < WrappedElementMatcher
-        include CountSugar
-
+      class HaveText < CountableWrappedElementMatcher
         def element_matches?(el)
           el.assert_text(*@args)
         end

data/lib/capybara/selector/builders/css_builder.rb

@@ -17,11 +17,7 @@ module Capybara
           conditions = if name == :class
             class_conditions(value)
           elsif value.is_a? Regexp
-            Selector::RegexpDisassembler.new(value).alternated_substrings.map do |strs|
-              strs.map do |str|
-                "[#{name}*='#{str}'#{' i' if value.casefold?}]"
-              end.join
-            end
+            regexp_conditions(name, value)
           else
             [attribute_conditions(name => value)]
           end
@@ -36,6 +32,14 @@ module Capybara
 
     private
 
+      def regexp_conditions(name, value)
+        Selector::RegexpDisassembler.new(value).alternated_substrings.map do |strs|
+          strs.map do |str|
+            "[#{name}*='#{str}'#{' i' if value.casefold?}]"
+          end.join
+        end
+      end
+
       def attribute_conditions(attributes)
         attributes.map do |attribute, value|
           case value
@@ -70,7 +74,7 @@ module Capybara
             end.join
           end
         else
-          cls = Array(classes).group_by { |cl| cl.start_with?('!') && !cl.start_with?('!!!') }
+          cls = Array(classes).group_by { |cl| cl.match?(/^!(?!!!)/) }
           [(cls[false].to_a.map { |cl| ".#{Capybara::Selector::CSS.escape(cl.sub(/^!!/, ''))}" } +
           cls[true].to_a.map { |cl| ":not(.#{Capybara::Selector::CSS.escape(cl.slice(1..-1))})" }).join]
         end

data/lib/capybara/selector/builders/xpath_builder.rb

@@ -48,7 +48,7 @@ module Capybara
           attribute_conditions(class: classes)
         else
           Array(classes).map do |klass|
-            if klass.start_with?('!') && !klass.start_with?('!!!')
+            if klass.match?(/^!(?!!!)/)
               !XPath.attr(:class).contains_word(klass.slice(1..-1))
             else
               XPath.attr(:class).contains_word(klass.sub(/^!!/, ''))

data/lib/capybara/selenium/driver.rb

@@ -300,13 +300,10 @@ private
   end
 
   def unhandled_alert_errors
-    @unhandled_alert_errors ||= [Selenium::WebDriver::Error::UnexpectedAlertOpenError].tap do |errors|
-      unless selenium_4?
-        ::Selenium::WebDriver.logger.suppress_deprecations do
-          errors << Selenium::WebDriver::Error::UnhandledAlertError
-        end
-      end
-    end
+    @unhandled_alert_errors ||= with_legacy_error(
+      [Selenium::WebDriver::Error::UnexpectedAlertOpenError],
+      'UnhandledAlertError'
+    )
   end
 
   def delete_all_cookies
@@ -387,10 +384,14 @@ private
   end
 
   def find_modal_errors
-    @find_modal_errors ||= [Selenium::WebDriver::Error::TimeoutError].tap do |errors|
+    @find_modal_errors ||= with_legacy_error([Selenium::WebDriver::Error::TimeoutError], 'TimeOutError')
+  end
+
+  def with_legacy_error(errors, legacy_error)
+    errors.tap do |errs|
       unless selenium_4?
         ::Selenium::WebDriver.logger.suppress_deprecations do
-          errors << Selenium::WebDriver::Error::TimeOutError
+          errs << Selenium::WebDriver::Error.const_get(legacy_error)
         end
       end
     end

data/lib/capybara/selenium/extensions/find.rb

@@ -18,27 +18,28 @@ module Capybara
         hints = []
 
         if (els.size > 2) && !ENV['DISABLE_CAPYBARA_SELENIUM_OPTIMIZATIONS']
-          begin
-            els = filter_by_text(els, texts) unless texts.empty?
-            hints_js, functions = build_hints_js(uses_visibility, styles)
-
-            unless functions.empty?
-              hints = es_context.execute_script(hints_js, els).map! do |results|
-                hint = {}
-                hint[:style] = results.pop if functions.include?(:style_func)
-                hint[:visible] = results.pop if functions.include?(:vis_func)
-                hint
-              end
-            end
-          rescue ::Selenium::WebDriver::Error::StaleElementReferenceError,
-                 ::Capybara::NotSupportedByDriverError
-            # warn 'Unexpected Stale Element Error - skipping optimization'
-            hints = []
-          end
+          els = filter_by_text(els, texts) unless texts.empty?
+          hints = gather_hints(els, uses_visibility: uses_visibility, styles: styles)
         end
         els.map.with_index { |el, idx| build_node(el, hints[idx] || {}) }
       end
 
+      def gather_hints(elements, uses_visibility:, styles:)
+        hints_js, functions = build_hints_js(uses_visibility, styles)
+        return [] unless functions.any?
+
+        es_context.execute_script(hints_js, elements).map! do |results|
+          hint = {}
+          hint[:style] = results.pop if functions.include?(:style_func)
+          hint[:visible] = results.pop if functions.include?(:vis_func)
+          hint
+        end
+      rescue ::Selenium::WebDriver::Error::StaleElementReferenceError,
+             ::Capybara::NotSupportedByDriverError
+        # warn 'Unexpected Stale Element Error - skipping optimization'
+        []
+      end
+
       def filter_by_text(elements, texts)
         es_context.execute_script <<~JS, elements, texts
           var texts = arguments[1];

data/lib/capybara/selenium/extensions/html5_drag.rb

@@ -7,16 +7,24 @@ class Capybara::Selenium::Node
     def drag_to(element, delay: 0.05)
       driver.execute_script MOUSEDOWN_TRACKER
       scroll_if_needed { browser_action.click_and_hold(native).perform }
-      if driver.evaluate_script('window.capybara_mousedown_prevented || !arguments[0].draggable', self)
-        element.scroll_if_needed { browser_action.move_to(element.native).release.perform }
+      if driver.evaluate_script(LEGACY_DRAG_CHECK, self)
+        perform_legacy_drag(element)
       else
-        driver.evaluate_async_script HTML5_DRAG_DROP_SCRIPT, self, element, delay * 1000
-        browser_action.release.perform
+        perform_html5_drag(element, delay)
       end
     end
 
   private
 
+    def perform_legacy_drag(element)
+      element.scroll_if_needed { browser_action.move_to(element.native).release.perform }
+    end
+
+    def perform_html5_drag(element, delay)
+      driver.evaluate_async_script HTML5_DRAG_DROP_SCRIPT, self, element, delay * 1000
+      browser_action.release.perform
+    end
+
     def html5_drop(*args)
       if args[0].is_a? String
         input = driver.evaluate_script ATTACH_FILE
@@ -86,6 +94,16 @@ class Capybara::Selenium::Node
       }, { once: true, passive: true })
     JS
 
+    LEGACY_DRAG_CHECK = <<~JS
+      (function(el){
+        if (window.capybara_mousedown_prevented) return true;
+        do {
+          if (el.draggable) return false;
+        } while (el = el.parentElement );
+        return true;
+      })(arguments[0])
+    JS
+
     HTML5_DRAG_DROP_SCRIPT = <<~JS
       function rectCenter(rect){
         return new DOMPoint(
@@ -166,6 +184,10 @@ class Capybara::Selenium::Node
       var dt = new DataTransfer();
       var opts = { cancelable: true, bubbles: true, dataTransfer: dt };
 
+      while (source && !source.draggable) {
+        source = source.parentElement;
+      }
+
       if (source.tagName == 'A'){
         dt.setData('text/uri-list', source.href);
         dt.setData('text', source.href);

data/lib/capybara/selenium/extensions/modifier_keys_stack.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Capybara::Selenium::Node
+  #
+  # @api private
+  #
+  class ModifierKeysStack
+    def initialize
+      @stack = []
+    end
+
+    def include?(key)
+      @stack.flatten.include?(key)
+    end
+
+    def press(key)
+      @stack.last.push(key)
+    end
+
+    def push
+      @stack.push []
+    end
+
+    def pop
+      @stack.pop
+    end
+  end
+end

data/lib/capybara/selenium/node.rb

@@ -188,6 +188,21 @@ protected
     yield
   end
 
+  def scroll_to_center
+    script = <<-'JS'
+      try {
+        arguments[0].scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
+      } catch(e) {
+        arguments[0].scrollIntoView(true);
+      }
+    JS
+    begin
+      driver.execute_script(script, self)
+    rescue StandardError # rubocop:disable Lint/HandleExceptions
+      # Swallow error if scrollIntoView with options isn't supported
+    end
+  end
+
 private
 
   def sibling_index(parent, node, selector)
@@ -241,21 +256,6 @@ private
     end
   end
 
-  def scroll_to_center
-    script = <<-'JS'
-      try {
-        arguments[0].scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
-      } catch(e) {
-        arguments[0].scrollIntoView(true);
-      }
-    JS
-    begin
-      driver.execute_script(script, self)
-    rescue StandardError # rubocop:disable Lint/HandleExceptions
-      # Swallow error if scrollIntoView with options isn't supported
-    end
-  end
-
   def set_date(value) # rubocop:disable Naming/AccessorMethodName
     value = SettableValue.new(value)
     return set_text(value) unless value.dateable?
@@ -328,7 +328,13 @@ private
   end
 
   def action_with_modifiers(click_options)
-    actions = browser_action.move_to(native, *click_options.coords)
+    actions = browser_action.tap do |acts|
+      if click_options.center_offset? && click_options.coords?
+        acts.move_to(native).move_by(*click_options.coords)
+      else
+        acts.move_to(native, *click_options.coords)
+      end
+    end
     modifiers_down(actions, click_options.keys)
     yield actions
     modifiers_up(actions, click_options.keys)
@@ -483,6 +489,10 @@ private
       [options[:x], options[:y]]
     end
 
+    def center_offset?
+      options[:offset] == :center
+    end
+
     def empty?
       keys.empty? && !coords?
     end

data/lib/capybara/selenium/nodes/chrome_node.rb

@@ -57,6 +57,15 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
 
 private
 
+  def perform_legacy_drag(element)
+    return super unless (browser_version < 77.0) && w3c? && !element.obscured?
+
+    # W3C Chrome/chromedriver < 77 doesn't maintain mouse button state across actions API performs
+    # https://bugs.chromium.org/p/chromedriver/issues/detail?id=2981
+    browser_action.release.perform
+    browser_action.click_and_hold(native).move_to(element.native).release.perform
+  end
+
   def file_errors
     @file_errors = ::Selenium::WebDriver.logger.suppress_deprecations do
       [::Selenium::WebDriver::Error::ExpectedError]

data/lib/capybara/selenium/nodes/firefox_node.rb

@@ -114,27 +114,4 @@ private
   def browser_version
     driver.browser.capabilities[:browser_version].to_f
   end
-
-  class ModifierKeysStack
-    def initialize
-      @stack = []
-    end
-
-    def include?(key)
-      @stack.flatten.include?(key)
-    end
-
-    def press(key)
-      @stack.last.push(key)
-    end
-
-    def push
-      @stack.push []
-    end
-
-    def pop
-      @stack.pop
-    end
-  end
-  private_constant :ModifierKeysStack
 end

data/lib/capybara/selenium/nodes/safari_node.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # require 'capybara/selenium/extensions/html5_drag'
+require 'capybara/selenium/extensions/modifier_keys_stack'
 
 class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
   # include Html5Drag
@@ -118,27 +119,4 @@ private
                      shift left_shift right_shift
                      meta left_meta right_meta
                      command].freeze
-
-  class ModifierKeysStack
-    def initialize
-      @stack = []
-    end
-
-    def include?(key)
-      @stack.flatten.include?(key)
-    end
-
-    def press(key)
-      @stack.last.push(key)
-    end
-
-    def push
-      @stack.push []
-    end
-
-    def pop
-      @stack.pop
-    end
-  end
-  private_constant :ModifierKeysStack
 end

data/lib/capybara/server/animation_disabler.rb

@@ -46,7 +46,7 @@ module Capybara
       DISABLE_MARKUP_TEMPLATE = <<~HTML
         <script defer>(typeof jQuery !== 'undefined') && (jQuery.fx.off = true);</script>
         <style>
-           %<selector>s {
+           %<selector>s, %<selector>s::before, %<selector>s::after {
              transition: none !important;
              animation-duration: 0s !important;
              animation-delay: 0s !important;

data/lib/capybara/session/config.rb

@@ -8,7 +8,7 @@ module Capybara
                  automatic_reload match exact exact_text raise_server_errors visible_text_only
                  automatic_label_click enable_aria_label save_path asset_host default_host app_host
                  server_host server_port server_errors default_set_options disable_animation test_id
-                 predicates_wait default_normalize_ws].freeze
+                 predicates_wait default_normalize_ws w3c_click_offset].freeze
 
     attr_accessor(*OPTIONS)
 
@@ -59,6 +59,8 @@ module Capybara
     #   See {Capybara.configure}
     # @!method default_normalize_ws
     #   See {Capybara.configure}
+    # @!method w3c_click_offset
+    #   See {Capybara.configure}
 
     remove_method :server_host
 

data/lib/capybara/spec/public/offset.js

@@ -0,0 +1,6 @@
+$(function() {
+  $(document).on('click dblclick contextmenu', function(e){
+    e.preventDefault();
+    $(document.body).append('<div id="has-been-clicked">Has been clicked at ' + e.clientX + ',' + e.clientY + '</div>');
+  })
+})

data/lib/capybara/spec/session/has_ancestor_spec.rb

@@ -39,6 +39,8 @@ Capybara::SpecHelper.spec '#have_no_ancestor' do
   it 'should assert no matching ancestor' do
     el = @session.find(:css, '#ancestor1')
     expect(el).to have_no_ancestor(:css, '#child')
+    expect(el).to have_no_ancestor(:css, '#ancestor1_sibiling')
     expect(el).not_to have_ancestor(:css, '#child')
+    expect(el).not_to have_ancestor(:css, '#ancestor1_sibiling')
   end
 end

data/lib/capybara/spec/session/node_spec.rb

@@ -419,6 +419,16 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
     end
 
+    it 'should work with Dragula' do
+      @session.visit('/with_dragula')
+      @session.within(:css, '#sortable') do
+        src = @session.find('div', text: 'Item 1')
+        target = @session.find('div', text: 'Item 3')
+        src.drag_to target
+        expect(@session).to have_content(/Item 2.*Item 1/, normalize_ws: true)
+      end
+    end
+
     context 'HTML5', requires: %i[js html5_drag] do
       it 'should HTML5 drag and drop an object' do
         @session.visit('/with_js')
@@ -428,6 +438,14 @@ Capybara::SpecHelper.spec 'node' do
         expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain drag_html5")]')
       end
 
+      it 'should HTML5 drag and drop an object child' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]/p')
+        target = @session.find('//div[@id="drop_html5"]')
+        element.drag_to(target)
+        expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain drag_html5")]')
+      end
+
       it 'should set clientX/Y in dragover events' do
         @session.visit('/with_js')
         element = @session.find('//div[@id="drag_html5"]')
@@ -471,6 +489,14 @@ Capybara::SpecHelper.spec 'node' do
           expect(@session).to have_content(/Item 3.*Item 1/, normalize_ws: true)
         end
       end
+
+      it 'should drag HTML5 default draggable element child' do
+        @session.visit('/with_js')
+        source = @session.find_link('drag_link_html5').find(:css, 'p')
+        target = @session.find(:id, 'drop_html5')
+        source.drag_to target
+        expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped")]')
+      end
     end
   end
 
@@ -635,6 +661,55 @@ Capybara::SpecHelper.spec 'node' do
       JS
       expect { obscured.click(wait: 0) }.to(raise_error { |e| expect(e).to be_an_invalid_element_error(@session) })
     end
+
+    context 'offset', requires: [:js] do
+      before do
+        @session.visit('/offset')
+        @clicker = @session.find(:id, 'clicker')
+      end
+
+      context 'when w3c_click_offset is false' do
+        before do
+          Capybara.w3c_click_offset = false
+        end
+
+        it 'should offset from top left of element' do
+          @clicker.click(x: 10, y: 5)
+          expect(@session).to have_text(/clicked at 110,105/)
+        end
+
+        it 'should offset outside the element' do
+          @clicker.click(x: -15, y: -10)
+          expect(@session).to have_text(/clicked at 85,90/)
+        end
+
+        it 'should default to click the middle' do
+          @clicker.click
+          expect(@session).to have_text(/clicked at 150,150/)
+        end
+      end
+
+      context 'when w3c_click_offset is true' do
+        before do
+          Capybara.w3c_click_offset = true
+        end
+
+        it 'should offset from center of element' do
+          @clicker.click(x: 10, y: 5)
+          expect(@session).to have_text(/clicked at 160,155/)
+        end
+
+        it 'should offset outside from center of element' do
+          @clicker.click(x: -65, y: -60)
+          expect(@session).to have_text(/clicked at 85,90/)
+        end
+
+        it 'should default to click the middle' do
+          @clicker.click
+          expect(@session).to have_text(/clicked at 150,150/)
+        end
+      end
+    end
   end
 
   describe '#double_click', requires: [:js] do
@@ -669,6 +744,28 @@ Capybara::SpecHelper.spec 'node' do
       JS
       expect { obscured.double_click }.not_to raise_error
     end
+
+    context 'offset', requires: [:js] do
+      before do
+        @session.visit('/offset')
+        @clicker = @session.find(:id, 'clicker')
+      end
+
+      it 'should offset from top left of element' do
+        @clicker.click(x: 10, y: 5)
+        expect(@session).to have_text(/clicked at 110,105/)
+      end
+
+      it 'should offset outside the element' do
+        @clicker.click(x: -15, y: -10)
+        expect(@session).to have_text(/clicked at 85,90/)
+      end
+
+      it 'should default to click the middle' do
+        @clicker.click
+        expect(@session).to have_text(/clicked at 150,150/)
+      end
+    end
   end
 
   describe '#right_click', requires: [:js] do
@@ -703,6 +800,28 @@ Capybara::SpecHelper.spec 'node' do
       JS
       expect { obscured.right_click }.not_to raise_error
     end
+
+    context 'offset', requires: [:js] do
+      before do
+        @session.visit('/offset')
+        @clicker = @session.find(:id, 'clicker')
+      end
+
+      it 'should offset from top left of element' do
+        @clicker.click(x: 10, y: 5)
+        expect(@session).to have_text(/clicked at 110,105/)
+      end
+
+      it 'should offset outside the element' do
+        @clicker.click(x: -15, y: -10)
+        expect(@session).to have_text(/clicked at 85,90/)
+      end
+
+      it 'should default to click the middle' do
+        @clicker.click
+        expect(@session).to have_text(/clicked at 150,150/)
+      end
+    end
   end
 
   describe '#send_keys', requires: [:send_keys] do

data/lib/capybara/spec/session/selectors_spec.rb

@@ -79,7 +79,7 @@ Capybara::SpecHelper.spec Capybara::Selector do
     it 'can find by class' do
       expect(@session.find(:field, class: 'confusion-checkbox')['id']).to eq 'confusion_checkbox'
       expect(@session).to have_selector(:field, class: 'confusion', count: 3)
-      expect(@session.find(:field, class: ['confusion', 'confusion-textarea'])['id']).to eq 'confusion_textarea'
+      expect(@session.find(:field, class: %w[confusion confusion-textarea])['id']).to eq 'confusion_textarea'
     end
   end
 end

data/lib/capybara/spec/spec_helper.rb

@@ -36,6 +36,7 @@ module Capybara
         Capybara.predicates_wait = true
         Capybara.default_normalize_ws = false
         Capybara.allow_gumbo = true
+        Capybara.w3c_click_offset = false
         reset_threadsafe
       end
 

data/lib/capybara/spec/views/offset.erb

@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>Offset</title>
+    <style>
+      body {
+        margin: 0px;
+      }
+      #wrapper {
+        width: 300px;
+        height: 300px;
+        margin: 0px;
+      }
+      #clicker {
+        position: relative;
+        width: 100px;
+        height: 100px;
+        top: 100px;
+        left: 100px;
+        background-color: red;
+        margin: 0px;
+      }
+    </style>
+    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/offset.js" type="text/javascript" charset="utf-8"></script>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="clicker"></div>
+    </div>
+  </body>
+  </html>

data/lib/capybara/spec/views/with_animation.erb

@@ -6,6 +6,17 @@
     <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
     <script src="/jquery-ui.js" type="text/javascript" charset="utf-8"></script>
     <script src="/test.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript">
+      $(document).on('transitionend', function(){
+        $(document.body).append('<div>Transition Ended</div>')
+      });
+      $(document).on('animationend', function(){
+        $(document.body).append('<div>Animation Ended</div>')
+      });
+      $(document).on('contextmenu', function(e){
+        e.preventDefault();
+      });
+    </script>
     <style>
       .transition.away {
           width: 0%;
@@ -17,6 +28,13 @@
           overflow: hidden;
       }
 
+      a::after {
+        content: "";
+        width: 0px;
+        height: 0px;
+        background-color: blue;
+      }
+
       a:not(.away) {
         height: 20px;
       }
@@ -35,12 +53,22 @@
         animation-duration: 3s;
         animation-fill-mode: forwards;
       }
+
+      @keyframes pseudo_grow {
+        100% { height: 100px, width: 100px };
+      }
+
+      a.animation.pseudo::after {
+        animation: pseudo_grow 3s forwards;
+      }
     </style>
   </head>
 
   <body id="with_animation">
     <a href='#' class='transition' onclick='this.classList.add("away")'>transition me away</a>
-    <a href='#' class='animation' onclick='this.classList.add("away")'>animate me away</a>
+    <a href='#' class='animation' onclick='this.classList.add("away")' oncontextmenu='this.classList.add("pseudo")'>
+      animate me away
+    </a>
   </body>
 </html>
 

data/lib/capybara/spec/views/with_dragula.erb

@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_dragula</title>
+
+  </head>
+
+  <body id="with_dragula">
+    <div id="sortable">
+      <div class="item1">Item 1</div>
+      <div class="item2">Item 2</div>
+      <div class="item3">Item 3</div>
+      <div class="item4">Item 4</div>
+      <div class="item5">Item 5</div>
+    </div>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/dragula/3.7.2/dragula.js" type="text/javascript"></script>
+    <script>
+      dragula([document.getElementById("sortable")]);
+    </script>
+  </body>
+</html>
+

data/lib/capybara/spec/views/with_html.erb

@@ -138,6 +138,9 @@ banana</textarea>
       Ancestor
       <div id="child">Child</div>
     </div>
+    <div id="ancestor1_sibiling">
+      ASibling
+    </div>
   </div>
   <button id="ancestor_button" type="submit" disabled>
     <img id="button_img" width="20" height="20" alt="button img"/>

data/lib/capybara/spec/views/with_js.erb

@@ -28,7 +28,7 @@
     <div id="drag_html5" draggable="true">
       <p>This is an HTML5 draggable element.</p>
     </div>
-    <a id="drag_link_html5" href="#">This is an HTML5 draggable link</a>
+    <a id="drag_link_html5" href="#"><p>This is an HTML5 draggable link</p></a>
     <div id="drop_html5" class="drop">
       <p>It should be dropped here.</p>
     </div>

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.24.0'
+  VERSION = '3.25.0'
 end

data/spec/selenium_spec_edge.rb

@@ -6,8 +6,12 @@ require 'shared_selenium_session'
 require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
-Selenium::WebDriver::Edge::Service.driver_path = '/usr/local/bin/msedgedriver'
-Selenium::WebDriver::EdgeChrome.path = '/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary'
+unless ENV['CI']
+  Selenium::WebDriver::Edge::Service.driver_path = '/usr/local/bin/msedgedriver'
+  Selenium::WebDriver::EdgeChrome.path = '/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary'
+end
+
+Webdrivers::Edgedriver.required_version = '76.0.168' if ENV['CI']
 
 Capybara.register_driver :selenium_edge do |app|
   # ::Selenium::WebDriver.logger.level = "debug"

data/spec/selenium_spec_firefox.rb

@@ -57,7 +57,7 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
   when 'Capybara::Session selenium #attach_file with multipart form should fire change once when uploading multiple files from empty'
     pending "FF < 62 doesn't support setting all files at once" if firefox_lt?(62, @session)
   when 'Capybara::Session selenium #accept_confirm should work with nested modals'
-    skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session)
+    skip 'Broken in 63 <= FF < 69  - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session) && firefox_lt?(69, @session)
   when 'Capybara::Session selenium #click_link can download a file'
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
   when 'Capybara::Session selenium #reset_session! removes ALL cookies'

data/spec/shared_selenium_session.rb

@@ -355,11 +355,17 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
           expect(@animation_session).to have_no_link('transition me away', wait: 0.5)
         end
 
-        it 'should disable CSS animations' do
+        it 'should disable CSS animations (set to 0s)' do
           @animation_session.visit('with_animation')
           @animation_session.click_link('animate me away')
           expect(@animation_session).to have_no_link('animate me away', wait: 0.5)
         end
+
+        it 'should disable CSS animations on pseudo elements (set to 0s)' do
+          @animation_session.visit('with_animation')
+          @animation_session.find_link('animate me away').right_click
+          expect(@animation_session).to have_content('Animation Ended', wait: 0.1)
+        end
       end
 
       context 'if we pass in css that matches elements' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.24.0
+  version: 3.25.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -268,16 +268,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.72'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.72'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -516,6 +516,7 @@ files:
 - lib/capybara/selenium/driver_specializations/safari_driver.rb
 - lib/capybara/selenium/extensions/find.rb
 - lib/capybara/selenium/extensions/html5_drag.rb
+- lib/capybara/selenium/extensions/modifier_keys_stack.rb
 - lib/capybara/selenium/extensions/scroll.rb
 - lib/capybara/selenium/logger_suppressor.rb
 - lib/capybara/selenium/node.rb
@@ -541,6 +542,7 @@ files:
 - lib/capybara/spec/fixtures/test_file.txt
 - lib/capybara/spec/public/jquery-ui.js
 - lib/capybara/spec/public/jquery.js
+- lib/capybara/spec/public/offset.js
 - lib/capybara/spec/public/test.js
 - lib/capybara/spec/session/accept_alert_spec.rb
 - lib/capybara/spec/session/accept_confirm_spec.rb
@@ -646,6 +648,7 @@ files:
 - lib/capybara/spec/views/host_links.erb
 - lib/capybara/spec/views/initial_alert.erb
 - lib/capybara/spec/views/obscured.erb
+- lib/capybara/spec/views/offset.erb
 - lib/capybara/spec/views/path.erb
 - lib/capybara/spec/views/popup_one.erb
 - lib/capybara/spec/views/popup_two.erb
@@ -656,6 +659,7 @@ files:
 - lib/capybara/spec/views/with_animation.erb
 - lib/capybara/spec/views/with_base_tag.erb
 - lib/capybara/spec/views/with_count.erb
+- lib/capybara/spec/views/with_dragula.erb
 - lib/capybara/spec/views/with_fixed_header_footer.erb
 - lib/capybara/spec/views/with_hover.erb
 - lib/capybara/spec/views/with_hover1.erb