cuprite 0.15.1 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b7dde58d02147e2985473da0a7527d338ff086e4a4aaf0fd9302e5faf3ee11
-  data.tar.gz: 777726c6161975950df923a305b0bdb9da54b5531b7a5339ed0d4beaf264beb6
+  metadata.gz: ed2641aa002e810fd4dfedc8b3128f38e5f2df0f747d59bc1cf7a81aa1295076
+  data.tar.gz: 7e967cb1a6a11ad9f446290cd5035d2d5d3e9c6724ba6f4df4c31e761b29545d
 SHA512:
-  metadata.gz: 04e88a47d9d2d2df68ad11dca8224f6d24001340b1743f538e6fdb64e818381037da7987b9db25284336b469c986d9d9e883192743749c4c6cad6c43adc160a1
-  data.tar.gz: a059dae9790af13c8a56999d6d76d5920e863e217b346a721a4051f0cc786e295a35c0e574c00e425b87e2d0c7a8b140c991183ab3246d1678566318745c9ecf
+  metadata.gz: dcee409e8ee24caf139c3a0c29318ccea5ddefb0759f228f0f24db76aef28864c73d46e02ecc820160e82d6f366c61648ad1dc20dd930b5d9f300c8853d17003
+  data.tar.gz: 5168b1c18e81936795a02154829100dc3a616c2d2c3db71c134c8e64f5f13d93fd1098e8c26aea8d84a26840bf547a80b263b63b293420dc9f18cc18a5d29632

data/README.md

@@ -27,12 +27,27 @@ Capybara.register_driver(:cuprite) do |app|
 end
 ```
 
-if you use `Docker` don't forget to pass `no-sandbox` option:
+If Chrome or Chromium cannot use its sandbox inside a container—for example,
+because it runs as `root`—enable Ferrum's container mode:
 
 ```ruby
-Capybara::Cuprite::Driver.new(app, browser_options: { 'no-sandbox': nil })
+Capybara::Cuprite::Driver.new(app, dockerize: true)
 ```
 
+The `dockerize` option requires Ferrum 0.17.2 or newer. With an older Ferrum
+version, pass the browser option explicitly:
+
+```ruby
+Capybara::Cuprite::Driver.new(
+  app,
+  browser_options: { "no-sandbox" => nil }
+)
+```
+
+Both approaches disable the browser's sandbox, so do not use them merely
+because Docker is involved. Prefer running the browser as a non-root user with
+a working sandbox when possible.
+
 Since Cuprite uses [Ferrum](https://github.com/rubycdp/ferrum#examples) there
 are many useful methods you can call even using this driver:
 
@@ -61,24 +76,20 @@ end
 `Cuprite`-specific options are:
 
 * options `Hash`
+  * `:raise_on_unhandled_modal` (Boolean) - When set to `false`, output a warning. When set to `true`, raise
+    `Capybara::Cuprite::UnhandledModalError` instead. The dialog is always auto-accepted either way; the raise is
+    deferred and surfaces on the next command sent to the browser. In practice that's almost always the same action
+    that triggered the dialog (a click, `visit`, `evaluate_script`, ...), since a JS dialog blocks the page until
+    answered, so that action's own command is what was waiting. A dialog fired with nothing in flight (e.g. a bare JS
+    timer) only surfaces on whatever command runs next.
   * `:url_blacklist` (Array) - array of regexes to match against requested URLs
   * `:url_whitelist` (Array) - array of regexes to match against requested URLs
 
 
 ## Debugging
 
-If you pass `inspector` option, remote debugging will be enabled if you run
-tests with `INSPECTOR=true`. Then you can put `page.driver.debug` or
-`page.driver.debug(binding)` in your test to pause it. This will launch the
-browser where you can inspect the content.
-
-```ruby
-Capybara.register_driver :cuprite do |app|
-  Capybara::Cuprite::Driver.new(app, inspector: ENV['INSPECTOR'])
-end
-```
-
-then somewhere in the test:
+You can put `page.driver.debug` or `page.driver.debug(binding)` in your test to pause it.
+This will launch the browser where you can inspect the content.
 
 ```ruby
 it "does something useful" do
@@ -122,13 +133,17 @@ be automatically cleared at the end of the test.
 
 ## Network traffic
 
