cuprite 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcb46f5716c12a1a33acb66d1e7827897f1331447806f52379571226ac4dfe9c
-  data.tar.gz: 8ca919e8ebdfef7a4a16613b0c0620084365d3231dbbe5b7d96bc18bf0f1cf9a
+  metadata.gz: 979d242c40547bfd784a54a15fa1ba81afc251a805f71880a234b4fd055f3afb
+  data.tar.gz: 433ff62183910210a57f5b1022a7807d3e8dc5ac86dbaf62879660b957a67b94
 SHA512:
-  metadata.gz: a3451efdac94c66d55d8afb49ee5497a91c48d7b2b9b0e9728b49f9c44ad4fa7c5d780a81ec7a4650f9a35a2370846b7da5782e9c6867cd0774d3204509e085a
-  data.tar.gz: 6e33306c0157a88640d5b546faddef248576208eca188fe4898ff898023717a2439a138dbdfe98670b6cae4b03a5b81cce2b5eaa93d73c2f266f6761bd72603d
+  metadata.gz: 5495435618d770085085f9b992646e03e1b1271b20cefc8c7e0f1d4313abd398a161f3b85038e0583bd6834d55adc8052393d2e5dc61c1d395edbe5e90fb29f5
+  data.tar.gz: 64b6b8a516e44642e6dfeb3981081b5e1d7cd0489c4741358f841013f74f8268b6bdaf63017262ed2f70f6d83a8cc4a3c548bf3da33b86409e64695620a8e108

data/README.md

@@ -116,17 +116,26 @@ be automatically cleared at the end of the test.
 * `page.driver.network_traffic` Inspect network traffic (resources have been
   loaded) on the current page. This returns an array of request objects.
 
-
 ```ruby
 page.driver.network_traffic # => [Request, ...]
 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 Ferrum's [`wait_for_idle`](https://github.com/route/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 ###
 
 The following methods are used to inspect and manipulate cookies:
@@ -189,7 +198,7 @@ end
 
 ## License ##
 
-Copyright 2018-2019 Machinio
+Copyright 2018-2020 Machinio
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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

@@ -23,12 +23,12 @@ module Capybara::Cuprite
 
     def page
       raise Ferrum::NoSuchPageError if @page.nil?
-      @page ||= default_context.page
+      @page ||= attach_page
     end
 
     def reset
       super
-      @page = default_context.page
+      @page = attach_page
     end
 
     def quit
@@ -81,7 +81,7 @@ module Capybara::Cuprite
 
       if Capybara::VERSION.to_f < 3.0
         target_id = window_handles.find do |target_id|
-          page = targets[target_id].page
+          page = attach_page(target_id)
           locator == page.frame_name
         end
         locator = target_id if target_id
@@ -100,13 +100,13 @@ module Capybara::Cuprite
     def switch_to_window(target_id)
       target = targets[target_id]
       raise Ferrum::NoSuchPageError unless target
-      @page = target.page
+      @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.page
+      @page = nil if @page.target_id == target.id
       target.page.close
     end
 
@@ -200,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?
@@ -129,7 +131,10 @@ module Capybara::Cuprite
     end
 
     def open_new_window
-      browser.create_page
+      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)
@@ -282,6 +287,10 @@ 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.network.clear(:cache)
     end

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/page.rb

@@ -3,15 +3,14 @@
 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
-
+                current_url current_title body execution_id
+                evaluate evaluate_on evaluate_async execute] => :active_frame
 
     def initialize(*args)
       @frame_stack = []
@@ -114,6 +113,10 @@ module Capybara::Cuprite
       end
     end
 
+    def frame_name
+      evaluate("window.name")
+    end
+
     def title
       active_frame.current_title
     end
@@ -129,15 +132,15 @@ module Capybara::Cuprite
       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

data/lib/capybara/cuprite/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Cuprite
-    VERSION = "0.8"
+    VERSION = "0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement