onlyoffice_webdriver_wrapper 0.7.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a21d9eaf5674c09425184631dd79d31f8d36cb2977e3d7dd309fe938d54603b9
-  data.tar.gz: a807c1805c6cfb6197692efdc4947081b02589ba923f30a058eeec80759e75a6
+  metadata.gz: e5fdadf2d52adf6b1a50dde3b848c94c2d673d7205fce834f90469c9075c0d5f
+  data.tar.gz: 28ef75b4b731eaac7d5c16f6f3bc09fa439cbc76e4aee491a3324a71a96e8ec4
 SHA512:
-  metadata.gz: 25a0dac52bc614e8f5ee863825e105879b3c6db71451c59c8f8b05dadaecbbf121928083793cf1d2af24ab870882a9f351731637627bbc076b8d5f1f3dd31ae0
-  data.tar.gz: d5037066d18d20f9b82a86ed42de5b60ab2202bddf93304e211e5d6fcb9f2679c9a815391c3b6526a122196060cbf7a23d572e2b434b7c9ce8905afdefb58ea2
+  metadata.gz: 72e974e29f12a790661ada2391a70d9b41e694a1d1328475867f7941d3e4ee86d39c56947d6fcd43a50e6fab2c1cdc65ed6d8564480a6dcd76d474679e699d78
+  data.tar.gz: 946a2640b5d04082cb97c44c9c28dbdd3864431771fdb5a1171f36d090e49c9be13749bc40d34228c9c23c09ab012df066a78090dc0b83e831ec673c87b591d2

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.7.0'
+    STRING = '0.11.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

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_attributes_helper.rb

@@ -9,7 +9,7 @@ module OnlyofficeWebdriverWrapper
       element = xpath_name.is_a?(String) ? get_element(xpath_name) : xpath_name
       begin
         attribute_value = element.attribute(attribute)
-        exist = attribute_value.empty? || attribute_value.nil? ? false : true
+        exist = !(attribute_value.empty? || attribute_value.nil?)
       rescue Exception
         exist = false
       end

data/lib/onlyoffice_webdriver_wrapper/webdriver/webdriver_type_helper.rb

@@ -36,7 +36,7 @@ module OnlyofficeWebdriverWrapper
         element.send_keys text_to_send
       elsif text_to_send != ''
         if text_to_send.is_a?(String)
-          text_to_send.split(//).each do |symbol|
+          text_to_send.chars.each do |symbol|
             @driver.action.send_keys(symbol).perform
           end
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_webdriver_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.11.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,106 +11,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: onlyoffice_file_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: onlyoffice_logger_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: onlyoffice_s3_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: page-object
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.142.7
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.142.7
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.17.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.17.0
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -218,10 +218,13 @@ 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_linux_88
+- lib/onlyoffice_webdriver_wrapper/helpers/chrome_helper/chromedriver_bin/chromedriver_linux_89
+- 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 +250,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:
@@ -271,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.11
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Webdriver Wrapper Gem