-* `page.driver.network_traffic` Inspect network traffic (loaded resources) on
-the current page. This returns an array of request objects.
+* `page.driver.network_traffic` allows you to inspect network traffic (i.e., loaded resources) on the current page. It returns an array of `Ferrum::Network::Exchange` objects, each representing a network request/response exchange. You can query both the request and response details of each exchange.
 
 ```ruby
-page.driver.network_traffic # => [Request, ...]
-request = page.driver.network_traffic.first
-request.response
+# Retrieve all network exchanges
+network_traffic = page.driver.network_traffic
+
+# Access the first exchange
+first_exchange = network_traffic.first
+
+# Inspect the response of the first request
+response = first_exchange.response
 ```
 
 * `page.driver.wait_for_network_idle` Natively waits for network idle and if
@@ -183,27 +198,29 @@ Besides capybara screenshot method you can get image as Base64:
 
 ## Proxy
 
-* `page.driver.set_proxy(ip, port, type, user, password)`
+* `page.driver.set_proxy(ip, port, user, password)`
 
 
-## URL Blacklisting & Whitelisting
+## URL Blocklisting & Allowlisting
 
-Cuprite supports URL blacklisting, which allows you to prevent scripts from
+Cuprite supports URL blocklisting, which allows you to prevent scripts from
 running on designated domains:
 
 ```ruby
-page.driver.browser.url_blacklist = %r{http://www.example.com}
+page.driver.browser.url_blocklist = %r{http://www.example.com}
 ```
 
-and also URL whitelisting, which allows scripts to only run on designated
+and also URL allowlisting, which allows scripts to only run on designated
 domains:
 
 ```ruby
-page.driver.browser.url_whitelist = %r{http://www.example.com}
+page.driver.browser.url_allowlist = %r{http://www.example.com}
 ```
 
-If you are experiencing slower run times, consider creating a URL whitelist of
-domains that are essential or a blacklist of domains that are not essential,
+For legacy support, `url_blacklist=` and `url_whitelist=` continue to work respectively.
+
+If you are experiencing slower run times, consider creating a URL allowlist of
+domains that are essential or a blocklist of domains that are not essential,
 such as ad networks or analytics, to your testing environment.
 
 ## License

data/lib/capybara/cuprite/browser.rb

@@ -7,6 +7,8 @@ module Capybara
     class Browser < Ferrum::Browser
       extend Forwardable
 
+      DRAG_HTML5_JS = File.read(File.expand_path("javascripts/drag.js", __dir__))
+
       delegate %i[send_keys select set hover trigger before_click switch_to_frame
                   find_modal accept_confirm dismiss_confirm accept_prompt
                   dismiss_prompt reset_modals] => :page
@@ -14,6 +16,7 @@ module Capybara
       def initialize(options = nil)
         super
 
+        @options.raise_on_unhandled_modal = options&.dig(:raise_on_unhandled_modal)
         @options.url_blacklist = prepare_wildcards(options&.dig(:url_blacklist))
         @options.url_whitelist = prepare_wildcards(options&.dig(:url_whitelist))
 
@@ -49,6 +52,14 @@ module Capybara
         super
       end
 
+      def raise_on_unhandled_modal
+        @options.raise_on_unhandled_modal
+      end
+
+      def raise_on_unhandled_modal=(value)
+        @options.raise_on_unhandled_modal = value
+      end
+
       def url_whitelist
         @options.url_whitelist
       end
@@ -116,6 +127,7 @@ module Capybara
         raise Ferrum::NoSuchPageError unless target
 
         @page = attach_page(target.id)
+        @page.activate
       end
 
       def close_window(target_id)
@@ -139,29 +151,69 @@ module Capybara
         raise NotImplementedError
       end
 
-      def drag(node, other, steps, delay = nil)
+      def drag(node, other, drop_modifiers, options = {})
+        steps = options.fetch(:steps, 1)
+        delay = options[:delay]
+        scroll = options.fetch(:scroll, true)
+        html5 = options[:html5]
+
+        execute("_cuprite.dragMousedownTracker()")
+
+        node.scroll_into_view if scroll
         x1, y1 = node.find_position
-        x2, y2 = other.find_position
 
         mouse.move(x: x1, y: y1)
         mouse.down
         sleep delay if delay
