onlyoffice_webdriver_wrapper 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a21d9eaf5674c09425184631dd79d31f8d36cb2977e3d7dd309fe938d54603b9
-  data.tar.gz: a807c1805c6cfb6197692efdc4947081b02589ba923f30a058eeec80759e75a6
+  metadata.gz: dc8c8e7641874b04e3da185c8dc14cfe2c1fa247cd7beb33a0688bcec75da732
+  data.tar.gz: f43f00a65a85ce30ac3423a528a25ccbfd071f5a2da1e185024372e1e3c983c7
 SHA512:
-  metadata.gz: 25a0dac52bc614e8f5ee863825e105879b3c6db71451c59c8f8b05dadaecbbf121928083793cf1d2af24ab870882a9f351731637627bbc076b8d5f1f3dd31ae0
-  data.tar.gz: d5037066d18d20f9b82a86ed42de5b60ab2202bddf93304e211e5d6fcb9f2679c9a815391c3b6526a122196060cbf7a23d572e2b434b7c9ce8905afdefb58ea2
+  metadata.gz: 27085b22730ab40f23cc1144a20224929341c18e75c643115d7909834e21fceb1a845830fffdb6031e427fcac8b95ad276ba46dc809021584c9fe7323d575113
+  data.tar.gz: e4deb7908451d6062aaab2a458cb0bc5ce92b19d7a3bb09aca7c6de59c4c44422d5fbdecaa3b7f5e75b74be6fa9e308aa9346d45049a0dad406c68828b1cdfa0

data/lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper.rb

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
 
+require_relative 'chrome_helper/chrome_version_helper'
+
 module OnlyofficeWebdriverWrapper
   # Class for working with Chrome
   module ChromeHelper
+    include ChromeVersionHelper
+
     DEFAULT_CHROME_SWITCHES = %w[--kiosk-printing
                                  --disable-popup-blocking
                                  --disable-infobars
                                  --no-sandbox
                                  test-type].freeze
 
-    # @return [String] path to chromedriver
-    def chromedriver_path
-      driver_name = 'bin/chromedriver'
-      driver_name = 'bin/chromedriver_mac' if OSHelper.mac?
-      File.join(File.dirname(__FILE__), driver_name)
-    end
-
     def chrome_service
       @chrome_service ||= Selenium::WebDriver::Chrome::Service.new(path: chromedriver_path)
     end

data/lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chrome_version_helper.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module OnlyofficeWebdriverWrapper
+  # Class for getting chrome version
+  module ChromeVersionHelper
+    # @return [Integer] current default chrome version
+    CURRENT_DEFAULT_CHROME_VERSION = 87
+
+    # @return [Gem::Version] unknown chrome version
+    def unknown_chrome_version
+      Gem::Version.new('0.0.0.0')
+    end
+
+    # @return [Gem::Version] version of chrome. Return unknown_chrome_version if cannot get
+    def chrome_version(chrome_command = 'google-chrome')
+      return @chrome_version if @chrome_version
+
+      version_string = `#{chrome_command} --product-version`
+      OnlyofficeLoggerHelper.log("Chrome Version is: #{version_string}")
+      @chrome_version = Gem::Version.new(version_string)
+    rescue StandardError => e
+      OnlyofficeLoggerHelper.log("Cannot get chrome version because of: #{e}")
+      @chrome_version = unknown_chrome_version
+    end
+
+    # @return [String] path to chromedriver
+    def chromedriver_path
+      return default_mac if OSHelper.mac?
+      return default_linux if chrome_version == unknown_chrome_version
+
+      chromedriver_path_cur_chrome
+    end
+
+    private
+
+    # @return [String] default mac chromedriver
+    def default_mac
+      "#{Dir.pwd}/lib/onlyoffice_webdriver_wrapper/helpers/bin/chromedriver_mac"
+    end
+
+    # @return [String] default linux chromedriver
+    def default_linux
+      "#{Dir.pwd}/lib/onlyoffice_webdriver_wrapper/helpers/bin/chromedriver_linux_#{CURRENT_DEFAULT_CHROME_VERSION}"
+    end
+
+    # @return [String] path to chromedriver of version
+    def chromedriver_path_cur_chrome
+      file_path = "#{Dir.pwd}/lib/onlyoffice_webdriver_wrapper/helpers/bin/chromedriver_linux_#{chrome_version.segments.first}"
+
+      return file_path if File.exist?(file_path)
+
+      OnlyofficeLoggerHelper.log("Cannot file chromedriver by version #{chrome_version.version}. Using Default")
+      default_linux
+    end
+  end
+end

data/lib/onlyoffice_webdriver_wrapper/version.rb

@@ -2,6 +2,6 @@
 
 module OnlyofficeWebdriverWrapper
   module Version
-    STRING = '0.7.0'
+    STRING = '0.8.0'
   end
 end

data/lib/onlyoffice_webdriver_wrapper/webdriver.rb

@@ -70,6 +70,8 @@ module OnlyofficeWebdriverWrapper
       @download_directory = Dir.mktmpdir('webdriver-download')
       @browser = params.fetch(:browser, browser)
       @proxy = params[:proxy]
+      return if params[:do_not_start_browser]
+
       case browser
       when :firefox
         @driver = start_firefox_driver

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -218,10 +218,11 @@ extra_rdoc_files: []
 files:
 - lib/onlyoffice_webdriver_wrapper.rb
 - lib/onlyoffice_webdriver_wrapper/dimensions.rb
-- lib/onlyoffice_webdriver_wrapper/helpers/bin/chromedriver
+- lib/onlyoffice_webdriver_wrapper/helpers/bin/chromedriver_linux_87
 - lib/onlyoffice_webdriver_wrapper/helpers/bin/chromedriver_mac
 - lib/onlyoffice_webdriver_wrapper/helpers/bin/geckodriver
 - lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper.rb
+- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chrome_version_helper.rb
 - lib/onlyoffice_webdriver_wrapper/helpers/firefox_helper.rb
 - lib/onlyoffice_webdriver_wrapper/helpers/firefox_helper/save_to_disk_files.list
 - lib/onlyoffice_webdriver_wrapper/helpers/headless_helper.rb
@@ -247,15 +248,15 @@ files:
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_tab_helper.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_type_helper.rb
 - lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_user_agent_helper.rb
-homepage: https://github.com/onlyoffice-testing-robot/onlyoffice_webdriver_wrapper
+homepage: https://github.com/ONLYOFFICE-QA/onlyoffice_webdriver_wrapper
 licenses:
 - AGPL-3.0
 metadata:
-  bug_tracker_uri: https://github.com/onlyoffice-testing-robot/onlyoffice_webdriver_wrapper/issues
-  changelog_uri: https://github.com/onlyoffice-testing-robot/onlyoffice_webdriver_wrapper/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/ONLYOFFICE-QA/onlyoffice_webdriver_wrapper/issues
+  changelog_uri: https://github.com/ONLYOFFICE-QA/onlyoffice_webdriver_wrapper/blob/master/CHANGELOG.md
   documentation_uri: https://www.rubydoc.info/gems/onlyoffice_webdriver_wrapper
-  homepage_uri: https://github.com/onlyoffice-testing-robot/onlyoffice_webdriver_wrapper
-  source_code_uri: https://github.com/onlyoffice-testing-robot/onlyoffice_webdriver_wrapper
+  homepage_uri: https://github.com/ONLYOFFICE-QA/onlyoffice_webdriver_wrapper
+  source_code_uri: https://github.com/ONLYOFFICE-QA/onlyoffice_webdriver_wrapper
 post_install_message: 
 rdoc_options: []
 require_paths: