capybara 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff4996d8188f7398e7998aa1295fca9e92ece2bee9a2d662a77ab66a182d7884
-  data.tar.gz: 05f243132820c10cf6c6e49a032cbebb390d270c88655d4410d79c827cca7467
+  metadata.gz: 69837ab6d5097f6be64bc1010b230653cce9bdd318634c6efb19903a4cbb1f34
+  data.tar.gz: 6db7692bb7609c9d2ae488eb10dd3472c32071a473a0524e87265afe3a03ac6d
 SHA512:
-  metadata.gz: eabe1a0080dea2a6cdce45eb65707ebd1696f6fca805eec2e1cad1cbbb3aed9f2a87f61e072401968845778607a50f14bcf36231827cbcacc0d88fe6785021f1
-  data.tar.gz: 716a3b11ad853a8d0440cfb21a1e7c0975f9cbcb409dcc2daac92bbbd71b6f47f8d1312fed4881fe49ce312c8093ec3cc55d12080f78ca75ba7c9514f67ba565
+  metadata.gz: 4088bda8abff78614b6b93e61bd3e239e2e9de857ce34fe104d62a195cacf66f8512da44a26f1646aee9a4114e5d3f2eca6ebc4d54b8fc5ed3362b845e15f6b9
+  data.tar.gz: 2194129a44a0b636d09b1ae36639ebf893bb8816f3de6361b938f2ac281e8d2ecc045d9d862545df90d5b8827082f066fa0aef324b0a5b598f780b975a268da2

data/History.md

@@ -1,3 +1,12 @@
+# Version 3.7.2
+Release date: 2018-09-12
+
+### Fixed
+
+* Fix MatchQuery based matchers when used on a root element found using any type of parent/ancestor query - Issue #2097
+
+* Fix Chrome/FF HTML5 drag simulation for elements (a, img) which default to draggable - Issue #2098
+
 # Version 3.7.1
 Release date: 2018-09-05
 

data/lib/capybara/node/matchers.rb

@@ -713,7 +713,7 @@ module Capybara
         query_args = _set_query_session_options(*query_args)
         query = Capybara::Queries::MatchQuery.new(*query_args, &optional_filter_block)
         synchronize(query.wait) do
-          yield query.resolve_for(first(:xpath, './parent::*', minimum: 0) || query_scope)
+          yield query.resolve_for(first(:xpath, './parent::*', minimum: 0) || session&.document || query_scope)
         end
         true
       end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class Capybara::Selenium::Node
+  module Html5Drag
+  private
+
+    def html5_drag_to(element)
+      driver.execute_script MOUSEDOWN_TRACKER
+      scroll_if_needed { browser_action.click_and_hold(native).perform }
+      if driver.evaluate_script('window.capybara_mousedown_prevented')
+        element.scroll_if_needed { browser_action.move_to(element.native).release.perform }
+      else
+        driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
+      end
+    end
+
+    def draggable?
+      # Workaround https://github.com/SeleniumHQ/selenium/issues/6396
+      driver.evaluate_script('arguments[0]["draggable"]', self) == true
+    end
+
+    MOUSEDOWN_TRACKER = <<~JS
+      if (!window.hasOwnProperty('capybara_mousedown_prevented')){
+        document.addEventListener('mousedown', function(ev){
+          window.capybara_mousedown_prevented = ev.defaultPrevented;
+        })
+      }
+    JS
+
+    HTML5_DRAG_DROP_SCRIPT = <<~JS
+      var source = arguments[0];
+      var target = arguments[1];
+
+      var dt = new DataTransfer();
+      var opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+
+      if (source.tagName == 'A'){
+        dt.setData('text/uri-list', source.href);
+        dt.setData('text', source.href);
+      }
+      if (source.tagName == 'IMG'){
+        dt.setData('text/uri-list', source.src);
+        dt.setData('text', source.src);
+      }
+      var dragEvent = new DragEvent('dragstart', opts);
+      source.dispatchEvent(dragEvent);
+      target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
+      var dragOverEvent = new DragEvent('dragover', opts);
+      target.dispatchEvent(dragOverEvent);
+      var dragLeaveEvent = new DragEvent('dragleave', opts);
+      target.dispatchEvent(dragLeaveEvent);
+      if (dragOverEvent.defaultPrevented) {
+        var dropEvent = new DragEvent('drop', opts);
+        target.dispatchEvent(dropEvent);
+      }
+      var dragEndEvent = new DragEvent('dragend', opts);
+      source.dispatchEvent(dragEndEvent);
+    JS
+  end
+end

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

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
+require 'capybara/selenium/extensions/html5_drag'
+
 class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
+  include Html5Drag
+
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
     super(value)
   rescue ::Selenium::WebDriver::Error::ExpectedError => err
@@ -11,10 +15,8 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
   end
 
   def drag_to(element)
-    return super unless self[:draggable] == 'true'
-
-    scroll_if_needed { browser_action.click_and_hold(native).perform }
-    driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
+    return super unless draggable?
+    html5_drag_to(element)
   end
 
 private
@@ -22,26 +24,4 @@ private
   def bridge
     driver.browser.send(:bridge)
   end