-        mouse.move(x: x2, y: y2, steps: steps)
+
+        html5 = !evaluate_on(node: node, expression: "_cuprite.legacyDragCheck(this)") if html5.nil?
+
+        if html5
+          drag_html5(node, other, drop_modifiers, delay)
+        else
+          modifiers = keyboard.modifiers(drop_modifiers)
+
+          other.scroll_into_view if scroll
+          x2, y2 = other.find_position
+          mouse.move(x: x2, y: y2, steps: steps)
+
+          mouse.up(modifiers: modifiers)
+        end
+      end
+
+      def drag_html5(node, other, drop_modifiers, delay)
+        keys = drop_modifiers.map(&:to_s)
+        evaluate_async(DRAG_HTML5_JS, timeout, node, other, (delay || 0.05) * 1000, keys)
         mouse.up
       end
 
-      def drag_by(node, x, y, steps, delay = nil)
+      def drag_by(node, dx, dy, steps, delay = nil, scroll = true)
         x1, y1 = node.find_position
-        x2 = x1 + x
-        y2 = y1 + y
 
         mouse.move(x: x1, y: y1)
         mouse.down
+
         sleep delay if delay
-        mouse.move(x: x2, y: y2, steps: steps)
+
+        evaluate("window.scrollBy(#{dx}, #{dy})") if scroll # should be extracted to Mouse#scroll_by in ferrum
+
+        x2, y2 = node.find_position
+        mouse.move(x: x2 + dx, y: y2 + dy, steps: steps)
         mouse.up
       end
 
+      def drop(node, *args)
+        if args[0].is_a?(String)
+          execute("_cuprite.attachDropInput()")
+          input = find(:css, "#_cuprite_drop_file").first
+          select_file(input, args)
+          evaluate_on(node: node, expression: "_cuprite.dropFile(this)")
+        else
+          strings = args.flat_map { |arg| arg.map { |type, data| { "type" => type, "data" => data } } }
+          evaluate_on(node: node, expression: "_cuprite.dropString(#{strings.to_json}, this)")
+        end
+      end
+
       def select_file(node, value)
         node.select_file(value)
       end
@@ -203,6 +255,10 @@ module Capybara
         evaluate_on(node: node, expression: "_cuprite.path(this)")
       end
 
+      def obscured?(node)
+        evaluate_on(node: node, expression: "_cuprite.isObscured(this)")
+      end
+
       def all_text(node)
         node.text
       end

data/lib/capybara/cuprite/cookie.rb

@@ -40,7 +40,7 @@ module Capybara
       end
 
       def expires
-        Time.at(@attributes["expires"]) if (@attributes["expires"]).positive?
+        Time.at(@attributes["expires"]) if @attributes["expires"].positive?
       end
     end
   end

data/lib/capybara/cuprite/driver.rb

@@ -3,7 +3,7 @@
 require "uri"
 require "forwardable"
 
-# rubocop:disable Metrics/ClassLength
+# rubocop:disable-next Metrics/ClassLength
 module Capybara
   module Cuprite
     class Driver < Capybara::Driver::Base
@@ -35,6 +35,8 @@ module Capybara
         @screen_size ||= DEFAULT_MAXIMIZE_SCREEN_SIZE
         @options[:save_path] ||= File.expand_path(Capybara.save_path) if Capybara.save_path
 
+        @options[:pending_connection_errors] = true unless @options.key?(:pending_connection_errors)
+
         # It's set for debug() to make devtools tab open correctly.
         @options[:browser_options] ||= {}
         unless @options[:browser_options][:"remote-allow-origins"]
@@ -108,10 +110,14 @@ module Capybara
         handle = case locator
                  when Capybara::Node::Element
                    locator.native.description["frameId"]
+                 when Capybara::Cuprite::Node
+                   locator.description["frameId"]
                  when :parent, :top
                    locator
                  end
 
+        raise ArgumentError, "Unable to switch to frame from #{locator.class}" unless handle
+
         browser.switch_to_frame(handle)
       end
 
@@ -131,6 +137,7 @@ module Capybara
         @paper_size = nil
         browser.url_blacklist = @options[:url_blacklist]
         browser.url_whitelist = @options[:url_whitelist]
+        browser.raise_on_unhandled_modal = @options.fetch(:raise_on_unhandled_modal, false)
         browser.reset
         @started = false
       end
@@ -251,7 +258,8 @@ module Capybara
 
       def remove_cookie(name, **options)
         options[:domain] = default_domain if options.empty?
-        browser.cookies.remove(**options.merge(name: name))
+        options = options.merge(name: name)
+        browser.cookies.remove(**options)
       end
 
       def clear_cookies
@@ -273,32 +281,8 @@ module Capybara
       end
       alias authorize basic_authorize
 
