cuprite 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f883874c9b6d85c217809bb7423c5dc7b31db4932b9bf8ad8e8c469eb0820973
-  data.tar.gz: c29bbb53cd0a8153988e4d26dc709a3aa49ad94114a7c175d636705f94eb263c
+  metadata.gz: 117f25092d57e0e61feeec4d161d3b9da6cdde4ea6963e624dca22af48de75fa
+  data.tar.gz: aae39fa9139563a5870e66be1d564c69136df2e7d73c72ff744edf4bb5cccc8a
 SHA512:
-  metadata.gz: b0f9a932c1e3640eac45e9b1f3af0964f0f8e9c24037d961f6d10825bcbc97f323b324ae58595de0c84c73d900add6ef96357c6555796938fc3e8d2c261217b1
-  data.tar.gz: 4de0397ab55e6863d64a2faa20a63bc6b97b585308b6f8d5694c75dbc10b90b18b1b202a7501b51a409bd59eaa2fa415d637816060550927751d42047bf4a530
+  metadata.gz: f77ad45ba3abe3a1a4dec994566cbf1d0ab0c7364fbc879bf89583e1602a5a5c16da3cc1d6e1d6b8c2b5eee601409d1c8cf31f291f01cc83217f495ae313e56a
+  data.tar.gz: 2a976e8a5ece9441ba281b2521c43cf8ed209258bbb386254539341157dad7245933292458c7ccb7a1f019119b2334d15f3c68fb0d9af9df0061f74879d62cfb

data/README.md

