cuprite 0.12 → 0.15.1

data/lib/capybara/cuprite/page.rb

@@ -2,198 +2,192 @@
 
 require "forwardable"
 
-module Capybara::Cuprite
-  class Page < Ferrum::Page
-    MODAL_WAIT = ENV.fetch("CUPRITE_MODAL_WAIT", 0.05).to_f
-    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
-                evaluate evaluate_on evaluate_async execute] => :active_frame
-
-    def initialize(*args)
-      @frame_stack = []
-      @accept_modal = []
-      @modal_messages = []
-      super
+module Capybara
+  module Cuprite
+    class ClosedPage
+      def closed?
+        true
+      end
     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)
-    end
+    class Page < Ferrum::Page
+      MODAL_WAIT = ENV.fetch("CUPRITE_MODAL_WAIT", 0.05).to_f
+      TRIGGER_CLICK_WAIT = ENV.fetch("CUPRITE_TRIGGER_CLICK_WAIT", 0.1).to_f
 
-    def select(node, value)
-      evaluate_on(node: node, expression: "_cuprite.select(this, #{value})")
-    end
+      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
 
-    def trigger(node, event)
-      options = {}
-      options.merge!(wait: TRIGGER_CLICK_WAIT) if event.to_s == "click" && TRIGGER_CLICK_WAIT > 0
-      evaluate_on(node: node, expression: %(_cuprite.trigger(this, "#{event}")), **options)
-    end
+      def initialize(...)
+        @frame_stack = []
+        @accept_modal = []
+        @modal_messages = []
+        @modal_response = nil
+        super
+      end
 
-    def hover(node)
-      evaluate_on(node: node, expression: "_cuprite.scrollIntoViewport(this)")
-      x, y = find_position(node)
-      command("Input.dispatchMouseEvent", type: "mouseMoved", x: x, y: y)
-    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)
+      end
 
-    def send_keys(node, keys)
-      if !evaluate_on(node: node, expression: %(_cuprite.containsSelection(this)))
-        before_click(node, "click")
-        node.click(mode: :left, keys: keys)
+      def select(node, value)
+        evaluate_on(node: node, expression: "_cuprite.select(this, #{value})")
       end
 
-      keyboard.type(keys)
-    end
+      def trigger(node, event)
+        options = {}
+        options.merge!(wait: TRIGGER_CLICK_WAIT) if event.to_s == "click" && TRIGGER_CLICK_WAIT.positive?
+        evaluate_on(node: node, expression: %(_cuprite.trigger(this, "#{event}")), **options)
+      end
 
-    def accept_confirm
-      @accept_modal << true
-    end
+      def hover(node)
+        evaluate_on(node: node, expression: "_cuprite.scrollIntoViewport(this)")
+        x, y = find_position(node)
+        command("Input.dispatchMouseEvent", type: "mouseMoved", x: x, y: y)
+      end
 
-    def dismiss_confirm
-      @accept_modal << false
-    end
+      def send_keys(node, keys)
+        unless evaluate_on(node: node, expression: %(_cuprite.containsSelection(this)))
+          before_click(node, "click")
+          node.click(mode: :left, keys: keys)
+        end
 
-    def accept_prompt(modal_response)
-      @accept_modal << true
-      @modal_response = modal_response
-    end
+        keyboard.type(keys)
+      end
 
-    def dismiss_prompt
-      @accept_modal << false
-    end
+      def accept_confirm
+        @accept_modal << true
+      end
 
-    def find_modal(options)
-      start = Ferrum.monotonic_time
-      timeout = options.fetch(:wait, browser.timeout)
-      expect_text = options[:text]
-      expect_regexp = expect_text.is_a?(Regexp) ? expect_text : Regexp.escape(expect_text.to_s)
-      not_found_msg = "Unable to find modal dialog"
-      not_found_msg += " with #{expect_text}" if expect_text
+      def dismiss_confirm
+        @accept_modal << false
+      end
 
-      begin
-        modal_text = @modal_messages.shift
-        raise Capybara::ModalNotFound if modal_text.nil? || (expect_text && !modal_text.match(expect_regexp))
-      rescue Capybara::ModalNotFound => e
-        raise e, not_found_msg if Ferrum.timeout?(start, timeout)
-        sleep(MODAL_WAIT)
-        retry
+      def accept_prompt(modal_response)
+        @accept_modal << true
+        @modal_response = modal_response
       end
 
-      modal_text
-    end
+      def dismiss_prompt
+        @accept_modal << false
+      end
 
-    def reset_modals
-      @accept_modal = []
-      @modal_response = nil
-      @modal_messages = []
-    end
+      def find_modal(options)
+        start = Ferrum::Utils::ElapsedTime.monotonic_time
+        expect_text = options[:text]
+        expect_regexp = expect_text.is_a?(Regexp) ? expect_text : Regexp.escape(expect_text.to_s)
+        not_found_msg = "Unable to find modal dialog"
+        not_found_msg += " with #{expect_text}" if expect_text
+        wait = options.fetch(:wait, timeout)
+
+        begin
+          modal_text = @modal_messages.shift
+          raise Capybara::ModalNotFound if modal_text.nil? || (expect_text && !modal_text.match(expect_regexp))
+        rescue Capybara::ModalNotFound => e
+          raise e, not_found_msg if Ferrum::Utils::ElapsedTime.timeout?(start, wait)
+
+          sleep(MODAL_WAIT)
+          retry
+        end
 
-    def before_click(node, name, keys = [], offset = {})
-      evaluate_on(node: node, expression: "_cuprite.scrollIntoViewport(this)")
+        modal_text
+      end
 