-      def debug_url
-        response = JSON.parse(Net::HTTP.get(URI(build_remote_debug_url(path: "/json"))))
-
-        devtools_frontend_path = response[0]&.[]("devtoolsFrontendUrl")
-        raise "Could not generate debug url for remote debugging session" unless devtools_frontend_path
-
-        build_remote_debug_url(path: devtools_frontend_path)
-      end
-
-      def debug(binding = nil)
-        if @options[:inspector]
-          Process.spawn(browser.process.path, debug_url)
-
-          if binding.respond_to?(:pry)
-            Pry.start(binding)
-          elsif binding.respond_to?(:irb)
-            binding.irb
-          else
-            pause
-          end
-        else
-          raise Error, "To use the remote debugging, you have to launch " \
-                       "the driver with `inspector: ENV['INSPECTOR']` " \
-                       "configuration option and run your test suite passing " \
-                       "env variable"
-        end
+      def debug(...)
+        browser.debug(...)
       end
 
       def pause
@@ -377,10 +361,6 @@ module Capybara
 
       private
 
-      def build_remote_debug_url(path:)
-        "http://#{browser.process.host}:#{browser.process.port}#{path}"
-      end
-
       def default_domain
         if @started
           URI.parse(browser.current_url).host
@@ -433,4 +413,3 @@ module Capybara
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/capybara/cuprite/errors.rb

@@ -43,6 +43,15 @@ module Capybara
       end
     end
 
+    class UnhandledModalError < Error
+      attr_reader :message
+
+      def initialize(message)
+        @message = message
+        super()
+      end
+    end
+
     class ObsoleteNode < ClientError
       attr_reader :node
 

data/lib/capybara/cuprite/javascripts/drag.js

@@ -0,0 +1,118 @@
+// HTML5 drag-and-drop emulation.
+//
+// Ported near-verbatim from Capybara's Selenium driver
+// (capybara/selenium/extensions/html5_drag.rb, HTML5_DRAG_DROP_SCRIPT) so
+// Cuprite matches Capybara's HTML5 drag behaviour and its shared specs. Kept
+// close to the source to ease future syncs; known upstream quirks (rectPt.top
+// in pointOnRect, undeclared `key`, callback.call(true)) are preserved
+// deliberately. See https://github.com/rubycdp/cuprite/issues/314.
+
+function rectCenter(rect){
+  return new DOMPoint(
+    (rect.left + rect.right)/2,
+    (rect.top + rect.bottom)/2
+  );
+}
+
+function pointOnRect(pt, rect) {
+  var rectPt = rectCenter(rect);
+  var slope = (rectPt.y - pt.y) / (rectPt.x - pt.x);
+
+  if (pt.x <= rectPt.x) { // left side
+    var minXy = slope * (rect.left - pt.x) + pt.y;
+    if (rect.top <= minXy && minXy <= rect.bottom)
+      return new DOMPoint(rect.left, minXy);
+  }
+
+  if (pt.x >= rectPt.x) { // right side
+    var maxXy = slope * (rect.right - pt.x) + pt.y;
+    if (rect.top <= maxXy && maxXy <= rect.bottom)
+      return new DOMPoint(rect.right, maxXy);
+  }
+
+  if (pt.y <= rectPt.y) { // top side
+    var minYx = (rectPt.top - pt.y) / slope + pt.x;
+    if (rect.left <= minYx && minYx <= rect.right)
+      return new DOMPoint(minYx, rect.top);
+  }
+
+  if (pt.y >= rectPt.y) { // bottom side
+    var maxYx = (rect.bottom - pt.y) / slope + pt.x;
+    if (rect.left <= maxYx && maxYx <= rect.right)
+      return new DOMPoint(maxYx, rect.bottom);
+  }
+
+  return new DOMPoint(pt.x,pt.y);
+}
+
+function dragEnterTarget() {
+  target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
+  var targetRect = target.getBoundingClientRect();
+  var sourceCenter = rectCenter(source.getBoundingClientRect());
+
+  for (var i = 0; i < drop_modifier_keys.length; i++) {
+    key = drop_modifier_keys[i];
+    if (key == "control"){
+      key = "ctrl"
+    }
+    opts[key + 'Key'] = true;
+  }
+
+  var dragEnterEvent = new DragEvent('dragenter', opts);
+  target.dispatchEvent(dragEnterEvent);
+
+  // fire 2 dragover events to simulate dragging with a direction
+  var entryPoint = pointOnRect(sourceCenter, targetRect)
+  var dragOverOpts = Object.assign({clientX: entryPoint.x, clientY: entryPoint.y}, opts);
+  var dragOverEvent = new DragEvent('dragover', dragOverOpts);
+  target.dispatchEvent(dragOverEvent);
+  window.setTimeout(dragOnTarget, step_delay);
+}
+
+function dragOnTarget() {
+  var targetCenter = rectCenter(target.getBoundingClientRect());
+  var dragOverOpts = Object.assign({clientX: targetCenter.x, clientY: targetCenter.y}, opts);
+  var dragOverEvent = new DragEvent('dragover', dragOverOpts);
+  target.dispatchEvent(dragOverEvent);
+  window.setTimeout(dragLeave, step_delay, dragOverEvent.defaultPrevented, dragOverOpts);
+}
+
+function dragLeave(drop, dragOverOpts) {
+  var dragLeaveOptions = Object.assign({}, opts, dragOverOpts);
+  var dragLeaveEvent = new DragEvent('dragleave', dragLeaveOptions);
+  target.dispatchEvent(dragLeaveEvent);
+  if (drop) {
+    var dropEvent = new DragEvent('drop', dragLeaveOptions);
+    target.dispatchEvent(dropEvent);
+  }
+  var dragEndEvent = new DragEvent('dragend', dragLeaveOptions);
+  source.dispatchEvent(dragEndEvent);
+  callback.call(true);
+}
+
+var source = arguments[0],
+    target = arguments[1],
+    step_delay = arguments[2],
+    drop_modifier_keys = arguments[3],
+    callback = arguments[4];
+
+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);
+}
+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);
+
+window.setTimeout(dragEnterTarget, step_delay);

