onlyoffice_webdriver_wrapper 0.6.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd207cfcb5c3d274d1f27c1159f744f0bf6c5c58beaeb5bbb075d168a3082ded
-  data.tar.gz: 1784801d1b15ae594167e1a11902d3308c0683d9fb45d193d3e8033e8f62d807
+  metadata.gz: 39058e9caceffa9dc27575e7229b0b65db6cf4ede419bb837e4c1be1dec065e9
+  data.tar.gz: c402098bb40c6022aff64ccc0ce10f0f35d0acee58cb7efabaeb61a9a263d1ab
 SHA512:
-  metadata.gz: 424d71030c12a0ab537b5c5c0bbb44daabb7ec7a5db7b318a97a7d2b034c0d59de67d957417add165e8af151b9cc9bf372cfe640b2a6ebdb36d6abeeb9b81537
-  data.tar.gz: 1b179181f58eab37e9f982e9134679e724d2c0a328c51511d137336ff10260fac2ad2b1c3bcba83d0278bc8d1fba30198392af3c817c4d93345bc894b0f206bb
+  metadata.gz: d7b594a466478f9f2dfa96d0d5e37ac83d404d81a57d932d4c8758d53544ceb89da7ed7ed9364ed5c92ab75839a6f151dcd56cd87c61dbeec70db3ac3d9fe4ee
+  data.tar.gz: a015da0d5c96bb24787107111e17b10f4059a308315504bd080ddadfbaab3d00b26a06dbfe65f9633b6446ef8a15376944a54689ffff5bbeaf8ec6ec564a6412

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
+      "#{File.dirname(__FILE__)}/chromedriver_bin/chromedriver_mac"
+    end
+
+    # @return [String] default linux chromedriver
+    def default_linux
+      "#{File.dirname(__FILE__)}/chromedriver_bin/chromedriver_linux_#{CURRENT_DEFAULT_CHROME_VERSION}"
+    end
+
+    # @return [String] path to chromedriver of version
+    def chromedriver_path_cur_chrome
+      file_path = "#{File.dirname(__FILE__)}/chromedriver_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.6.1'
+    STRING = '0.8.1'
   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.6.1
+  version: 0.8.1
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: onlyoffice_s3_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: page-object
   requirement: !ruby/object:Gem::Requirement
@@ -115,100 +115,100 @@ dependencies:
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.2
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.2
+        version: '2'
 description: ONLYOFFICE Webdriver Wrapper Gem. Used in QA
 email:
 - shockwavenn@gmail.com
@@ -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_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/chrome_helper/chromedriver_bin/chromedriver_linux_87
+- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_mac
 - 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: