capybara 3.20.2 → 3.21.0

data/lib/capybara/node/finders.rb

@@ -8,19 +8,14 @@ module Capybara
       # Find an {Capybara::Node::Element} based on the given arguments. +find+ will raise an error if the element
       # is not found.
       #
-      # @!macro waiting_behavior
-      #   If the driver is capable of executing JavaScript, this method will wait for a set amount of time
-      #   and continuously retry finding the element until either the element is found or the time
-      #   expires. The length of time +find+ will wait is controlled through {Capybara.default_max_wait_time}
-      #   and defaults to 2 seconds.
-      #   @option options [false, true, Numeric] wait (Capybara.default_max_wait_time) Maximum time to wait for matching element to appear.
-      #
       #  page.find('#foo').find('.bar')
       #  page.find(:xpath, './/div[contains(., "bar")]')
       #  page.find('li', text: 'Quox').click_link('Delete')
       #
       # @param (see Capybara::Node::Finders#all)
       #
+      # @macro waiting_behavior
+      #
       # @!macro system_filters
       #   @option options [String, Regexp] text      Only find elements which contain this text or match this regexp
       #   @option options [String, Boolean] exact_text (Capybara.exact_text) When String the elements contained text must match exactly, when Boolean controls whether the :text option must match exactly

data/lib/capybara/selector/definition/css.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
 Capybara.add_selector(:css, locator_type: [String, Symbol], raw_locator: true) do
-  css { |css| css }
+  css do |css|
+    warn "DEPRECATED: Passing a symbol (#{css.inspect}) as the CSS locator is deprecated - please pass a string instead." if css.is_a? Symbol
+    css
+  end
 end

data/lib/capybara/selector/regexp_disassembler.rb

@@ -166,11 +166,11 @@ module Capybara
         end
 
         def min_repeat
-          @exp.quantifier&.min || 1
+          @exp.repetitions.begin
         end
 
         def max_repeat
-          @exp.quantifier&.max || 1
+          @exp.repetitions.end
         end
 
         def fixed_repeat?

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

@@ -22,6 +22,69 @@ class Capybara::Selenium::Node
       native.property('draggable')
     end
 