@@ -13,25 +13,6 @@ have consistent design with other browsers. The design of the driver will be as
 close to [Poltergeist](https://github.com/teampoltergeist/poltergeist) as
 possible but it's not a goal.
 
-## Speed comparison and missing features ##
-
-Almost all capybara tests are passing with quite good speed in comparison with
-Poltergest/PhantomJS:
-
-```
-cuprite:
-Finished in 8 minutes 58 seconds (files took 0.89959 seconds to load)
-1555 examples, 0 failures, 27 pending
-
-selenium headless chrome:
-Finished in 9 minutes 13 seconds (files took 0.97749 seconds to load)
-1445 examples, 0 failures, 3 pending
-
-poltergeist:
-Finished in 11 minutes 49 seconds (files took 0.54019 seconds to load)
-1560 examples, 0 failures, 6 pending
-```
-
 ## Installation ##
 
 ``` ruby
@@ -47,10 +28,6 @@ require "capybara/cuprite"
 Capybara.javascript_driver = :cuprite
 ```
 
-If you were previously using the `:rack_test` driver, be aware that
-your app will now run in a separate thread and this can have
-consequences for transactional tests. [See the Capybara README for more detail](https://github.com/jnicklas/capybara/blob/master/README.md#transactions-and-database-setup).
-
 ## Installing Chromium ##
 
 As Chromium is stopped being built as a package for Linux don't even try to
@@ -155,6 +132,7 @@ end
 * `:host` (String) - Remote debugging address for headless Chrome
 * `: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
 
 
 ### URL Blacklisting & Whitelisting ###

data/lib/capybara/cuprite/browser/page.rb

@@ -154,7 +154,7 @@ module Capybara::Cuprite
       end
 
       def find_modal(options)
-        start_time    = Time.now
+        start_time    = Capybara::Helpers.monotonic_time
         timeout_sec   = options.fetch(:wait) { session_wait_time }
         expect_text   = options[:text]
         expect_regexp = expect_text.is_a?(Regexp) ? expect_text : Regexp.escape(expect_text.to_s)
@@ -165,7 +165,7 @@ module Capybara::Cuprite
           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 (Time.now - start_time) >= timeout_sec
+          raise e, not_found_msg if (Capybara::Helpers.monotonic_time - start_time) >= timeout_sec
           sleep(0.05)
           retry
         end
@@ -184,9 +184,9 @@ module Capybara::Cuprite
 
         @mutex.synchronize do
           id = @client.command(*args)
-          stop_at = Time.now.to_f + @wait
+          stop_at = Capybara::Helpers.monotonic_time + @wait
 
-          while @wait > 0 && (remain = stop_at - Time.now.to_f) > 0
+          while @wait > 0 && (remain = stop_at - Capybara::Helpers.monotonic_time) > 0
             @resource.wait(@mutex, remain)
           end
 
@@ -279,6 +279,19 @@ module Capybara::Cuprite
           end
         end
 
+        @client.subscribe("Network.loadingFinished") do |params|
+          if request = @network_traffic.find { |r| r.id == params["requestId"] }
+            # Sometimes we never get the Network.responseReceived event.
+            # See https://crbug.com/883475
+            #
+            # Network.loadingFinished's encodedDataLength contains both body and headers
+            # sizes received by wire. See https://crbug.com/764946
+            if response = request.response
+              response.body_size = params["encodedDataLength"] - response.headers_size
+            end
+          end
+        end
+
         @client.subscribe("Log.entryAdded") do |params|
           source = params.dig("entry", "source")
           level = params.dig("entry", "level")

data/lib/capybara/cuprite/browser/process.rb

@@ -6,6 +6,7 @@ module Capybara::Cuprite
   class Browser
     class Process
       KILL_TIMEOUT = 2
+      PROCESS_TIMEOUT = 1
       BROWSER_PATH = ENV["BROWSER_PATH"]
       BROWSER_HOST = "127.0.0.1"
       BROWSER_PORT = "0"
@@ -59,10 +60,10 @@ module Capybara::Cuprite
               ::Process.kill("KILL", pid)
             else
               ::Process.kill("USR1", pid)
-              start = Time.now
+              start = Capybara::Helpers.monotonic_time
               while ::Process.wait(pid, ::Process::WNOHANG).nil?
                 sleep 0.05
-                next unless (Time.now - start) > KILL_TIMEOUT
+                next unless (Capybara::Helpers.monotonic_time - start) > KILL_TIMEOUT
                 ::Process.kill("KILL", pid)
                 ::Process.wait(pid)
                 break
@@ -96,6 +97,8 @@ module Capybara::Cuprite
           @options.delete("disable-gpu")
         end
 
+        @process_timeout = options.fetch(:process_timeout, PROCESS_TIMEOUT)
+
         @options.merge!(options.fetch(:browser_options, {}))
 
         @logger = options.fetch(:logger, nil)
@@ -115,7 +118,7 @@ module Capybara::Cuprite
           ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
         end
 
-        parse_ws_url(read_io)
+        parse_ws_url(read_io, @process_timeout)
       ensure
         close_io(read_io, write_io)
       end
@@ -143,7 +146,7 @@ module Capybara::Cuprite
                 "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
               ].find { |path| File.exist?(path) }
             else
-              %w[chromium google-chrome-unstable google-chrome-beta google-chrome chrome chromium-browser].reduce(nil) do |path, exe|
+              %w[chromium google-chrome-unstable google-chrome-beta google-chrome chrome chromium-browser google-chrome-stable].reduce(nil) do |path, exe|
                 path = Cliver.detect(exe)
                 break path if path
               end
@@ -180,7 +183,7 @@ module Capybara::Cuprite
         @pid = nil
       end
 
-      def parse_ws_url(read_io, timeout = 1)
+      def parse_ws_url(read_io, timeout = PROCESS_TIMEOUT)
         output = ""
         start = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
         max_time = start + timeout

data/lib/capybara/cuprite/driver.rb

@@ -190,9 +190,10 @@ module Capybara::Cuprite
       browser.clear_network_traffic
     end
 
-    def set_proxy(ip, port, type = "http", user = nil, password = nil, bypass = nil)
+    def set_proxy(ip, port, type = nil, user = nil, password = nil, bypass = nil)
       @options[:browser_options] ||= {}
-      @options[:browser_options].merge!("proxy-server" => "#{type}=#{ip}:#{port}")
+      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.proxy_authorize(user, password)
     end

data/lib/capybara/cuprite/network/response.rb

@@ -2,6 +2,8 @@
 
 module Capybara::Cuprite::Network
   class Response
+    attr_accessor :body_size
+
     def initialize(data)
       @data = data
     end
@@ -26,15 +28,15 @@ module Capybara::Cuprite::Network
       @data["headers"]
     end
 
+    def headers_size
+      @data["encodedDataLength"]
+    end
+
     # FIXME: didn't check if we have it on redirect response
     def redirect_url
       @data["redirectURL"]
     end
 
-    def body_size
-      @body_size ||= @data.dig("headers", "Content-Length").to_i
-    end
-
     def content_type
       @content_type ||= @data.dig("headers", "contentType").sub(/;.*\z/, "")
     end

data/lib/capybara/cuprite/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Cuprite
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara