Merge pull request #215 from rubycdp/ferrum-timeout-per-page

feat: add timeout accessor per page

Author: route

.gitignore

@@ -1,5 +1,8 @@
 .byebug_history
 Gemfile.*
+tmp
+doc
 pkg
 .idea
 .ruby-version
+.yardoc

cuprite.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
                     "run your tests on a headless Chrome browser"
   s.license       = "MIT"
   s.require_paths = ["lib"]
-  s.files         = Dir["{lib}/**/*", "LICENSE", "README.md"]
+  s.files         = Dir["lib/**/*", "LICENSE", "README.md"]
   s.metadata = {
     "homepage_uri" => "https://cuprite.rubycdp.com/",
     "bug_tracker_uri" => "https://github.com/rubycdp/cuprite/issues",
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.6.0"
 
   s.add_runtime_dependency "capybara", "~> 3.0"
-  s.add_runtime_dependency "ferrum",   "~> 0.12.0"
+  s.add_runtime_dependency "ferrum",   "~> 0.13.0"
 
   s.add_development_dependency "byebug",     "~> 11.1"
   s.add_development_dependency "chunky_png", "~> 1.4"

lib/capybara/cuprite/browser.rb

@@ -23,6 +23,11 @@ def initialize(options = nil)
         @page = false
       end
 
+      def timeout=(value)
+        super
+        @page.timeout = value unless @page.nil?
+      end
+
       def page
         raise Ferrum::NoSuchPageError if @page.nil?
 

lib/capybara/cuprite/page.rb

@@ -10,7 +10,7 @@ class Page < Ferrum::Page
 
       extend Forwardable
       delegate %i[at_css at_xpath css xpath
-                  current_url current_title body execution_id
+                  current_url current_title body execution_id execution_id!
                   evaluate evaluate_on evaluate_async execute] => :active_frame
 
       def initialize(*args)

spec/spec_helper.rb

@@ -14,7 +14,7 @@
 require "support/external_browser"
 
 puts ""
-command = Ferrum::Browser::Command.build({ window_size: [] }, nil)
+command = Ferrum::Browser::Command.build(Ferrum::Browser::Options.new, nil)
 puts `'#{command.path}' --version`
 puts ""
 
@@ -69,6 +69,7 @@ module TestSessions
       #all with obscured filter should find top nodes outside the viewport when true
       #all with obscured filter should only find non-top nodes when true
       #fill_in should fill in a color field
+      #fill_in should handle carriage returns with line feeds in a textarea correctly
       #has_field with valid should be false if field is invalid
       #find with spatial filters should find an element above another element
       #find with spatial filters should find an element below another element
@@ -90,8 +91,8 @@ module TestSessions
 
     if ENV.fetch("CI", nil)
       session = @session || TestSessions::Cuprite
-      session.driver.browser.logger.truncate(0)
-      session.driver.browser.logger.rewind
+      session.driver.browser.options.logger.truncate(0)
+      session.driver.browser.options.logger.rewind
     end
 
     example.run
@@ -124,7 +125,7 @@ def save_exception_screenshot(browser, filename, line_number, timestamp)
 
   def save_exception_log(browser, filename, line_number, timestamp)
     log_name = "logfile-#{filename}-#{line_number}-#{timestamp}.txt"
-    File.binwrite("/tmp/cuprite/#{log_name}", browser.logger.string)
+    File.binwrite("/tmp/cuprite/#{log_name}", browser.options.logger.string)
   rescue StandardError => e
     puts "#{e.class}: #{e.message}"
   end

spec/support/external_browser.rb

@@ -5,7 +5,7 @@ module Support
     module ExternalBrowser
       def with_external_browser
         url = URI.parse("http://127.0.0.1:32001")
-        opts = { host: url.host, port: url.port, window_size: [1400, 1400], headless: true }
+        opts = Ferrum::Browser::Options.new(host: url.host, port: url.port, window_size: [1400, 1400], headless: true)
         process = Ferrum::Browser::Process.new(opts)
 
         begin