+    def html5_drop(*args)
+      if args[0].is_a? String
+        input = driver.evaluate_script ATTACH_FILE
+        input.set_file(args)
+        driver.execute_script DROP_FILE, self, input
+      else
+        items = args.each_with_object([]) do |arg, arr|
+          arg.each_with_object(arr) do |(type, data), arr_|
+            arr_ << { type: type, data: data }
+          end
+        end
+        driver.execute_script DROP_STRING, items, self
+      end
+    end
+
+    DROP_STRING = <<~JS
+      var strings = arguments[0],
+          el = arguments[1],
+          dt = new DataTransfer(),
+          opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+      for (var i=0; i < strings.length; i++){
+        if (dt.items) {
+          dt.items.add(strings[i]['data'], strings[i]['type']);
+        } else {
+          dt.setData(strings[i]['type'], strings[i]['data']);
+        }
+      }
+      var dropEvent = new DragEvent('drop', opts);
+      el.dispatchEvent(dropEvent);
+    JS
+
+    DROP_FILE = <<~JS
+      var el = arguments[0],
+          input = arguments[1],
+          files = input.files,
+          dt = new DataTransfer(),
+          opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+      input.parentElement.removeChild(input);
+      if (dt.items){
+        for (var i=0; i<files.length; i++){
+          dt.items.add(files[i]);
+        }
+      } else {
+        Object.defineProperty(dt, "files", {
+          value: files,
+          writable: false
+        });
+      }
+      var dropEvent = new DragEvent('drop', opts);
+      el.dispatchEvent(dropEvent);
+    JS
+
+    ATTACH_FILE = <<~JS
+      (function(){
+        var input = document.createElement('INPUT');
+        input.type = "file";
+        input.id = "_capybara_drop_file";
+        input.multiple = true;
+        document.body.appendChild(input);
+        return input;
+      })()
+    JS
+
     MOUSEDOWN_TRACKER = <<~JS
       document.addEventListener('mousedown', ev => {
         window.capybara_mousedown_prevented = ev.defaultPrevented;

data/lib/capybara/selenium/node.rb

@@ -137,6 +137,10 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     element.scroll_if_needed { browser_action.move_to(element.native).release.perform }
   end
 
+  def drop(*_)
+    raise NotImplementedError, 'Out of browser drop emulation is not implemented for the current browser'
+  end
+
   def tag_name
     @tag_name ||= native.tag_name.downcase
   end

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

@@ -34,6 +34,10 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
     html5_drag_to(element)
   end
 
+  def drop(*args)
+    html5_drop(*args)
+  end
+
   def click(*)
     super
   rescue ::Selenium::WebDriver::Error::WebDriverError => e

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

@@ -52,6 +52,10 @@ class Capybara::Selenium::FirefoxNode < Capybara::Selenium::Node
     html5_drag_to(element)
   end
 
+  def drop(*args)
+    html5_drop(*args)
+  end
+
   def hover
     return super unless browser_version >= 65.0
 
@@ -117,19 +121,6 @@ private
     driver.browser.capabilities[:browser_version].to_f
   end
 
-  DISABLED_BY_FIELDSET_XPATH = XPath.generate do |x|
-    x.parent(:fieldset)[
-      x.attr(:disabled)
-    ] + x.ancestor[
-      ~x.self(:legend) |
-      x.preceding_sibling(:legend)
-    ][
-      x.parent(:fieldset)[
-        x.attr(:disabled)
-      ]
-    ]
-  end.to_s.freeze
-
   class ModifierKeysStack
     def initialize
       @stack = []

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

@@ -4,8 +4,19 @@ require 'capybara/selenium/extensions/html5_drag'
 
 class Capybara::Selenium::IENode < Capybara::Selenium::Node
   def disabled?
-    # TODO: Doesn't work for a bunch of cases - need to get IE running to see if it can be done like this
-    # driver.evaluate_script("arguments[0].msMatchesSelector(':disabled, select:disabled *')", self)
-    super
+    # super
+    # optimize to one script call
+    driver.evaluate_script <<~JS.delete("\n"), self
+      arguments[0].msMatchesSelector('
+        :disabled,
+        select:disabled *,
+        optgroup:disabled *,
+        fieldset[disabled],
+        fieldset[disabled] > *:not(legend),
+        fieldset[disabled] > *:not(legend) *,
+        fieldset[disabled] > legend:nth-of-type(n+2),
+        fieldset[disabled] > legend:nth-of-type(n+2) *
+      ')
+    JS
   end
 end

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

@@ -91,19 +91,6 @@ private
     driver.browser.send(:bridge)
   end
 
-  DISABLED_BY_FIELDSET_XPATH = XPath.generate do |x|
-    x.parent(:fieldset)[
-      x.attr(:disabled)
-    ] + x.ancestor[
-      ~x.self(:legend) |
-      x.preceding_sibling(:legend)
-    ][
-      x.parent(:fieldset)[
-        x.attr(:disabled)
-      ]
-    ]
-  end.to_s.freeze
-
   def _send_keys(keys, actions = browser_action, down_keys = ModifierKeysStack.new)
     case keys
     when *MODIFIER_KEYS

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

@@ -18,7 +18,33 @@ $(function() {
   });
   $('#drop_html5, #drop_html5_scroll').on('drop', function(ev){
     ev.preventDefault();
-    $(this).html('HTML5 Dropped ' + ev.originalEvent.dataTransfer.getData("text"));
+    var oev = ev.originalEvent;
+    if (oev.dataTransfer.items) {
+      for (var i = 0; i < oev.dataTransfer.items.length; i++){
+        var item = oev.dataTransfer.items[i];
+        if (item.kind === 'file'){
+          var file = item.getAsFile();
+          $(this).append('HTML5 Dropped file: ' + file.name);
+        } else {
+          var _this = this;
+          var callback = (function(type){
+            return function(s){
+              $(_this).append('HTML5 Dropped string: ' + type + ' ' + s)
+            }
+          })(item.type);
+          item.getAsString(callback);
+        }
+      }
+    } else {
+      $(this).html('HTML5 Dropped ' + oev.dataTransfer.getData("text"));
+      for (var i = 0; i < oev.dataTransfer.files.length; i++) {
+        $(this).append('HTML5 Dropped file: ' + oev.dataTransfer.files[i].name);
+      }
+      for (var i = 0; i < oev.dataTransfer.types.length; i++) {
+        var type = oev.dataTransfer.types[i];
+        $(this).append('HTML5 Dropped string: ' + type + ' ' + oev.dataTransfer.getData(type));
+      }
+    }
   });
   $('#clickable').click(function(e) {
     var link = $(this);
@@ -180,7 +206,7 @@ $(function() {
     sessionStorage.setItem('session', 'session_value');
     localStorage.setItem('local', 'local value');
   });
-  $('#multiple-file').change(function(e){
-    $('body').append($('<p class="file_change"input_event_triggered">File input changed</p>'));
+  $('#multiple-file, #hidden_file').change(function(e){
+    $('body').append($('<p class="file_change">File input changed</p>'));
   })
 });

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

@@ -180,6 +180,12 @@ Capybara::SpecHelper.spec '#attach_file' do
       @session.attach_file('hidden_file', with_os_path_separators(__FILE__), make_visible: true)
       expect(@session.evaluate_script('arguments[0].style.display', @session.find(:css, '#hidden_file', visible: :all))).to eq 'none'
     end
+
+    it 'should fire change' do
+      @session.visit('/with_js')
+      @session.attach_file('hidden_file', with_os_path_separators(__FILE__), make_visible: true)
+      expect(@session).to have_css('.file_change')
+    end
   end
 
   context 'with a block', requires: %i[js] do
@@ -198,11 +204,13 @@ Capybara::SpecHelper.spec '#attach_file' do
       @session.click_button('awesome')
       expect(extract_results(@session)['hidden_image']).to end_with(File.basename(__FILE__))
     end
-  end
 
-private
-
-  def with_os_path_separators(path)
-    Gem.win_platform? ? path.to_s.tr('/', '\\') : path.to_s
+    it 'should fire change' do
+      @session.visit('/with_js')
+      @session.attach_file(with_os_path_separators(__FILE__)) do
+        @session.find(:label, 'Label for hidden file input').click
+      end
+      expect(@session).to have_css('.file_change')
+    end
   end
 end

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

@@ -10,10 +10,11 @@ Capybara::SpecHelper.spec '#has_css?' do
     expect(@session).to have_css('p a#foo')
   end
 
-  it 'should take a symbol as the selector' do
+  it 'should warn when passed a symbol' do
     # This was never a specifically accepted format but it has worked for a
-    # lot of versions. Probably should keep it until at least 4.0
-    # TODO: consider not supporting symbol for the CSS selector.
+    # lot of versions.
+    # TODO: Remove in 4.0
+    expect_any_instance_of(Kernel).to receive(:warn) # rubocop:disable RSpec/AnyInstance
     expect(@session).to have_css(:p)
   end
 

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

@@ -242,6 +242,10 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session.find('//div[@id="hidden_attr"]')).not_to be_visible
       expect(@session.find('//a[@id="hidden_attr_via_ancestor"]')).not_to be_visible
       expect(@session.find('//input[@id="hidden_input"]')).not_to be_visible
+    end
+
+    it 'template elements should not be visible' do
+      Capybara.ignore_hidden_elements = false
       expect(@session.find('//template')).not_to be_visible
     end
 
@@ -414,6 +418,87 @@ Capybara::SpecHelper.spec 'node' do
       link.drag_to target
       expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
     end
+
+    context 'HTML5', requires: %i[js html5_drag] do
+      it 'should HTML5 drag and drop an object' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]')
+        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"]')
+        target = @session.find('//div[@id="drop_html5"]')
+        element.drag_to(target)
+        expect(@session).to have_css('div.log', text: /DragOver with client position: [1-9]\d*,[1-9]\d*/, count: 2)
+      end
+
+      it 'should not HTML5 drag and drop on a non HTML5 drop element' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]')
+        target = @session.find('//div[@id="drop_html5"]')
+        target.execute_script("$(this).removeClass('drop');")
+        element.drag_to(target)
+        sleep 1
+        expect(@session).not_to have_xpath('//div[contains(., "HTML5 Dropped")]')
+      end
+
+      it 'should HTML5 drag and drop when scrolling needed' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5_scroll"]')
+        target = @session.find('//div[@id="drop_html5_scroll"]')
+        element.drag_to(target)
+        expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain drag_html5_scroll")]')
+      end
+
+      it 'should drag HTML5 default draggable elements' do
+        @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
+  end
+
+  describe 'Element#drop', requires: %i[js html5_drag] do
+    it 'can drop a file' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop(
+        with_os_path_separators(File.expand_path('../fixtures/capybara.jpg', File.dirname(__FILE__)))
+      )
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped file: capybara.jpg")]')
+    end
+
+    it 'can drop multiple files' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop(
+        with_os_path_separators(File.expand_path('../fixtures/capybara.jpg', File.dirname(__FILE__))),
+        with_os_path_separators(File.expand_path('../fixtures/test_file.txt', File.dirname(__FILE__)))
+      )
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped file: capybara.jpg")]')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped file: test_file.txt")]')
+    end
+
+    it 'can drop strings' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop('text/plain' => 'Some dropped text')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain Some dropped text")]')
+    end
+
+    it 'can drop multiple strings' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop('text/plain' => 'Some dropped text', 'text/url' => 'http://www.google.com')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain Some dropped text")]')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/url http://www.google.com")]')
+    end
   end
 
   describe '#hover', requires: [:hover] do

data/lib/capybara/spec/spec_helper.rb

@@ -124,6 +124,10 @@ module Capybara
     def be_an_invalid_element_error(session)
       satisfy { |error| session.driver.invalid_element_errors.any? { |e| error.is_a? e } }
     end
+
+    def with_os_path_separators(path)
+      Gem.win_platform? ? path.to_s.tr('/', '\\') : path.to_s
+    end
   end
 end
 

data/lib/capybara/version.rb

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

data/spec/selenium_spec_firefox.rb

@@ -64,6 +64,8 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
     pending "Geckodriver doesn't provide a way to remove cookies outside the current domain"
   when 'Capybara::Session selenium #attach_file with a block can upload by clicking the file input'
     pending "Geckodriver doesn't allow clicking on file inputs"
+  when /drag_to.*HTML5/
+    pending "Firefox < 62 doesn't support a DataTransfer constuctor" if firefox_lt?(62.0, @session)
   end
 end
 

data/spec/selenium_spec_ie.rb

@@ -6,13 +6,13 @@ require 'shared_selenium_session'
 require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
-if ENV['CI']
-  if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-    ::Selenium::WebDriver::IE::Service
-  else
-    ::Selenium::WebDriver::IE
-  end.driver_path = 'C:\Tools\WebDriver\IEDriverServer.exe'
-end
+# if ENV['CI']
+#   if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+#     ::Selenium::WebDriver::IE::Service
+#   else
+#     ::Selenium::WebDriver::IE
+#   end.driver_path = 'C:\Tools\WebDriver\IEDriverServer.exe'
+# end
 
 def selenium_host
   ENV.fetch('SELENIUM_HOST', '192.168.56.102')
@@ -110,6 +110,12 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_sk
     pending 'IE treats blank href as a parent request (against HTML spec)'
   when /#attach_file with a block/
     skip 'Hangs IE testing for unknown reason'
+  when /drag_to.*HTML5/
+    pending "IE doesn't support a DataTransfer constuctor"
+  when /template elements should not be visible/
+    skip "IE doesn't support template elements"
+  when /Element#drop/
+    pending "IE doesn't support DataTransfer constructor"
   end
 end