cuprite 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b0203f3647868b796a4649f28e2ed0a549412156e08a3ef50e83625acaca11
-  data.tar.gz: 9854d6126698f53691c30b04c9a8677f24091c76720227ceb474101dab06a475
+  metadata.gz: 61e6eae56b712430083dd1dc25ae7888016899b9504fcb2795525fe2df0d9b63
+  data.tar.gz: 26f55efb799bff8ffa704fd1955dc01b03c11db3f44806f3a1c8284d84237ae8
 SHA512:
-  metadata.gz: 2fe300cdefbb2a2c7d09d37329ab7a31dcf2d7cda9177ffafc91bdec2923fabf24c933f6894e5e959bdb6218e03ac9211afedb7ae588ae97f87d7142fb249e7c
-  data.tar.gz: ede07bd3d885c5e711a80a6698d10ad28d855d7b6917f10ebc2cfe0153fde5af261ef553cdee62ad3a6cabdacfee659e12d13b95ebc8c2470d4d4b33772ad5be
+  metadata.gz: a8eb4c7caeeaf86f24ebef9bf37edf6bf3e6ccf474633be8c69a1b4296abfcb5df040ede0c5feccecc930393312408800a928f3671aeb658a7d5beadb08a3c0a
+  data.tar.gz: 44387ad8fa9b9a87a236d2df3d754155ad4ed280348d65da2479b1a5a08e6be215ebf2ad652c1159188f08f6f231fbeeeddd2ce767d5bc9a53b1c0e7f39fbdf1

data/README.md

@@ -179,15 +179,12 @@ 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:
+You could set the inspector option via an environment variable:
 
 ```ruby
-Capybara.register_driver :cuprite_debug do |app|
-  Capybara::Cuprite::Driver.new(app, inspector: true)
+Capybara.register_driver :cuprite do |app|
+  Capybara::Cuprite::Driver.new(app, inspector: ENV['INSPECTOR'])
 end
-
-Capybara.javascript_driver = :cuprite_debug
 ```
 
 ## License ##

data/lib/capybara/cuprite/browser.rb

@@ -23,12 +23,12 @@ module Capybara::Cuprite
 
     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 +36,7 @@ module Capybara::Cuprite
     end
 
     def status_code
-      status
+      network.status
     end
 
     def find(method, selector)

data/lib/capybara/cuprite/driver.rb

@@ -216,11 +216,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 +238,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 +258,7 @@ module Capybara::Cuprite
     end
 
     def response_headers
-      browser.response_headers
+      browser.network.response&.headers
     end
 
     def cookies
@@ -273,11 +283,11 @@ module Capybara::Cuprite
     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
 

data/lib/capybara/cuprite/page.rb

@@ -109,10 +109,10 @@ module Capybara::Cuprite
     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
@@ -134,7 +134,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

data/lib/capybara/cuprite/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Cuprite
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara