cuprite 0.7.0 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b0203f3647868b796a4649f28e2ed0a549412156e08a3ef50e83625acaca11
-  data.tar.gz: 9854d6126698f53691c30b04c9a8677f24091c76720227ceb474101dab06a475
+  metadata.gz: 8ec561634fc66a075a61f4221aef5276b57e447c0810865fdc6562a41842ce42
+  data.tar.gz: af475a5d00fe0f32dc8ddf643bd7bc0cfb80409ae8ec4cb627a976cc9b1b753c
 SHA512:
-  metadata.gz: 2fe300cdefbb2a2c7d09d37329ab7a31dcf2d7cda9177ffafc91bdec2923fabf24c933f6894e5e959bdb6218e03ac9211afedb7ae588ae97f87d7142fb249e7c
-  data.tar.gz: ede07bd3d885c5e711a80a6698d10ad28d855d7b6917f10ebc2cfe0153fde5af261ef553cdee62ad3a6cabdacfee659e12d13b95ebc8c2470d4d4b33772ad5be
+  metadata.gz: f460096e3ce6e8613be751bc237d7efde7a3c6a8b63ba54283b677d6f7a6d7c25bb1182bb38dc3762a42e7eb3c8f19ca4678f7d82591c79b6849606e021dd501
+  data.tar.gz: 95b4633594b2581bd3e4259b110652668b75362fccca572c43b0020e11e02701f077fed5be558abfa1960955e9697c79961b0408c461020eade8c609acb9e731

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Machinio
+Copyright (c) 2018-2020 Dmitry Vorotilin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,26 +1,27 @@
-# Cuprite - Headless Chrome driver for Capybara #
+# Cuprite - Headless Chrome driver for Capybara
 
-[![Build Status](https://travis-ci.org/machinio/cuprite.svg?branch=master)](https://travis-ci.org/machinio/cuprite)
+[![CircleCI](https://circleci.com/gh/rubycdp/cuprite.svg?style=shield)](https://circleci.com/gh/rubycdp/cuprite)
 
-Cuprite is a pure Ruby driver (read as _no_ Java/Selenium/WebDriver/ChromeDriver
-requirement) for [Capybara](https://github.com/teamcapybara/capybara). It allows
-you to run your Capybara tests on a headless [Chrome](https://www.google.com/chrome/)
-or [Chromium](https://www.chromium.org/) by [CDP protocol](https://chromedevtools.github.io/devtools-protocol/).
-Under the hood it uses [Ferrum](https://github.com/route/ferrum) which is
-high-level API to the browser again by CDP protocol.
+Cuprite is a pure Ruby driver (read as _no_ Selenium/WebDriver/ChromeDriver
+dependency) for [Capybara](https://github.com/teamcapybara/capybara). It allows
+you to run Capybara tests on a headless Chrome or Chromium. Under the hood it
+uses [Ferrum](https://github.com/rubycdp/ferrum#index) which is high-level API
+to the browser by CDP protocol. The design of the driver is as close to
+[Poltergeist](https://github.com/teampoltergeist/poltergeist) as possible though
+it's not a goal.
 
-The emphasis was made on raw CDP protocol because Headless Chrome allows you to
-do so many things that are barely supported by WebDriver because it should have
-consistent design with other browsers. The design of the driver will be as
-close to [Poltergeist](https://github.com/teampoltergeist/poltergeist) as
-possible though it's not a goal.
+[Cuprite](https://evrone.com/cuprite) designed & supported by [Evrone](https://evrone.com/)
+What else we build [with Ruby](https://evrone.com/ruby)
 
-## Install ##
 
-Add these lines to your `Gemfile` and run `bundle install`.
+## Install
+
+Add this to your `Gemfile` and run `bundle install`.
 
 ``` ruby
-gem "cuprite", group: :test
+group :test do
+  gem "cuprite"
+end
 ```
 
 In your test setup add:
@@ -33,21 +34,31 @@ Capybara.register_driver(:cuprite) do |app|
 end
 ```
 
-If you already had tests on Poltergeist then it should simply work, for Selenium
-you better check your code for `.manage` calls because things are much easier
-with Cuprite, see the documentation below.
+if you use `Docker` don't forget to pass `no-sandbox` option:
+
+```ruby
+Capybara::Cuprite::Driver.new(app, browser_options: { 'no-sandbox': nil })
+```
+
+Since Cuprite uses [Ferrum](https://github.com/rubycdp/ferrum#examples) there
+are many useful methods you can call even using this driver:
+
+```ruby
+browser = page.driver.browser
+browser.mouse.move(x: 123, y: 456).down.up
+```
+
+If you already have tests on Poltergeist then it should simply work, for
+Selenium you better check your code for `manage` calls because it works
+differently in Cuprite, see the documentation below.
 
-## Install Chrome ##
 
-There's no official Chrome or Chromium package for Linux don't install it this
-way because it either will be outdated or unofficial, both are bad. Download it
-from official [source](https://www.chromium.org/getting-involved/download-chromium).
-Chrome binary should be in the `PATH` or `BROWSER_PATH` or you can pass it as an
-option
+## Customization
 
-## Customization ##
+See the full list of options for
+[Ferrum](https://github.com/rubycdp/ferrum#customization).
 
-You can customize options with the following code in your test setup:
+You can pass options with the following code in your test setup:
 
 ``` ruby
 Capybara.register_driver(:cuprite) do |app|
@@ -55,47 +66,52 @@ Capybara.register_driver(:cuprite) do |app|
 end
 ```
 
-#### Running in Docker ####
+`Cuprite`-specific options are:
 
-In docker as root you must pass the no-sandbox browser option:
+* options `Hash`
+  * `:url_blacklist` (Array) - array of strings to match against requested URLs
+  * `:url_whitelist` (Array) - array of strings 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::Cuprite::Driver.new(app, browser_options: { 'no-sandbox': nil })
+Capybara.register_driver :cuprite do |app|
+  Capybara::Cuprite::Driver.new(app, inspector: ENV['INSPECTOR'])
+end
 ```
 
-* options `Hash`
-  * `:browser_path` (String) - Path to chrome binary, you can also set ENV
-      variable as `BROWSER_PATH=some/path/chrome bundle exec rspec`.
-  * `:headless` (Boolean) - Set browser as headless or not, `true` by default.
-  * `:slowmo` (Integer | Float) - Set a delay to wait before sending command.
-      Usefull companion of headless option, so that you have time to see changes.
-  * `:logger` (Object responding to `puts`) - When present, debug output is
-      written to this object.
-  * `:timeout` (Numeric) - The number of seconds we'll wait for a response when
-      communicating with browser. Default is 5.
-  * `:js_errors` (Boolean) - When true, JavaScript errors get re-raised in Ruby.
-  * `:window_size` (Array) - The dimensions of the browser window in which to
-      test, expressed as a 2-element array, e.g. [1024, 768]. Default: [1024, 768]
-  * `:browser_options` (Hash) - Additional command line options,
-      [see them all](https://peter.sh/experiments/chromium-command-line-switches/)
-      e.g. `{ "ignore-certificate-errors" => nil }`
-  * `:extensions` (Array) - An array of JS files to be preloaded into the browser
-  * `:port` (Integer) - Remote debugging port for headless Chrome
-  * `:host` (String) - Remote debugging address for headless Chrome
-  * `:url` (String) - URL for a running instance of Chrome. If this is set, a
-      browser process will not be spawned.
-  * `:url_blacklist` (Array) - array of strings to match against requested URLs
-  * `:url_whitelist` (Array) - array of strings to match against requested URLs
-  * `:process_timeout` (Integer) - How long to wait for the Chrome process to
-      respond on startup
+then somewhere in the test:
+
+```ruby
+it "does something useful" do
+  visit root_path
+
+  fill_in "field", with: "value"
+  page.driver.debug(binding)
+
+  expect(page).to have_content("value")
+end
+```
+
+In the middle of the execution Chrome will open a new tab where you can inspect
+the content and also if you passed `binding` an `irb` or `pry` console will be
+opened where you can further experiment with the test.
 
-### Clicking/Scrolling ###
+
+## Clicking/Scrolling
 
 * `page.driver.click(x, y)` Click a very specific area of the screen.
-* `page.driver.scroll_to(left, top)` Scroll to given position.
-* `element.send_keys(*keys)` Send keys to given node.
+* `page.driver.scroll_to(left, top)` Scroll to a given position.
+* `element.send_keys(*keys)` Send keys to a given node.
+
 
-### Request headers ###
+## Request headers
 
 Manipulate HTTP request headers like a boss:
 
@@ -111,11 +127,11 @@ Notice that `headers=` will overwrite already set headers. You should use
 subsequent HTTP requests (including requests for assets, AJAX, etc). They will
 be automatically cleared at the end of the test.
 
-### Network traffic ###
 
-* `page.driver.network_traffic` Inspect network traffic (resources have been
-  loaded) on the current page. This returns an array of request objects.
+## Network traffic
 
+* `page.driver.network_traffic` Inspect network traffic (loaded resources) on
+the current page. This returns an array of request objects.
 
 ```ruby
 page.driver.network_traffic # => [Request, ...]
@@ -123,11 +139,30 @@ request = page.driver.network_traffic.first
 request.response
 ```
 
+* `page.driver.wait_for_network_idle` Natively waits for network idle and if
+there are no active connections returns or raises `TimeoutError` error. Accepts
+the same options as
+[`wait_for_idle`](https://github.com/rubycdp/ferrum#wait_for_idleoptions)
+
+```ruby
+page.driver.wait_for_network_idle
+page.driver.refresh
+```
+
 Please note that network traffic is not cleared when you visit new page. You can
 manually clear the network traffic by calling `page.driver.clear_network_traffic`
 or `page.driver.reset`
 
-### Manipulating cookies ###
+* `page.driver.wait_for_reload` unlike `wait_for_network_idle` will wait until
+the whole page is reloaded or raise a timeout error. It's useful when you know
+that for example after clicking autocomplete suggestion you expect page to be
+reloaded, you have a few choices - put sleep or wait for network idle, but both
+are bad. Sleep makes you wait longer or less than needed, network idle can
+return earlier even before the whole page is started to reload. Here's the
+rescue.
+
+
+## Manipulating cookies
 
 The following methods are used to inspect and manipulate cookies:
 
@@ -142,18 +177,22 @@ The following methods are used to inspect and manipulate cookies:
 * `page.driver.remove_cookie(name)` - remove a cookie
 * `page.driver.clear_cookies` - clear all cookies
 
-### Screenshot ###
+
+## Screenshot
 
 Besides capybara screenshot method you can get image as Base64:
 
 * `page.driver.render_base64(format, options)`
 
-### Authorization ###
+
+## Authorization
 
 * `page.driver.basic_authorize(user, password)`
 * `page.driver.set_proxy(ip, port, type, user, password)`
 
-### URL Blacklisting & Whitelisting ###
+
+## URL Blacklisting & Whitelisting
+
 Cuprite supports URL blacklisting, which allows you to prevent scripts from
 running on designated domains:
 
@@ -161,8 +200,8 @@ running on designated domains:
 page.driver.browser.url_blacklist = ["http://www.example.com"]
 ```
 
-and also URL whitelisting, which allows scripts to only run
-on designated domains:
+and also URL whitelisting, which allows scripts to only run on designated
+domains:
 
 ```ruby
 page.driver.browser.url_whitelist = ["http://www.example.com"]
@@ -171,44 +210,3 @@ page.driver.browser.url_whitelist = ["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,
 such as ad networks or analytics, to your testing environment.
-
-### Remote debugging ###
-
-If you use the `inspector: true` option, remote debugging will be enabled. When
-this option is enabled, you can insert `page.driver.debug` into your tests to
-pause the test and launch a browser which gives you the Chrome inspector to view
-all your open pages and inspect them.
-
-You can register this debugger driver with a different name and set it
-as the current javascript driver. By example, in your helper file:
-
-```ruby
-Capybara.register_driver :cuprite_debug do |app|
-  Capybara::Cuprite::Driver.new(app, inspector: true)
-end
-
-Capybara.javascript_driver = :cuprite_debug
-```
-
-## License ##
-
-Copyright 2018-2019 Machinio
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/capybara/cuprite.rb

@@ -2,18 +2,12 @@
 
 require "ferrum"
 require "capybara"
-
-module Capybara::Cuprite
-end
-
 require "capybara/cuprite/driver"
 require "capybara/cuprite/browser"
 require "capybara/cuprite/page"
 require "capybara/cuprite/node"
 require "capybara/cuprite/errors"
 
-Ferrum::Page.prepend(Capybara::Cuprite::Page)
-
 Capybara.register_driver(:cuprite) do |app|
   Capybara::Cuprite::Driver.new(app)
 end

data/lib/capybara/cuprite/browser.rb

@@ -6,7 +6,6 @@ module Capybara::Cuprite
   class Browser < Ferrum::Browser
     extend Forwardable
 
-    delegate %i[find_or_create_page] => :targets
     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
@@ -19,16 +18,32 @@ module Capybara::Cuprite
       self.url_whitelist = options[:url_whitelist]
 
       super
+      @page = false
+    end
+
+    def page
+      raise Ferrum::NoSuchPageError if @page.nil?
+      @page ||= attach_page
+    end
+
+    def reset
+      super
+      @page = attach_page
+    end
+
+    def quit
+      super
+      @page = false
     end
 
     def url_whitelist=(patterns)
       @url_whitelist = prepare_wildcards(patterns)
-      page.intercept_request if @client && !@url_whitelist.empty?
+      page.network.intercept if @client && !@url_whitelist.empty?
     end
 
     def url_blacklist=(patterns)
       @url_blacklist = prepare_wildcards(patterns)
-      page.intercept_request if @client && !@url_blacklist.empty?
+      page.network.intercept if @client && !@url_blacklist.empty?
     end
 
     def visit(*args)
@@ -36,7 +51,7 @@ module Capybara::Cuprite
     end
 
     def status_code
-      status
+      network.status
     end
 
     def find(method, selector)
@@ -53,16 +68,46 @@ module Capybara::Cuprite
       find_all(method, selector, { "objectId" => object_id })
     end
 
+    def window_handle
+      page.target_id
+    end
+
+    def window_handles
+      targets.keys
+    end
+
     def within_window(locator = nil, &block)
+      original = window_handle
+
       if Capybara::VERSION.to_f < 3.0
         target_id = window_handles.find do |target_id|
-          page = find_or_create_page(target_id)
+          page = attach_page(target_id)
           locator == page.frame_name
         end
         locator = target_id if target_id
       end
 
-      targets.within_window(locator, &block)
+      if window_handles.include?(locator)
+        switch_to_window(locator)
+        yield
+      else
+        raise Ferrum::NoSuchPageError
+      end
+    ensure
+      switch_to_window(original)
+    end
+
+    def switch_to_window(target_id)
+      target = targets[target_id]
+      raise Ferrum::NoSuchPageError unless target
+      @page = attach_page(target.id)
+    end
+
+    def close_window(target_id)
+      target = targets[target_id]
+      raise Ferrum::NoSuchPageError unless target
+      @page = nil if @page.target_id == target.id
+      target.page.close
     end
 
     def browser_error
@@ -155,5 +200,15 @@ module Capybara::Cuprite
         end
       end
     end
+
+    def attach_page(target_id = nil)
+      target = targets[target_id] if target_id
+      target ||= default_context.default_target
+      return target.page if target.attached?
+
+      target.maybe_sleep_if_new_window
+      target.page = Page.new(target.id, self)
+      target.page
+    end
   end
 end

data/lib/capybara/cuprite/driver.rb

@@ -26,6 +26,8 @@ module Capybara::Cuprite
       @screen_size ||= DEFAULT_MAXIMIZE_SCREEN_SIZE
 
       @options[:save_path] = Capybara.save_path.to_s if Capybara.save_path
+
+      ENV["FERRUM_DEBUG"] = "true" if ENV["CUPRITE_DEBUG"]
     end
 
     def needs_server?
@@ -50,7 +52,7 @@ module Capybara::Cuprite
     end
 
     def frame_url
-      browser.frame_url
+      evaluate_script("window.location.href")
     end
 
     def html
@@ -71,7 +73,7 @@ module Capybara::Cuprite
     end
 
     def frame_title
-      browser.frame_title
+      evaluate_script("document.title")
     end
 
     def find_xpath(selector)
@@ -129,7 +131,10 @@ module Capybara::Cuprite
     end
 
     def open_new_window
-      browser.open_new_window
+      target = browser.default_context.create_target
+      target.maybe_sleep_if_new_window
+      target.page = Page.new(target.id, browser)
+      target.page
     end
 
     def switch_to_window(handle)
@@ -141,7 +146,7 @@ module Capybara::Cuprite
     end
 
     def no_such_window_error
-      Ferrum::NoSuchWindowError
+      Ferrum::NoSuchPageError
     end
 
     def reset!
@@ -216,11 +221,21 @@ module Capybara::Cuprite
     end
 
     def network_traffic(type = nil)
-      browser.network_traffic(type)
+      traffic = browser.network.traffic
+
+      case type.to_s
+      when "all"
+        traffic
+      when "blocked"
+        traffic.select(&:blocked?)
+      else
+        # when request isn't blocked
+        traffic.reject(&:blocked?)
+      end
     end
 
     def clear_network_traffic
-      browser.clear_network_traffic
+      browser.network.clear(:traffic)
     end
 
     def set_proxy(ip, port, type = nil, user = nil, password = nil, bypass = nil)
@@ -228,7 +243,7 @@ module Capybara::Cuprite
       server = type ? "#{type}=#{ip}:#{port}" : "#{ip}:#{port}"
       @options[:browser_options].merge!("proxy-server" => server)
       @options[:browser_options].merge!("proxy-bypass-list" => bypass) if bypass
-      browser.authorize(type: :proxy, user: user, password: password)
+      browser.network.authorize(type: :proxy, user: user, password: password)
     end
 
     def headers
@@ -248,7 +263,7 @@ module Capybara::Cuprite
     end
 
     def response_headers
-      browser.response_headers
+      browser.network.response&.headers
     end
 
     def cookies
@@ -272,22 +287,39 @@ module Capybara::Cuprite
       browser.cookies.clear
     end
 
+    def wait_for_network_idle(**options)
+      browser.network.wait_for_idle(**options)
+    end
+
     def clear_memory_cache
-      browser.clear_memory_cache
+      browser.network.clear(:cache)
     end
 
     def basic_authorize(user, password)
-      browser.authorize(user: user, password: password)
+      browser.network.authorize(user: user, password: password)
     end
     alias_method :authorize, :basic_authorize
 
-    def debug
+    def debug_url
+      "http://#{browser.process.host}:#{browser.process.port}"
+    end
+
+    def debug(binding = nil)
       if @options[:inspector]
-        Process.spawn(browser.process.path, "http://#{browser.process.host}:#{browser.process.port}")
-        pause
+        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: true` configuration option"
+                     "the driver with `inspector: ENV['INSPECTOR']` " \
+                     "configuration option and run your test suite passing " \
+                     "env variable"
       end
     end
 
@@ -298,7 +330,7 @@ module Capybara::Cuprite
       # In jRuby - STDIN returns immediately from select
       # see https://github.com/jruby/jruby/issues/1783
       read, write = IO.pipe
-      Thread.new { IO.copy_stream(STDIN, write); write.close }
+      thread = Thread.new { IO.copy_stream(STDIN, write); write.close }
 
       STDERR.puts "Cuprite execution paused. Press enter (or run 'kill -CONT #{Process.pid}') to continue."
 
@@ -314,6 +346,8 @@ module Capybara::Cuprite
         end
       end
     ensure
+      thread.kill
+      read.close
       trap("SIGCONT", old_trap) # Restore the previous signal handler, if there was one.
       STDERR.puts "Continuing"
     end
@@ -340,6 +374,10 @@ module Capybara::Cuprite
       browser.refresh
     end
 
+    def wait_for_reload(*args)
+      browser.wait_for_reload(*args)
+    end
+
     def accept_modal(type, options = {})
       case type
       when :alert, :confirm

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

@@ -128,7 +128,7 @@ class Cuprite {
     this.trigger(node, "focus");
     this.setValue(node, "");
 
-    if (node.type == "number" || node.type == "date") {
+    if (node.type == "number" || node.type == "date" || node.type == "range") {
       this.setValue(node, value);
       this.input(node);
     } else if (node.type == "time") {

data/lib/capybara/cuprite/node.rb

@@ -144,16 +144,16 @@ module Capybara::Cuprite
       command(:disabled?)
     end
 
-    def click(keys = [], offset = {})
-      prepare_and_click(:left, __method__, keys, offset)
+    def click(keys = [], **options)
+      prepare_and_click(:left, __method__, keys, options)
     end
 
-    def right_click(keys = [], offset = {})
-      prepare_and_click(:right, __method__, keys, offset)
+    def right_click(keys = [], **options)
+      prepare_and_click(:right, __method__, keys, options)
     end
 
-    def double_click(keys = [], offset = {})
-      prepare_and_click(:double, __method__, keys, offset)
+    def double_click(keys = [], **options)
+      prepare_and_click(:double, __method__, keys, options)
     end
 
     def hover
@@ -225,9 +225,12 @@ module Capybara::Cuprite
 
     private
 
-    def prepare_and_click(mode, name, keys, offset)
+    def prepare_and_click(mode, name, keys, options)
+      delay = options[:delay].to_i
+      x, y = options.values_at(:x, :y)
+      offset = { x: x, y: y, position: options[:offset] || :top }
       command(:before_click, name, keys, offset)
-      node.click(mode: mode, keys: keys, offset: offset)
+      node.click(mode: mode, keys: keys, offset: offset, delay: delay)
     end
 
     def filter_text(text)

data/lib/capybara/cuprite/page.rb

@@ -1,13 +1,22 @@
 # frozen_string_literal: true
 
+require "forwardable"
+
 module Capybara::Cuprite
-  module Page
+  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)
-      super
+      @frame_stack = []
       @accept_modal = []
       @modal_messages = []
+      super
     end
 
     def set(node, value)
@@ -21,7 +30,7 @@ module Capybara::Cuprite
 
     def trigger(node, event)
       options = {}
-      options.merge!(wait: Ferrum::Mouse::CLICK_WAIT) if event.to_s == "click"
+      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
 
@@ -59,7 +68,7 @@ module Capybara::Cuprite
 
     def find_modal(options)
       start = Ferrum.monotonic_time
-      timeout = options.fetch(:wait) { session_wait_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"
@@ -85,7 +94,12 @@ module Capybara::Cuprite
 
     def before_click(node, name, keys = [], offset = {})
       evaluate_on(node: node, expression: "_cuprite.scrollIntoViewport(this)")
-      x, y = find_position(node, offset[:x], offset[:y])
+
+      # 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
@@ -104,26 +118,34 @@ module Capybara::Cuprite
       end
     end
 
+    def frame_name
+      evaluate("window.name")
+    end
+
+    def title
+      active_frame.current_title
+    end
+
     private
 
     def prepare_page
       super
 
-      intercept_request if !Array(@browser.url_whitelist).empty? ||
+      network.intercept if !Array(@browser.url_whitelist).empty? ||
                            !Array(@browser.url_blacklist).empty?
 
-      on(:request_intercepted) do |request, index, total|
+      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 return
+            request.abort and next
           else
-            request.continue and return
+            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 return
+            request.continue and next
           else
-            request.abort and return
+            request.abort and next
           end
         elsif index + 1 < total
           # There are other callbacks that may handle this request
@@ -134,7 +156,7 @@ module Capybara::Cuprite
         end
       end
 
-      @client.on("Page.javascriptDialogOpening") do |params|
+      on("Page.javascriptDialogOpening") do |params|
         accept_modal = @accept_modal.last
         if accept_modal == true || accept_modal == false
           @accept_modal.pop
@@ -144,7 +166,11 @@ module Capybara::Cuprite
           options.merge!(promptText: response) if response
           command("Page.handleJavaScriptDialog", **options)
         else
-          warn "Modal window has been opened, but you didn't wrap your code into (`accept_prompt` | `dismiss_prompt` | `accept_confirm` | `dismiss_confirm` | `accept_alert`), accepting by default"
+          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"]
           options.merge!(promptText: response) if response
@@ -153,8 +179,8 @@ module Capybara::Cuprite
       end
     end
 
-    def find_position(node, *args)
-      x, y = node.find_position(*args)
+    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")
@@ -162,5 +188,13 @@ module Capybara::Cuprite
         raise
       end
     end
+
+    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.7.0"
+    VERSION = "0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: '0.11'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -34,16 +34,16 @@ dependencies:
   name: ferrum
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ files:
 - lib/capybara/cuprite/node.rb
 - lib/capybara/cuprite/page.rb
 - lib/capybara/cuprite/version.rb
-homepage: https://github.com/machinio/cuprite
+homepage: https://github.com/rubycdp/cuprite
 licenses:
 - MIT
 metadata: {}
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Headless Chrome driver for Capybara