cuprite 0.14.3 → 0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6480f3033eff59cc4f7d261e47c37ae7169ef8dd806c9b1f471d4d59be5b5a7
-  data.tar.gz: 4d35f4b5df0457b7ea51842738e66c1b6aecc2d1753bdec5d7dbf82d28273ecd
+  metadata.gz: '06038d0fa139b71bda9f95ce0d353bfbd0394ff6a09f95c8dc0acb4f0b7f86f9'
+  data.tar.gz: 91a79735083b3949663d38d8ed1703c7955ada3ec2299830e7105348a72dd337
 SHA512:
-  metadata.gz: c347f3f5555138a6ae5660de778ec13d9e7686007ffdf9d635b826e6fa13a42520cb137693ee0142395b7cb00efa3a5939c9ccfc6fa75411397310f0593fef33
-  data.tar.gz: 82dd53121faab3a9f700928873d13dc42c33aae6a6065b88efcbadf02094356226ef8d72fa2d3ccfaf460a89ecfaf53950db49a57e6d9222ef9cf968eea7d6d2
+  metadata.gz: d1ab5955459610619f457b8ff7ac76fe761e003d20664da614f8b613da2849a65ba23c0c772753864321bf6b346a3e7d468da82dc55d816f33bbb7b13c6784ad
+  data.tar.gz: e618d937daea3246787cef4084f07fd7a5b2109fd7e34ff0bfa7f3d7e954c3b258539338a52378e8f9a80d96e4a8d29de3041d568b5dac8850aba61abba614c4

data/README.md

@@ -183,6 +183,9 @@ Besides capybara screenshot method you can get image as Base64:
 ## Authorization
 
 * `page.driver.basic_authorize(user, password)`
+
+## Proxy
+
 * `page.driver.set_proxy(ip, port, type, user, password)`
 
 
@@ -192,14 +195,14 @@ Cuprite supports URL blacklisting, which allows you to prevent scripts from
 running on designated domains:
 
 ```ruby
-page.driver.browser.url_blacklist = ["http://www.example.com"]
+page.driver.browser.url_blacklist = %r{http://www.example.com}
 ```
 
 and also URL whitelisting, which allows scripts to only run on designated
 domains:
 
 ```ruby
-page.driver.browser.url_whitelist = ["http://www.example.com"]
+page.driver.browser.url_whitelist = %r{http://www.example.com}
 ```
 
 If you are experiencing slower run times, consider creating a URL whitelist of

data/lib/capybara/cuprite/browser.rb

@@ -12,6 +12,8 @@ module Capybara
                   dismiss_prompt reset_modals] => :page
 
       attr_reader :url_blacklist, :url_whitelist
+      alias url_blocklist url_blacklist
+      alias url_allowlist url_whitelist
 
       def initialize(options = nil)
         options ||= {}
@@ -46,13 +48,15 @@ module Capybara
 
       def url_whitelist=(patterns)
         @url_whitelist = prepare_wildcards(patterns)
-        page.network.intercept if @client && !@url_whitelist.empty?
+        page.network.whitelist = @url_whitelist if @client && @url_whitelist.any?
       end
+      alias url_allowlist= url_whitelist=
 
       def url_blacklist=(patterns)
         @url_blacklist = prepare_wildcards(patterns)
-        page.network.intercept if @client && !@url_blacklist.empty?
+        page.network.blacklist = @url_blacklist if @client && @url_blacklist.any?
       end
+      alias url_blocklist= url_blacklist=
 
       def visit(*args)
         goto(*args)
@@ -117,24 +121,24 @@ module Capybara
         raise NotImplementedError
       end
 
-      def drag(node, other)
+      def drag(node, other, steps)
         x1, y1 = node.find_position
         x2, y2 = other.find_position
 
         mouse.move(x: x1, y: y1)
         mouse.down
-        mouse.move(x: x2, y: y2)
+        mouse.move(x: x2, y: y2, steps: steps)
         mouse.up
       end
 
-      def drag_by(node, x, y)
+      def drag_by(node, x, y, steps)
         x1, y1 = node.find_position
         x2 = x1 + x
         y2 = y1 + y
 
         mouse.move(x: x1, y: y1)
         mouse.down
-        mouse.move(x: x2, y: y2)
+        mouse.move(x: x2, y: y2, steps: steps)
         mouse.up
       end
 
@@ -199,15 +203,22 @@ module Capybara
         raise
       end
 