data/lib/capybara/cuprite/javascripts/index.js

@@ -52,13 +52,17 @@ class Cuprite {
     if (this.isVisible(node)) {
       if (node.nodeName == "TEXTAREA") {
         return node.textContent;
-      } else {
-        if (node instanceof SVGElement) {
-          return node.textContent;
-        } else {
-          return node.innerText;
-        }
       }
+      if (node instanceof SVGElement) {
+        return node.textContent;
+      }
+      if (node instanceof ShadowRoot) {
+        return Array.from(node.children)
+          .map(child => this.visibleText(child))
+          .filter(text => text)
+          .join(" ");
+      }
+      return node.innerText;
     }
   }
 
@@ -74,11 +78,24 @@ class Cuprite {
     }
 
     while (node) {
-      style = window.getComputedStyle(node);
-      if (style.display === "none" || style.visibility === "hidden" || parseFloat(style.opacity) === 0) {
-        return false;
+      if (node instanceof ShadowRoot) {
+        node = node.host;
+      } else {
+        style = window.getComputedStyle(node);
+        if (style.display === "none" || style.visibility === "hidden" || parseFloat(style.opacity) === 0) {
+          return false;
+        }
+
+        let parent = node.parentElement;
+        if (parent && parent.tagName === "DETAILS" && !parent.open) {
+          // In a closed <details> only the first <summary> (and its subtree) is rendered.
+          if (node !== parent.querySelector(":scope > summary")) {
+            return false;
+          }
+        }
+
+        node = parent ?? (node.getRootNode() instanceof ShadowRoot && node.getRootNode());
       }
-      node = node.parentElement;
     }
 
     return true;
@@ -94,6 +111,10 @@ class Cuprite {
   }
 
   path(node) {
+    if (node.getRootNode && node.getRootNode() instanceof ShadowRoot) {
+      return "(: Shadow DOM element - no XPath :)";
+    };
+
     let nodes = [node];
     let parent = node.parentNode;
     while (parent !== document && parent !== null) {
@@ -115,6 +136,35 @@ class Cuprite {
     return `//${selectors.join("/")}`;
   }
 
+  /**
+   * Returns true if the node is obscured in the viewport.
+   *
+   * @param {Element} node
+   * @return {boolean} true if the node is obscured, false otherwise
+   */
+  isObscured(node) {
+    let win = window;
+    let rect = node.getBoundingClientRect();
+    let px = rect.left + rect.width / 2;
+    let py = rect.top + rect.height / 2;
+
+    while (win) {
+      let topNode = win.document.elementFromPoint(px, py);
+
+      if (node !== topNode && !node.contains(topNode)) return true;
+
+      node = win.frameElement;
+      if (!node) return false;
+
+      rect = node.getBoundingClientRect();
+      px = rect.left + px;
+      py = rect.top + py;
+      win = win.parent;
+    }
+
+    return false;
+  }
+
   set(node, value) {
     if (node.readOnly) return;
 
@@ -124,15 +174,13 @@ class Cuprite {
 
     let valueBefore = node.value;
 
+    node.focus();
     this.trigger(node, "focus");
     this.setValue(node, "");
 
-    if (node.type == "number" || node.type == "date" || node.type == "range") {
+    if (node.type == "number" || node.type == "date" || node.type == "range" || node.type == "time" || node.type == "month" || node.type == "week") {
       this.setValue(node, value);
       this.input(node);
-    } else if (node.type == "time") {
-      this.setValue(node, new Date(value).toTimeString().split(" ")[0]);
-      this.input(node);
     } else if (node.type == "datetime-local") {
       value = new Date(value);
       let year = value.getFullYear();
@@ -280,7 +328,7 @@ class Cuprite {
     x -= frameOffset.left;
     y -= frameOffset.top;
 
-    let element = document.elementFromPoint(x, y);
+    let element = node.getRootNode().elementFromPoint(x, y);
 
     let el = element;
     while (el) {
@@ -416,7 +464,7 @@ class Cuprite {
         options["button"] || 0, null
       )
     } else if (EVENTS.FOCUS.indexOf(name) != -1) {
-      event = this.obtainEvent(name);
+      event = new FocusEvent(name, { bubbles: true, cancelable: true });
     } else if (EVENTS.FORM.indexOf(name) != -1) {
       event = this.obtainEvent(name);
     } else {
@@ -489,6 +537,66 @@ class Cuprite {
     return node.contains(selectedNode);
   }
 
+  dragMousedownTracker() {
+    window._cupriteMousedownPrevented = null;
+    document.addEventListener('mousedown', ev => {
+      window._cupriteMousedownPrevented = ev.defaultPrevented;
+    }, { once: true, passive: true });
+  }
+
+  legacyDragCheck(node) {
+    if ([true, null].indexOf(window._cupriteMousedownPrevented) >= 0) {
+      return true;
+    }
+
+    let el = node;
+    do {
+      if (el.draggable) return false;
+    } while (el = el.parentElement);
+    return true;
+  }
+
+  // Ported from Capybara's Selenium html5_drag.rb (DROP_STRING).
+  dropString(strings, target) {
+    let dt = new DataTransfer();
+    let opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+    for (let 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"]);
+      }
+    }
+    target.dispatchEvent(new DragEvent("drop", opts));
+  }
+
+  // Ported from Capybara's Selenium html5_drag.rb (ATTACH_FILE).
+  attachDropInput() {
+    document.getElementById("_cuprite_drop_file")?.remove();
+    let input = document.createElement("INPUT");
+    input.type = "file";
+    input.id = "_cuprite_drop_file";
+    input.multiple = true;
+    document.body.appendChild(input);
+  }
+
+  // Ported from Capybara's Selenium html5_drag.rb (DROP_FILE).
+  dropFile(target) {
+    let input = document.getElementById("_cuprite_drop_file");
+    let files = input.files;
+    let dt = new DataTransfer();
+    let opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+    input.parentElement.removeChild(input);
+    if (dt.items) {
+      for (let i = 0; i < files.length; i++) {
+        dt.items.add(files[i]);
+      }
+    } else {
+      Object.defineProperty(dt, "files", { value: files, writable: false });
+    }
+    target.dispatchEvent(new DragEvent("drop", opts));
+  }
+
   // This command is purely for testing error handling
   browserError() {
     throw new Error("zomg");

data/lib/capybara/cuprite/node.rb

@@ -12,12 +12,16 @@ module Capybara
       delegate %i[description] => :node
       delegate %i[browser] => :driver
 
+      DRAG_MODIFIER_ALIASES = { control: :ctrl, command: :meta, cmd: :meta }.freeze
+
       def initialize(driver, node)
         super(driver, self)
         @node = node
       end
 
       def command(name, *args)
+        raise ObsoleteNode.new(self, nil) unless node.evaluate("this.isConnected")
+
         browser.send(name, node, *args)
       rescue Ferrum::NodeNotFoundError => e
         raise ObsoleteNode.new(self, e.response)
@@ -89,7 +93,7 @@ module Capybara
         command(:value)
       end
 
-      def set(value, options = {})
+      def set(value, options = {}) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
         warn "Options passed to Node#set but Cuprite doesn't currently support any - ignoring" unless options.empty?
 
         if tag_name == "input"
@@ -103,6 +107,23 @@ module Capybara
             command(:select_file, files)
           when "color"
             node.evaluate("this.setAttribute('value', '#{value}')")
+            node.evaluate("this.dispatchEvent(new InputEvent('input'))")
+            node.evaluate("this.dispatchEvent(new Event('change', { bubbles: true }))")
+          when "date"
+            value = value.to_date.iso8601 if !value.is_a?(String) && value.respond_to?(:to_date)
+            command(:set, value.to_s)
+          when "time"
+            value = value.to_time.strftime("%H:%M") if !value.is_a?(String) && value.respond_to?(:to_time)
+            command(:set, value.to_s)
+          when "month"
+            value = value.to_date.strftime("%Y-%m") if !value.is_a?(String) && value.respond_to?(:to_date)
+            command(:set, value.to_s)
+          when "week"
+            value = value.to_date.strftime("%G-W%V") if !value.is_a?(String) && value.respond_to?(:to_date)
+            command(:set, value.to_s)
+          when "datetime-local"
+            value = value.to_time.strftime("%Y-%m-%dT%H:%M") if !value.is_a?(String) && value.respond_to?(:to_time)
+            command(:set, value.to_s)
           else
             command(:set, value.to_s)
           end
@@ -110,7 +131,7 @@ module Capybara
           command(:set, value.to_s)
         elsif self[:isContentEditable]
           command(:delete_text)
-          send_keys(value.to_s)
+          click.type(value.to_s)
         end
       end
 
@@ -124,7 +145,7 @@ module Capybara
       end
 
       def tag_name
-        @tag_name ||= description["nodeName"].downcase
+        @tag_name ||= description["shadowRootType"] ? "ShadowRoot" : description["nodeName"].downcase
       end
 
       def visible?
@@ -161,16 +182,21 @@ module Capybara
 
       def drag_to(other, **options)
         options[:steps] ||= 1
+        options[:scroll] = true unless options.key?(:scroll)
+        modifiers = Array(options[:drop_modifiers]).map { |m| DRAG_MODIFIER_ALIASES.fetch(m.to_sym, m.to_sym) }
 
-        command(:drag, other.node, options[:steps], options[:delay])
+        command(:drag, other.node, modifiers, options.slice(:steps, :delay, :scroll, :html5))
       end
 
       def drag_by(x, y, **options)
         options[:steps] ||= 1
+        options[:scroll] = true unless options.key?(:scroll)
 
-        command(:drag_by, x, y, options[:steps], options[:delay])
+        command(:drag_by, x, y, options[:steps], options[:delay], options[:scroll])
       end
 
+      def drop(...) = command(:drop, ...)
+
       def trigger(event)
         command(:trigger, event)
       end
@@ -203,6 +229,9 @@ module Capybara
       end
 
       def send_keys(*keys)
+        keys = keys.reject { |key| key.nil? || key == "" }
+        return if keys.empty?
+
         command(:send_keys, keys)
       end
       alias send_key send_keys
@@ -211,6 +240,23 @@ module Capybara
         command(:path)
       end
 
+      def obscured?
+        command(:obscured?)
+      end
+
+      def shadow_root
+        root = driver.evaluate_script <<~JS, self
+          arguments[0].shadowRoot
+        JS
+        root && self.class.new(driver, root.node)
+      end
+
+      def rect
+        driver.evaluate_script <<~JS, self
+          arguments[0].getBoundingClientRect().toJSON()
+        JS
+      end
+
       def inspect
         %(#<#{self.class} @node=#{@node.inspect}>)
       end

data/lib/capybara/cuprite/options.rb

@@ -4,7 +4,7 @@ module Ferrum
   class Browser
     class Options
       attr_writer :window_size
-      attr_accessor :url_blacklist, :url_whitelist
+      attr_accessor :url_blacklist, :url_whitelist, :raise_on_unhandled_modal
 
       def reset_window_size
         @window_size = @options[:window_size]

data/lib/capybara/cuprite/page.rb

@@ -15,6 +15,7 @@ module Capybara
       TRIGGER_CLICK_WAIT = ENV.fetch("CUPRITE_TRIGGER_CLICK_WAIT", 0.1).to_f
 
       extend Forwardable
+
       delegate %i[at_css at_xpath css xpath
                   current_url current_title body execution_id execution_id!
                   evaluate evaluate_on evaluate_async execute] => :active_frame
@@ -24,9 +25,25 @@ module Capybara
         @accept_modal = []
         @modal_messages = []
         @modal_response = nil
+        @unhandled_modal_error = nil
         super
       end
 
+      # Keep a handle to Ferrum's own implementation before overriding it
+      # below, so answering a dialog (see `handle_javascript_dialog`) can
+      # bypass our override.
+      alias ferrum_command command
+
+      # The `Page.javascriptDialogOpening` event is handled on Ferrum's
+      # background CDP dispatcher thread, so raising there wouldn't reach
+      # the caller and would permanently kill that thread instead. The
+      # dialog is always accepted immediately from that thread, and the
+      # error (if any) is stashed here to be raised from the main thread
+      # the next time it makes a command round trip.
+      def command(...)
+        raise_pending_unhandled_modal_error! { super }
+      end
+
       def set(node, value)
         object_id = command("DOM.resolveNode", nodeId: node.node_id).dig("object", "objectId")
         evaluate("_cuprite.set(arguments[0], arguments[1])", { "objectId" => object_id }, value)
@@ -99,6 +116,7 @@ module Capybara
         @accept_modal = []
         @modal_response = nil
         @modal_messages = []
+        @unhandled_modal_error = nil
       end
 
       def before_click(node, name, _keys = [], offset = {})
@@ -123,7 +141,6 @@ module Capybara
           @frame_stack = []
         else
           @frame_stack << handle
-          inject_extensions
         end
       end
 
@@ -141,6 +158,18 @@ module Capybara
 
       private
 
+      def raise_pending_unhandled_modal_error!
+        error = @unhandled_modal_error
+        @unhandled_modal_error = nil
+        raise error if error
+
+        yield
+      ensure
+        error = @unhandled_modal_error
+        @unhandled_modal_error = nil
+        raise error if error
+      end
+
       def prepare_page
         super
 
@@ -155,6 +184,8 @@ module Capybara
 
         on("Page.javascriptDialogOpening") do |params|
           accept_modal = @accept_modal.last
+          unhandled_modal_error = nil
+
           if [true, false].include?(accept_modal)
             @accept_modal.pop
             @modal_messages << params["message"]
@@ -162,15 +193,24 @@ module Capybara
             response = @modal_response || params["defaultPrompt"]
           else
             with_text = params["message"] ? "with text `#{params['message']}` " : ""
-            warn "Modal window #{with_text}has been opened, but you didn't wrap " \
-                 "your code into (`accept_prompt` | `dismiss_prompt` | " \
-                 "`accept_confirm` | `dismiss_confirm` | `accept_alert`), " \
-                 "accepting by default"
+            message = "Modal window #{with_text}has been opened, but you didn't wrap " \
+                      "your code into (`accept_prompt` | `dismiss_prompt` | " \
+                      "`accept_confirm` | `dismiss_confirm` | `accept_alert`), " \
+                      "accepting by default"
+
+            if @options.raise_on_unhandled_modal
+              unhandled_modal_error = UnhandledModalError.new(message)
+            else
+              warn message
+            end
+
             options = { accept: true }
             response = params["defaultPrompt"]
           end
           options.merge!(promptText: response) if response
-          command("Page.handleJavaScriptDialog", **options)
+          ferrum_command("Page.handleJavaScriptDialog", **options)
+
+          @unhandled_modal_error = unhandled_modal_error if unhandled_modal_error
         end
       end
 

data/lib/capybara/cuprite/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Cuprite
-    VERSION = "0.15.1"
+    VERSION = "0.18"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: '0.18'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-15 00:00:00.000000000 Z
+date: 2026-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.18.0
 description: Cuprite is a driver for Capybara that allows you to run your tests on
   a headless Chrome browser
 email:
@@ -53,6 +53,7 @@ files:
 - lib/capybara/cuprite/cookie.rb
 - lib/capybara/cuprite/driver.rb
 - lib/capybara/cuprite/errors.rb
+- lib/capybara/cuprite/javascripts/drag.js
 - lib/capybara/cuprite/javascripts/index.js
 - lib/capybara/cuprite/node.rb
 - lib/capybara/cuprite/options.rb
@@ -75,14 +76,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Headless Chrome driver for Capybara