-      # If offset is given it may go outside of the element and likely error
-      # will be raised that we detected another element at this position.
-      return true if offset[:x] || offset[:y]
+      def reset_modals
+        @accept_modal = []
+        @modal_response = nil
+        @modal_messages = []
+      end
 
-      x, y = find_position(node, **offset)
-      evaluate_on(node: node, expression: "_cuprite.mouseEventTest(this, '#{name}', #{x}, #{y})")
-      true
-    rescue Ferrum::JavaScriptError => e
-      raise MouseEventFailed.new(e.message) if e.class_name == "MouseEventFailed"
-    end
+      def before_click(node, name, _keys = [], offset = {})
+        evaluate_on(node: node, expression: "_cuprite.scrollIntoViewport(this)")
 
-    def switch_to_frame(handle)
-      case handle
-      when :parent
-        @frame_stack.pop
-      when :top
-        @frame_stack = []
-      else
-        @frame_stack << handle
-        inject_extensions
+        # If offset is given it may go outside of the element and likely error
+        # will be raised that we detected another element at this position.
+        return true if offset[:x] || offset[:y]
+
+        x, y = find_position(node, **offset)
+        evaluate_on(node: node, expression: "_cuprite.mouseEventTest(this, '#{name}', #{x}, #{y})")
+        true
+      rescue Ferrum::JavaScriptError => e
+        raise MouseEventFailed, e.message if e.class_name == "MouseEventFailed"
       end
-    end
 
-    def frame_name
-      evaluate("window.name")
-    end
+      def switch_to_frame(handle)
+        case handle
+        when :parent
+          @frame_stack.pop
+        when :top
+          @frame_stack = []
+        else
+          @frame_stack << handle
+          inject_extensions
+        end
+      end
 
-    def title
-      active_frame.current_title
-    end
+      def frame_name
+        evaluate("window.name")
+      end
 
-    private
+      def title
+        active_frame.current_title
+      end
 
-    def prepare_page
-      super
+      def closed?
+        false
+      end
 
-      network.intercept if !Array(@browser.url_whitelist).empty? ||
-                           !Array(@browser.url_blacklist).empty?
+      private
 
-      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
+      def prepare_page
+        super
+
+        width, height = @options.window_size
+        resize(width: width, height: height)
+
+        if @options.url_blacklist.any?
+          network.blacklist = @options.url_blacklist
+        elsif @options.url_whitelist.any?
+          network.whitelist = @options.url_whitelist
         end
-      end
 
-      on("Page.javascriptDialogOpening") do |params|
-        accept_modal = @accept_modal.last
-        if accept_modal == true || accept_modal == false
-          @accept_modal.pop
-          @modal_messages << params["message"]
-          options = { accept: accept_modal }
-          response = @modal_response || params["defaultPrompt"]
-          options.merge!(promptText: response) if response
-          command("Page.handleJavaScriptDialog", **options)
-        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"
-          options = { accept: true }
-          response = params["defaultPrompt"]
+        on("Page.javascriptDialogOpening") do |params|
+          accept_modal = @accept_modal.last
+          if [true, false].include?(accept_modal)
+            @accept_modal.pop
+            @modal_messages << params["message"]
+            options = { accept: accept_modal }
+            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"
+            options = { accept: true }
+            response = params["defaultPrompt"]
+          end
           options.merge!(promptText: response) if response
           command("Page.handleJavaScriptDialog", **options)
         end
       end
-    end
 
-    def find_position(node, **options)
-      x, y = node.find_position(**options)
-    rescue Ferrum::BrowserError => e
-      if e.message == "Could not compute content quads."
-        raise MouseEventFailed.new("MouseEventFailed: click, none, 0, 0")
-      else
+      def find_position(node, **options)
+        node.find_position(**options)
+      rescue Ferrum::BrowserError => e
+        raise MouseEventFailed, "MouseEventFailed: click, none, 0, 0" if e.message == "Could not compute content quads."
+
         raise
       end
-    end
 
-    def active_frame
-      if @frame_stack.empty?
-        main_frame
-      else
-        @frames[@frame_stack.last]
+      def active_frame
+        if @frame_stack.empty?
+          main_frame
+        else
+          @frames[@frame_stack.last]
+        end
       end
     end
   end

data/lib/capybara/cuprite/version.rb

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

data/lib/capybara/cuprite.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
+ENV["FERRUM_DEBUG"] = "true" if ENV["CUPRITE_DEBUG"]
+
 require "ferrum"
 require "capybara"
 require "capybara/cuprite/driver"
 require "capybara/cuprite/browser"
 require "capybara/cuprite/page"
+require "capybara/cuprite/options"
 require "capybara/cuprite/node"
 require "capybara/cuprite/errors"
 

metadata

@@ -1,155 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: 0.15.1
 platform: ruby
 authors:
 - Dmitry Vorotilin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2024-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: ferrum
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: image_size
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pdf-reader
-  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'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -157,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: chunky_png
+  name: ferrum
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: 0.15.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.15.0
 description: Cuprite is a driver for Capybara that allows you to run your tests on
   a headless Chrome browser
 email:
@@ -187,13 +55,19 @@ files:
 - lib/capybara/cuprite/errors.rb
 - lib/capybara/cuprite/javascripts/index.js
 - lib/capybara/cuprite/node.rb
+- lib/capybara/cuprite/options.rb
 - lib/capybara/cuprite/page.rb
 - lib/capybara/cuprite/version.rb
 homepage: https://github.com/rubycdp/cuprite
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://cuprite.rubycdp.com/
+  bug_tracker_uri: https://github.com/rubycdp/cuprite/issues
+  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:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,15 +75,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: Headless Chrome driver for Capybara
 test_files: []