-      def prepare_wildcards(wc)
-        Array(wc).map do |wildcard|
-          if wildcard.is_a?(Regexp)
-            wildcard
+      def prepare_wildcards(patterns)
+        string_passed = false
+
+        Array(patterns).map do |pattern|
+          if pattern.is_a?(Regexp)
+            pattern
           else
-            wildcard = wildcard.gsub("*", ".*")
-            Regexp.new(wildcard, Regexp::IGNORECASE)
+            string_passed = true
+            pattern = pattern.gsub("*", ".*")
+            Regexp.new(pattern, Regexp::IGNORECASE)
           end
         end
+      ensure
+        if string_passed
+          warn "Passing strings to blacklist/whitelist is deprecated, pass regexp at #{caller(4..4).first}"
+        end
       end
 
       def attach_page(target_id = nil)

data/lib/capybara/cuprite/driver.rb

@@ -3,9 +3,9 @@
 require "uri"
 require "forwardable"
 
+# rubocop:disable Metrics/ClassLength
 module Capybara
   module Cuprite
-    # rubocop:disable Metrics/ClassLength
     class Driver < Capybara::Driver::Base
       DEFAULT_MAXIMIZE_SCREEN_SIZE = [1366, 768].freeze
       EXTENSION = File.expand_path("javascripts/index.js", __dir__)
@@ -14,7 +14,7 @@ module Capybara
 
       delegate %i[restart quit status_code timeout timeout= current_url title body
                   window_handles close_window switch_to_window within_window window_handle
-                  back forward refresh wait_for_reload] => :browser
+                  back forward refresh wait_for_reload viewport_size device_pixel_ratio] => :browser
       alias html body
       alias current_window_handle window_handle
       alias go_back back
@@ -32,8 +32,7 @@ module Capybara
 
         @screen_size = @options.delete(:screen_size)
         @screen_size ||= DEFAULT_MAXIMIZE_SCREEN_SIZE
-
-        @options[:save_path] = File.expand_path(Capybara.save_path) if Capybara.save_path
+        @options[:save_path] ||= File.expand_path(Capybara.save_path) if Capybara.save_path
 
         ENV["FERRUM_DEBUG"] = "true" if ENV["CUPRITE_DEBUG"]
 
@@ -206,16 +205,7 @@ module Capybara
       end
 
       def set_proxy(host, port, user = nil, password = nil, bypass = nil)
-        browser_options = @options.fetch(:browser_options, {})
-        browser_options = browser_options.merge("proxy-server" => "#{host}:#{port}")
-        browser_options = browser_options.merge("proxy-bypass-list" => bypass) if bypass
-        @options[:browser_options] = browser_options
-
-        return unless user && password
-
-        browser.network.authorize(user: user, password: password, type: :proxy) do |request, _index, _total|
-          request.continue
-        end
+        @options.merge!(proxy: { host: host, port: port, user: user, password: password, bypass: bypass })
       end
 
       def headers
@@ -423,6 +413,6 @@ module Capybara
           options[:format].to_s == "pdf"
       end
     end
-    # rubocop:enable Metrics/ClassLength
   end
 end
+# rubocop:enable Metrics/ClassLength

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

@@ -151,7 +151,7 @@ class Cuprite {
         // call the following functions in order, if one returns false (preventDefault),
         // stop the call chain
         [
-          () => this.keyupdowned(node, "keydown", keyCode),
+          () => this.keyupdowned(node, "keydown", char, keyCode),
           () => this.keypressed(node, false, false, false, false, char.charCodeAt(0), char.charCodeAt(0)),
           () => {
             this.setValue(node, node.value + char)
@@ -159,7 +159,7 @@ class Cuprite {
           }
         ].some(fn => fn())
 
-        this.keyupdowned(node, "keyup", keyCode);
+        this.keyupdowned(node, "keyup", char, keyCode);
       }
     }
 
@@ -180,19 +180,22 @@ class Cuprite {
   }
 
   input(node) {
-    let event = document.createEvent("HTMLEvents");
-    event.initEvent("input", true, false);
+    let event = new InputEvent("input", { inputType: "insertText", bubbles: true, cancelable: false });
     node.dispatchEvent(event);
   }
 
   /**
    * @return {boolean} false when an event handler called preventDefault()
    */
