Merge pull request #211 from rubycdp/cliver-master

Use cliver from github for tests

Author: route

.github/gemfiles/websocket-driver-0.6.x.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "websocket-driver", "~> 0.6.5"
+gem "cliver", github: "route/cliver", branch: "develop"
 
 gemspec path: "../../"

.github/gemfiles/websocket-driver-0.7.x.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "websocket-driver", "~> 0.7.1"
+gem "cliver", github: "route/cliver", branch: "develop"
 
 gemspec path: "../../"

.github/workflows/tests.yml

@@ -30,6 +30,11 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - name: Setup Chrome
+        uses: browser-actions/setup-chrome@latest
+        with:
+          chrome-version: stable
+
       - run: mkdir -p /tmp/ferrum
 
       - name: Run tests

lib/ferrum/browser/options/chrome.rb

@@ -43,15 +43,14 @@ class Chrome < Base
         }.freeze
 
         MAC_BIN_PATH = [
-          "/Applications/Chromium.app/Contents/MacOS/Chromium",
-          "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+          "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+          "/Applications/Chromium.app/Contents/MacOS/Chromium"
         ].freeze
-        LINUX_BIN_PATH = %w[chromium google-chrome-unstable google-chrome-beta
-                            google-chrome chrome chromium-browser
-                            google-chrome-stable].freeze
+        LINUX_BIN_PATH = %w[chrome google-chrome google-chrome-stable google-chrome-beta
+                            chromium chromium-browser google-chrome-unstable].freeze
         WINDOWS_BIN_PATH = [
-          "C:/Program Files/Google/Chrome Dev/Application/chrome.exe",
-          "C:/Program Files/Google/Chrome/Application/chrome.exe"
+          "C:/Program Files/Google/Chrome/Application/chrome.exe",
+          "C:/Program Files/Google/Chrome Dev/Application/chrome.exe"
         ].freeze
 
         def merge_required(flags, options, user_data_dir)

lib/ferrum/browser/process.rb

@@ -61,6 +61,8 @@ def self.directory_remover(path)
       end
 
       def initialize(options)
+        @pid = @xvfb = @user_data_dir = nil
+
         if options[:url]
           url = URI.join(options[:url].to_s, "/json/version")
           response = JSON.parse(::Net::HTTP.get(url))
@@ -69,7 +71,6 @@ def initialize(options)
           return
         end
 
-        @pid = @xvfb = @user_data_dir = nil
         @logger = options[:logger]
         @process_timeout = options.fetch(:process_timeout, PROCESS_TIMEOUT)
 

spec/spec_helper.rb

@@ -18,20 +18,11 @@
 puts ""
 
 RSpec.configure do |config|
+  ferrum_logger = nil
   config.include_context "Global helpers"
 
   config.before(:suite) do
     @server = Ferrum::Server.boot
-
-    begin
-      browser = Ferrum::Browser.new
-      puts "Browser: #{browser.process.browser_version}"
-      puts "Protocol: #{browser.process.protocol_version}"
-      puts "V8: #{browser.process.v8_version}"
-      puts "Webkit: #{browser.process.webkit_version}"
-    ensure
-      browser&.quit
-    end
   end
 
   config.before(:all) do
@@ -40,8 +31,8 @@
     options.merge!(headless: false) if ENV["HEADLESS"] == "false"
 
     if ENV["CI"]
-      FERRUM_LOGGER = StringIO.new
-      options.merge!(logger: FERRUM_LOGGER)
+      ferrum_logger = StringIO.new
+      options.merge!(logger: ferrum_logger)
     end
 
     @browser = Ferrum::Browser.new(**options)
@@ -55,8 +46,8 @@
     server&.wait_for_pending_requests
 
     if ENV["CI"]
-      FERRUM_LOGGER.truncate(0)
-      FERRUM_LOGGER.rewind
+      ferrum_logger.truncate(0)
+      ferrum_logger.rewind
     end
   end
 
@@ -86,7 +77,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.open("/tmp/ferrum/#{log_name}", "wb") { |file| file.write(FERRUM_LOGGER.string) }
+    File.open("/tmp/ferrum/#{log_name}", "wb") { |file| file.write(ferrum_logger.string) }
   rescue StandardError => e
     puts "#{e.class}: #{e.message}"
   end