-
-  HTML5_DRAG_DROP_SCRIPT = <<~JS
-    var source = arguments[0];
-    var target = arguments[1];
-
-    var dt = new DataTransfer();
-    var opts = { cancelable: true, bubbles: true, dataTransfer: dt };
-
-    var dragEvent = new DragEvent('dragstart', opts);
-    source.dispatchEvent(dragEvent);
-    target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
-    var dragOverEvent = new DragEvent('dragover', opts);
-    target.dispatchEvent(dragOverEvent);
-    var dragLeaveEvent = new DragEvent('dragleave', opts);
-    target.dispatchEvent(dragLeaveEvent);
-    if (dragOverEvent.defaultPrevented) {
-      var dropEvent = new DragEvent('drop', opts);
-      target.dispatchEvent(dropEvent);
-    }
-    var dragEndEvent = new DragEvent('dragend', opts);
-    source.dispatchEvent(dragEndEvent);
-  JS
 end

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

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
+require 'capybara/selenium/extensions/html5_drag'
 
 class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
+  include Html5Drag
+
   def click(keys = [], **options)
     super
   rescue ::Selenium::WebDriver::Error::ElementNotInteractableError
@@ -54,10 +57,8 @@ class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
   end
 
   def drag_to(element)
-    return super unless (browser_version >= 62.0) && (self[:draggable] == 'true')
-
-    scroll_if_needed { browser_action.click_and_hold(native).perform }
-    driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
+    return super unless (browser_version >= 62.0) && draggable?
+    html5_drag_to(element)
   end
 
 private
@@ -116,26 +117,4 @@ private
   def browser_version
     driver.browser.capabilities[:browser_version].to_f
   end
-
-  HTML5_DRAG_DROP_SCRIPT = <<~JS
-    var source = arguments[0];
-    var target = arguments[1];
-
-    var dt = new DataTransfer();
-    var opts = { cancelable: true, bubbles: true, dataTransfer: dt };
-
-    var dragEvent = new DragEvent('dragstart', opts);
-    source.dispatchEvent(dragEvent);
-    target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
-    var dragOverEvent = new DragEvent('dragover', opts);
-    target.dispatchEvent(dragOverEvent);
-    var dragLeaveEvent = new DragEvent('dragleave', opts);
-    target.dispatchEvent(dragLeaveEvent);
-    if (dragOverEvent.defaultPrevented) {
-      var dropEvent = new DragEvent('drop', opts);
-      target.dispatchEvent(dropEvent);
-    }
-    var dragEndEvent = new DragEvent('dragend', opts);
-    source.dispatchEvent(dragEndEvent);
-  JS
 end

data/lib/capybara/session.rb

@@ -364,7 +364,7 @@ module Capybara
     # @overload switch_to_frame(element)
     #   @param [Capybara::Node::Element]  iframe/frame element to switch to
     # @overload switch_to_frame(:parent)
-    #   Switch to the parent element
+    #   Switch to the parent frame
     # @overload switch_to_frame(:top)
     #   Switch to the top level document
     #

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

@@ -1,7 +1,7 @@
 var activeRequests = 0;
 $(function() {
   $('#change').text('I changed it');
-  $('#drag, #drag_scroll').draggable();
+  $('#drag, #drag_scroll, #drag_link').draggable();
   $('#drop, #drop_scroll').droppable({
     drop: function(event, ui) {
       ui.draggable.remove();

data/lib/capybara/spec/session/element/match_css_spec.rb

@@ -22,4 +22,10 @@ Capybara::SpecHelper.spec '#match_css?' do
     expect(@element).to match_css('span') { |el| el[:class] == 'number' }
     expect(@element).not_to match_css('span') { |el| el[:class] == 'not_number' }
   end
+
+  it 'should work with root element found via ancestor' do
+    el = @session.find(:css, 'body').find(:xpath, '..')
+    expect(el).to match_css('html')
+    expect { expect(el).to not_match_css('html') }.to raise_exception(RSpec::Expectations::ExpectationNotMetError)
+  end
 end

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

@@ -316,6 +316,14 @@ Capybara::SpecHelper.spec 'node' do
       element.drag_to(target)
       expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
     end
+
+    it 'should drag a link' do
+      @session.visit('/with_js')
+      link = @session.find_link('drag_link')
+      target = @session.find(:id, 'drop')
+      link.drag_to target
+      expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
+    end
   end
 
   describe '#hover', requires: [:hover] do

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

@@ -12,6 +12,7 @@
     <h1>FooBar</h1>
 
     <p id="change">This is text</p>
+    <a id="drag_link" href='#'>This link is non-HTML5 draggable</a>
     <div id="drag">
       <p>This is a draggable element.</p>
     </div>
@@ -27,6 +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>
     <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.7.1'
+  VERSION = '3.7.2'
 end

data/spec/shared_selenium_session.rb

@@ -313,6 +313,15 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         element.drag_to(target)
         expect(session).to have_xpath('//div[contains(., "HTML5 Dropped drag_html5_scroll")]')
       end
+
+      it 'should drag HTML5 default draggable elements' do
+        pending "Firefox < 62 doesn't support a DataTransfer constuctor" if marionette_lt?(62.0, session)
+        session.visit('/with_js')
+        link = session.find_link('drag_link_html5')
+        target = session.find(:id, 'drop_html5')
+        link.drag_to target
+        expect(session).to have_xpath('//div[contains(., "HTML5 Dropped")]')
+      end
     end
 
     context 'Windows' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -311,6 +311,7 @@ files:
 - lib/capybara/selenium/driver.rb
 - lib/capybara/selenium/driver_specializations/chrome_driver.rb
 - lib/capybara/selenium/driver_specializations/marionette_driver.rb
+- lib/capybara/selenium/extensions/html5_drag.rb
 - lib/capybara/selenium/node.rb
 - lib/capybara/selenium/nodes/chrome_node.rb
 - lib/capybara/selenium/nodes/marionette_node.rb