-  keyupdowned(node, eventName, keyCode) {
-    let event = document.createEvent("UIEvents");
-    event.initEvent(eventName, true, true);
-    event.keyCode  = keyCode;
-    event.charCode = 0;
+  keyupdowned(node, eventName, char, keyCode) {
+    let event = new KeyboardEvent(
+      eventName, {
+        bubbles: true,
+        cancelable: true,
+        key: char,
+        keyCode: keyCode
+      }
+    );
     return !node.dispatchEvent(event);
   }
 
@@ -200,15 +203,18 @@ class Cuprite {
    * @return {boolean} false when an event handler called preventDefault()
    */
   keypressed(node, altKey, ctrlKey, shiftKey, metaKey, keyCode, charCode) {
-    event = document.createEvent("UIEvents");
-    event.initEvent("keypress", true, true);
-    event.window   = window;
-    event.altKey   = altKey;
-    event.ctrlKey  = ctrlKey;
-    event.shiftKey = shiftKey;
-    event.metaKey  = metaKey;
-    event.keyCode  = keyCode;
-    event.charCode = charCode;
+    let event = new KeyboardEvent(
+      "keypress", {
+        bubbles: true,
+        cancelable: true,
+        altKey: altKey,
+        ctrlKey: ctrlKey,
+        shiftKey: shiftKey,
+        metaKey: metaKey,
+        keyCode: keyCode,
+        charCode: charCode
+      }
+    );
     return !node.dispatchEvent(event);
   }
 

data/lib/capybara/cuprite/node.rb

@@ -159,12 +159,16 @@ module Capybara
         command(:hover)
       end
 
-      def drag_to(other)
-        command(:drag, other.node)
+      def drag_to(other, **options)
+        options[:steps] ||= 1
+
+        command(:drag, other.node, options[:steps])
       end
 
-      def drag_by(x, y)
-        command(:drag_by, x, y)
+      def drag_by(x, y, **options)
+        options[:steps] ||= 1
+
+        command(:drag_by, x, y, options[:steps])
       end
 
       def trigger(event)

data/lib/capybara/cuprite/page.rb

@@ -17,6 +17,7 @@ module Capybara
         @frame_stack = []
         @accept_modal = []
         @modal_messages = []
+        @modal_response = nil
         super
       end
 
@@ -130,35 +131,13 @@ module Capybara
 
       private
 
-      # rubocop:disable Metrics/CyclomaticComplexity
-      # rubocop:disable Metrics/PerceivedComplexity
-      # rubocop:disable Style/GuardClause
       def prepare_page
         super
 
-        network.intercept if !Array(@browser.url_whitelist).empty? ||
-                             !Array(@browser.url_blacklist).empty?
-
-        on(:request) do |request, index, total|
-          if @browser.url_blacklist && !@browser.url_blacklist.empty?
-            if @browser.url_blacklist.any? { |r| request.match?(r) }
-              request.abort and next
-            else
-              request.continue and next
-            end
-          elsif @browser.url_whitelist && !@browser.url_whitelist.empty?
-            if @browser.url_whitelist.any? { |r| request.match?(r) }
-              request.continue and next
-            else
-              request.abort and next
-            end
-          elsif index + 1 < total
-            # There are other callbacks that may handle this request
-            next
-          else
-            # If there are no callbacks then just continue
-            request.continue
-          end
+        if @browser.url_blacklist.any?
+          network.blacklist = @browser.url_blacklist
+        elsif @browser.url_whitelist.any?
+          network.whitelist = @browser.url_whitelist
         end
 
         on("Page.javascriptDialogOpening") do |params|
@@ -181,9 +160,6 @@ module Capybara
           command("Page.handleJavaScriptDialog", **options)
         end
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable Metrics/PerceivedComplexity
-      # rubocop:enable Style/GuardClause
 
       def find_position(node, **options)
         node.find_position(**options)

data/lib/capybara/cuprite/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Cuprite
-    VERSION = "0.14.3"
+    VERSION = "0.15"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: '0.15'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-12 00:00:00.000000000 Z
+date: 2023-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -30,140 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.1'
-- !ruby/object:Gem::Dependency
-  name: chunky_png
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: image_size
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: pdf-reader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.14.0
 description: Cuprite is a driver for Capybara that allows you to run your tests on
   a headless Chrome browser
 email:
@@ -189,7 +63,7 @@ licenses:
 metadata:
   homepage_uri: https://cuprite.rubycdp.com/
   bug_tracker_uri: https://github.com/rubycdp/cuprite/issues
-  documentation_uri: https://github.com/rubycdp/cuprite/blob/master/README.md
+  documentation_uri: https://github.com/rubycdp/cuprite/blob/main/README.md
   source_code_uri: https://github.com/rubycdp/cuprite
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -200,14 +74,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Headless Chrome driver for Capybara