Merge pull request #146 from rubycdp/new-release

Compatibility with latest ferrum

Author: route

.github/workflows/tests.yml

@@ -1,5 +1,9 @@
 name: Tests
-on: [push]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   tests:

cuprite.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency "capybara", ">= 2.1", "< 4"
-  s.add_runtime_dependency "ferrum",   "~> 0.9.0"
+  s.add_runtime_dependency "ferrum",   "~> 0.10.0"
 
   s.add_development_dependency "image_size", "~> 2.0"
   s.add_development_dependency "pdf-reader", "~> 2.1"

lib/capybara/cuprite/driver.rb

@@ -243,7 +243,9 @@ def set_proxy(ip, port, type = nil, user = nil, password = nil, bypass = nil)
       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.network.authorize(type: :proxy, user: user, password: password)
+      browser.network.authorize(type: :proxy, user: user, password: password) do |request|
+        request.continue
+      end
     end
 
     def headers
@@ -296,7 +298,9 @@ def clear_memory_cache
     end
 
     def basic_authorize(user, password)
-      browser.network.authorize(user: user, password: password)
+      browser.network.authorize(user: user, password: password) do |request|
+        request.continue
+      end
     end
     alias_method :authorize, :basic_authorize
 

spec/integration/driver_spec.rb

@@ -657,7 +657,7 @@ def create_screenshot(file, *args)
         expect { @session.visit(url) }
           .to raise_error(
             Ferrum::StatusError,
-            %(Request to #{url} failed to reach server, check DNS and/or server status)
+            %(Request to #{url} failed to reach server, check DNS and server status)
           )
       end
 

spec/spec_helper.rb

@@ -3,6 +3,7 @@
 CUPRITE_ROOT = File.expand_path("..", __dir__)
 $:.unshift(CUPRITE_ROOT + "/lib")
 
+require "fileutils"
 require "bundler/setup"
 require "rspec"
 
@@ -84,6 +85,8 @@ module TestSessions
   end
 
   config.around do |example|
+    remove_temporary_folders
+
     if ENV["CI"]
       session = @session || TestSessions::Cuprite
       session.driver.browser.logger.truncate(0)
@@ -106,11 +109,27 @@ def save_exception_aftifacts(browser, meta)
     line_number = meta[:line_number]
     timestamp = "#{time_now.strftime('%Y-%m-%d-%H-%M-%S.')}#{'%03d' % (time_now.usec/1000).to_i}"
 
+    save_exception_log(browser, filename, line_number, timestamp)
+    save_exception_screenshot(browser, filename, line_number, timestamp)
+  end
+
+  def save_exception_screenshot(browser, filename, line_number, timestamp)
     screenshot_name = "screenshot-#{filename}-#{line_number}-#{timestamp}.png"
     screenshot_path = "/tmp/cuprite/#{screenshot_name}"
     browser.screenshot(path: screenshot_path, full: true)
+  rescue => e
+    puts "#{e.class}: #{e.message}"
+  end
 
+  def save_exception_log(browser, filename, line_number, timestamp)
     log_name = "logfile-#{filename}-#{line_number}-#{timestamp}.txt"
     File.open("/tmp/cuprite/#{log_name}", "wb") { |f| f.write(browser.logger.string) }
+  rescue => e
+    puts "#{e.class}: #{e.message}"
+  end
+
+  def remove_temporary_folders
+    FileUtils.rm_rf(CUPRITE_ROOT + "/screenshots")
+    FileUtils.rm_rf(CUPRITE_ROOT + "/save_path_tmp")
   end
 end